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

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 59 insertions, 4 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/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
+}