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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 77 insertions, 15 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/Manifest b/gnome-extra/gnome-swallow/Manifest
index dfae8ab900df..43a9272a98c3 100644
--- a/gnome-extra/gnome-swallow/Manifest
+++ b/gnome-extra/gnome-swallow/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnome-swallow-1.2-as-needed.patch 1520 RMD160 fb0a3aa36bbb84086d8def080637bd8936bec41f SHA1 cea14734abb1be878ea827570cc773fb8c426029 SHA256 a457506d1bf665bca0d47bc689123998140f437e0c52224b2df8f972f9c006b9
+AUX gnome-swallow-1.2-libgnomeui-flags.patch 1166 RMD160 ae8d84edbb6da9c68d03bcf65ae789a9ce6b53b2 SHA1 c5e1fb238e349e29a3da503294c310d519a73935 SHA256 9106855ef23799a93c7d161da795f60ac62faa849798f0afe21ba00cb0b93468
+AUX gnome-swallow-1.2-qa-warning.patch 530 RMD160 6a34040eaca680c72794d97d642cdee67b01bcb7 SHA1 910b144ff8d5211d99e08b1a9f1348993802265d SHA256 07825f35597f022b444c80bc9ddbef1728f35e3ea23470b27759fc50c4e1c3c2
 DIST gnome-swallow-1.2.tar.gz 90732 RMD160 c142a44f10a105bedcd74b85522413daa50dc3b0 SHA1 ac4ae83b57301ffdcd8c7870211f378878c132e3 SHA256 09df0782e216591d1bff90e50b894242fa135f577f3502223e57734dc304afc8
-EBUILD gnome-swallow-1.2.ebuild 918 RMD160 acbeb395d60c8ed5bc5bd524ca7f14bdacc295ff SHA1 1fc9fbf6963242bb0e1d5e2e685cffed82fba39b SHA256 ff7bc0bcfb849aed894325c697c0d1989018c909902770238cc607e70e148792
-MISC ChangeLog 1712 RMD160 92b51dc574ed9f498544e393dddd182553b16628 SHA1 e2c1f0e9173863c201d94e43551c4aa83faa8188 SHA256 928a6b675b8f5d048a70a45c3f4b072ccffc638d1d1137e7e6bbd19369d3aae4
+EBUILD gnome-swallow-1.2.ebuild 1141 RMD160 498dc08431d4a59b9e2173a20ce4da97891277ff SHA1 7d9ea9a8deadc38a21995e8ceec890b04fd9d3d3 SHA256 f42867d6f7895617d2ef021cdd4c0c13abf10e4686e19edc433640c50e8e086a
+MISC ChangeLog 1996 RMD160 6c29fc65b5c9dfaafe722e2dcfa57f0597d30e5d SHA1 5bdeec1e796a43fab0830bb85fc9c891d3a724ed SHA256 93cbec7c1349e5109d7fac3dd3d208baa74e037a450b4254b6e297d381e293f6
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmEqB8ACgkQ1fmVwcYIWAYUtACeJ4A6mfOYcUHayaSKMOAdhFZ3
-mQQAn2bnpjIV1FZ5kWWnUQIDmFq0RvWT
-=/Qld
------END PGP SIGNATURE-----
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
 }