[patch] terminal-configure.in.patch

terminal-configure.in.patch (text/plain), 2.30 KB, created by Tiago Cunha (RETIRED) on 2009-06-11 19:30:25 UTC

diff -Nru terminal.orig/files/terminal-configure.in.patch terminal/files/terminal-configure.in.patch
--- terminal.orig/files/terminal-configure.in.patch	1970-01-01 01:00:00.000000000 +0100
+++ terminal/files/terminal-configure.in.patch	2009-06-11 20:44:47.221287207 +0100
@@ -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 -Nru terminal.orig/terminal-0.2.12.ebuild terminal/terminal-0.2.12.ebuild
--- terminal.orig/terminal-0.2.12.ebuild	2009-06-11 20:44:22.203287184 +0100
+++ terminal/terminal-0.2.12.ebuild	2009-06-11 20:49:29.385286803 +0100
@@ -5,7 +5,7 @@
 EAPI="1"
 
 MY_P="${P/t/T}"
-inherit xfce4
+inherit autotools eutils xfce4
 
 XFCE_VERSION=4.6.1
 
@@ -37,4 +37,12 @@
 	XFCE_CONFIG+=" $(use_enable dbus) $(use_enable doc xsltproc)"
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-configure.in.patch
+	AT_M4DIR=/usr/share/xfce4/dev-tools/m4macros eautoreconf
+}
+
 DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"