Fix bug #279143, compilation error due to missing libgnomeui CFLAGS and LIBS, and fix two qa warnings

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 73 insertions, 3 deletions

diff --git a/gnome-extra/gnome-swallow/ChangeLog b/gnome-extra/gnome-swallow/ChangeLog
index 4365bce13b2e..b841b06c020a 100644
--- a/gnome-extra/gnome-swallow/ChangeLog
+++ b/gnome-extra/gnome-swallow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-swallow
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-swallow/ChangeLog,v 1.13 2009/01/31 18:35:56 eva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-swallow/ChangeLog,v 1.14 2009/07/27 19:22:20 mrpouet Exp $
+
+  28 Jul 2009; Romain Perier <mrpouet@gentoo.org> gnome-swallow-1.2.ebuild,
+  +files/gnome-swallow-1.2-libgnomeui-flags.patch,
+  +files/gnome-swallow-1.2-qa-warning.patch:
+  Fix bug #279143, compilation error due to missing libgnomeui CFLAGS and
+  LIBS, and fix two qa warnings.
 
   31 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
   +files/gnome-swallow-1.2-as-needed.patch, gnome-swallow-1.2.ebuild:
diff --git a/gnome-extra/gnome-swallow/files/gnome-swallow-1.2-libgnomeui-flags.patch b/gnome-extra/gnome-swallow/files/gnome-swallow-1.2-libgnomeui-flags.patch
new file mode 100644
index 000000000000..31d88a037493
--- /dev/null
+++ b/gnome-extra/gnome-swallow/files/gnome-swallow-1.2-libgnomeui-flags.patch
@@ -0,0 +1,39 @@
+Fix compilation error bug #279143, due to missing libgnomeui CFLAGS.
+Fix another bug error during the link phase due to missing libgnomeui LIBS.
+
+ Makefile.am  |    4 ++--
+ configure.ac |    3 +++
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 3de3b2b..0f18f44 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,9 +6,9 @@ dist_servers_DATA = GNOME_Swallow.server
+ 
+ panel_PROGRAMS = gnome_swallow
+ 
+-INCLUDES = ${PANEL_CFLAGS}
++INCLUDES = ${PANEL_CFLAGS} ${LIBGNOMEUI_CFLAGS}
+ 
+ gnome_swallow_SOURCES = gnome-swallow.c
+-gnome_swallow_LDADD = ${PANEL_LIBS} 
++gnome_swallow_LDADD = ${PANEL_LIBS} ${LIBGNOMEUI_LIBS}
+ 
+ EXTRA_DIST = debian/dirs debian/control debian/changelog debian/copyright debian/install debian/rules
+diff --git a/configure.ac b/configure.ac
+index c20f63e..d9bccb5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,8 +9,11 @@ AC_PROG_CC
+ 
+ PKG_PROG_PKG_CONFIG
+ PKG_CHECK_MODULES(PANEL, [libpanelapplet-2.0])
++PKG_CHECK_MODULES(LIBGNOMEUI, [libgnomeui-2.0])
+ AC_SUBST(PANEL_CFLAGS)
+ AC_SUBST(PANEL_LIBS)
++AC_SUBST(LIBGNOMEUI_CFLAGS)
++AC_SUBST(LIBGNOMEUI_LIBS)
+ 
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
diff --git a/gnome-extra/gnome-swallow/files/gnome-swallow-1.2-qa-warning.patch b/gnome-extra/gnome-swallow/files/gnome-swallow-1.2-qa-warning.patch
new file mode 100644
index 000000000000..6e71ae0a4ec8
--- /dev/null
+++ b/gnome-extra/gnome-swallow/files/gnome-swallow-1.2-qa-warning.patch
@@ -0,0 +1,19 @@
+Fix two qa warnings due to "implicit declaration of function _exit()" which
+we can find into "unistd.h", and "implicit declaration of function exit()" which
+we can find into "stdlib.h"
+
+ gnome-swallow.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/gnome-swallow.c b/gnome-swallow.c
+index 143ef1c..cb4d38a 100644
+--- a/gnome-swallow.c
++++ b/gnome-swallow.c
+@@ -1,5 +1,7 @@
+ #include <string.h>
+ #include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
+ #include <signal.h>
+ #include <sys/wait.h>
+ 
diff --git a/gnome-extra/gnome-swallow/gnome-swallow-1.2.ebuild b/gnome-extra/gnome-swallow/gnome-swallow-1.2.ebuild
index d0ede7f5f734..3681277370a2 100644
--- a/gnome-extra/gnome-swallow/gnome-swallow-1.2.ebuild
+++ b/gnome-extra/gnome-swallow/gnome-swallow-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-swallow/gnome-swallow-1.2.ebuild,v 1.7 2009/01/31 18:35:56 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-swallow/gnome-swallow-1.2.ebuild,v 1.8 2009/07/27 19:22:20 mrpouet Exp $
 
 inherit autotools gnome2
 
@@ -30,5 +30,11 @@ src_unpack() {
 	# Fix compilation with --as-needed, bug #247521
 	epatch "${FILESDIR}/${P}-as-needed.patch"
 
+	# Fix compilation error, due to missing libgnomeui FLAGS
+	epatch "${FILESDIR}/${P}-libgnomeui-flags.patch"
+
+	# Fix qa warnings, due to missing stdlib.h and unistd.h headers
+	epatch "${FILESDIR}/${P}-qa-warning.patch"
+
 	eautoreconf
 }