Add patch to remove -Werror during build with USE=debug, patch by Tiago Cunha - bug 265587

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 62 insertions, 16 deletions

diff --git a/x11-terms/terminal/ChangeLog b/x11-terms/terminal/ChangeLog
index d729fb0f07cd..d1262a2a174a 100644
--- a/x11-terms/terminal/ChangeLog
+++ b/x11-terms/terminal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-terms/terminal
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminal/ChangeLog,v 1.16 2009/06/10 07:30:26 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminal/ChangeLog,v 1.17 2009/06/13 03:22:42 darkside Exp $
+
+  13 Jun 2009; Jeremy Olexa <darkside@gentoo.org>
+  +files/terminal-configure.in.patch, terminal-0.2.12.ebuild:
+  Add patch to remove -Werror during build with USE=debug, patch by Tiago
+  Cunha - bug 265587
 
   10 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
   terminal-0.2.12.ebuild:
diff --git a/x11-terms/terminal/Manifest b/x11-terms/terminal/Manifest
index b9c9ba09ec82..a38ac56b10af 100644
--- a/x11-terms/terminal/Manifest
+++ b/x11-terms/terminal/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX terminal-configure.in.patch 1372 RMD160 662e7ccbd418fe05457cef49e1a933330b49c760 SHA1 ca9b48464e8a5172784213e60ba6dda137ca935f SHA256 9e0007375d41410b8ac66b3973627dc9e9eed72ff9aa950b677110e0c679201e
 DIST Terminal-0.2.12.tar.bz2 2005311 RMD160 0879cfbb69d33d63a1a816cf5a67b1c836a5bb65 SHA1 f6d0fc380fff6ac6fba7842fd4cfc46e2e5c6e40 SHA256 352205b03e9ed1b9080c61235fbc0fa15609410e724237441055a232a3b603dc
 DIST Terminal-0.2.8.3.tar.bz2 1860706 RMD160 ccb5d5484b2164cac673cd5029d8bbc8793d19d4 SHA1 69add6a7435855ab8bccb82774cacb6a148e7693 SHA256 801eec620b13f5f839ded46705f9386366891ae1f51ba7e171e110f3cbce8b18
-EBUILD terminal-0.2.12.ebuild 1065 RMD160 5d26f2131ddfa1753937fab0934611ac80eebe16 SHA1 e6cbd939c2189c59d149c16cfb439062e6dbbb40 SHA256 8babaaf536b8c1eda234d5a238f683f91f7da11c5000e5af00e39e25329b7dff
+EBUILD terminal-0.2.12.ebuild 1225 RMD160 c8606d7632d5f48cd6efcd89c525df90b3378481 SHA1 9ec6527a264f1b0be6aa25b4f3fb190a2028236a SHA256 ce1a2922b9d0d5db9fe34d239f64eea0d0ae77442aab593d79134303b6e68350
 EBUILD terminal-0.2.8.3.ebuild 1638 RMD160 453adc7648a3361987911a9d8afb5c368358eb9b SHA1 baf0fddbae6da9d48886174665a45f6e895c55c7 SHA256 8843f1b8ef380fd684faeab760f1bd4578ed0a04a1c1d01c3890ec6aaca20a4a
-MISC ChangeLog 9190 RMD160 db28377d68b68284ad54b8ec03b20256dc8b30a2 SHA1 7ee753fa10d1149f17ced49ce4687cfbff0c6849 SHA256 27182f6b2f0331527c4bc44e587364ae2848bbeb0909c389dd84a53d381b99dc
+MISC ChangeLog 9401 RMD160 44132e6198533b7839b7a03148f4ecd6a8d2cb87 SHA1 f4a793d7cd60696ae299be3f95663bce5e58fd18 SHA256 a5834c5900b56611a2fad925cbd711116a153ce690e98340ddebbca8240558e6
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkovYRcACgkQNQqtfCuFneM4AACcDK/bOJy4loSjpjDqtmoetTjO
-UY8AmweHrFRTliLgJKKbnh86DE5LZSRU
-=sMLK
------END PGP SIGNATURE-----
diff --git a/x11-terms/terminal/files/terminal-configure.in.patch b/x11-terms/terminal/files/terminal-configure.in.patch
new file mode 100644
index 000000000000..f02acd5b301e
--- /dev/null
+++ b/x11-terms/terminal/files/terminal-configure.in.patch
@@ -0,0 +1,44 @@
+# Add HAVE_DBUS to AM_CONDITIONAL (prevents automake from failing).
+# Do not append -Werror to CFLAGS if debugging support was enabled (ie
+# -enable-debug), and while there remove the Sun Studio specific check for
+# -errwarn.
+
+--- configure.in.orig	2009-06-11 19:49:23.580627864 +0100
++++ configure.in	2009-06-11 19:50:05.001816291 +0100
+@@ -107,6 +107,7 @@
+     AC_MSG_RESULT([no])
+   fi
+ fi
++AM_CONDITIONAL([HAVE_DBUS], [test "x$DBUS_FOUND" = "xyes"])
+ 
+ dnl **************************
+ dnl *** Check for xsltproc ***
+@@ -162,28 +163,6 @@
+   dnl Print the result
+   AC_MSG_RESULT([$enable_debug])
+ 
+-  dnl Check whether the compiler accepts the -Werror
+-  save_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -Werror"
+-  AC_MSG_CHECKING([whether $CC accepts -Werror])
+-  AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
+-    AC_MSG_RESULT([yes])
+-    PLATFORM_CFLAGS="$PLATFORM_CFLAGS -Werror"
+-  ], [
+-    AC_MSG_RESULT([no])
+-
+-		dnl Check whether the compiler accepts the -errwarn=%all
+-		CFLAGS="$save_CFLAGS -errwarn=%all"
+-		AC_MSG_CHECKING([whether $CC accepts -errwarn=%all])
+-		AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
+-			AC_MSG_RESULT([yes])
+-			PLATFORM_CFLAGS="$PLATFORM_CFLAGS -errwarn=%all"
+-		], [
+-			AC_MSG_RESULT([no])
+-		])
+-  ])
+-  CFLAGS="$save_CFLAGS"
+-
+   dnl Check whether the compiler accepts the -Wall
+   save_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -Wall"
diff --git a/x11-terms/terminal/terminal-0.2.12.ebuild b/x11-terms/terminal/terminal-0.2.12.ebuild
index 66c3372c8403..b042bba04987 100644
--- a/x11-terms/terminal/terminal-0.2.12.ebuild
+++ b/x11-terms/terminal/terminal-0.2.12.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminal/terminal-0.2.12.ebuild,v 1.3 2009/06/10 07:30:26 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/terminal/terminal-0.2.12.ebuild,v 1.4 2009/06/13 03:22:42 darkside Exp $
 
 EAPI="1"
 
 MY_P="${P/t/T}"
-inherit xfce4
+inherit autotools xfce4
 
 XFCE_VERSION=4.6.1
 
@@ -33,8 +33,14 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	doc? ( dev-libs/libxslt )"
 
+XFCE4_PATCHES="${FILESDIR}/${PN}-configure.in.patch"
+DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
+
 pkg_setup() {
 	XFCE_CONFIG+=" $(use_enable dbus) $(use_enable doc xsltproc)"
 }
 
-DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
+src_unpack() {
+	xfce4_src_unpack
+	AT_M4DIR=/usr/share/xfce4/dev-tools/m4macros eautoreconf
+}