[arch-commits] Commit in xfce4-dev-tools/trunk (2 files)

[Evangelos Foutras]

    Date: Monday, October 21, 2013 @ 17:48:13
  Author: foutrelis
Revision: 197076

upgpkg: xfce4-dev-tools 4.10.0-2

Add upstream patch to solve warnings with full debug builds.

Added:
  xfce4-dev-tools/trunk/xfce4-dev-tools-4.10.0-remove-FORTIFY_SOURCE-2.patch
Modified:
  xfce4-dev-tools/trunk/PKGBUILD

------------------------------------------------------+
 PKGBUILD                                             |   15 ++++++++---
 xfce4-dev-tools-4.10.0-remove-FORTIFY_SOURCE-2.patch |   22 +++++++++++++++++
 2 files changed, 33 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-21 15:43:00 UTC (rev 197075)
+++ PKGBUILD	2013-10-21 15:48:13 UTC (rev 197076)
@@ -5,16 +5,23 @@
 
 pkgname=xfce4-dev-tools
 pkgver=4.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Xfce developer tools"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
 license=('GPL2')
 depends=('gtk-doc' 'automake' 'make' 'intltool' 'pkg-config')
-options=('!libtool')
-source=(http://archive.xfce.org/src/xfce/xfce4-dev-tools/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('f79649bbfbbf16881494ee9f67035063765aec12e23ab9bac31de2c8a4f32bf8')
+source=(http://archive.xfce.org/src/xfce/xfce4-dev-tools/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+        xfce4-dev-tools-4.10.0-remove-FORTIFY_SOURCE-2.patch)
+sha256sums=('f79649bbfbbf16881494ee9f67035063765aec12e23ab9bac31de2c8a4f32bf8'
+            '4ecfdf8cdb0940ce1044349bdb6646192dffd2b7f4e890f0ef5f00bfdfad7676')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -Np1 -i "$srcdir/xfce4-dev-tools-4.10.0-remove-FORTIFY_SOURCE-2.patch"
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 

Added: xfce4-dev-tools-4.10.0-remove-FORTIFY_SOURCE-2.patch
===================================================================
--- xfce4-dev-tools-4.10.0-remove-FORTIFY_SOURCE-2.patch	                        (rev 0)
+++ xfce4-dev-tools-4.10.0-remove-FORTIFY_SOURCE-2.patch	2013-10-21 15:48:13 UTC (rev 197076)
@@ -0,0 +1,22 @@
+From 236a0c578369bfc726f7d9a830975cbeaefbfee5 Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick at xfce.org>
+Date: Mon, 23 Jul 2012 15:31:48 +0000
+Subject: Remove FORTIFY_SOURCE=2.
+
+This gives warnings with full debug builds on recent gcc versions.
+---
+diff --git a/m4macros/xdt-features.m4 b/m4macros/xdt-features.m4
+index c5f5583..f258822 100644
+--- a/m4macros/xdt-features.m4
++++ b/m4macros/xdt-features.m4
+@@ -79,7 +79,7 @@ AC_HELP_STRING([--disable-debug], [Include no debugging support]),
+                               -Wcast-align -Wformat-security \
+                               -Winit-self -Wmissing-include-dirs -Wundef \
+                               -Wmissing-format-attribute -Wnested-externs"
+-    CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
++    CPPFLAGS="$CPPFLAGS"
+ 
+     if test x`uname` = x"Linux"; then
+       xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector"
+--
+cgit v0.9.2