Fix bug #259052 c#5. Thanks to Markus Meier <maekke@gentoo.org> for spotting the issue.

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

4 files changed, 76 insertions, 7 deletions

diff --git a/x11-libs/gtkhotkey/ChangeLog b/x11-libs/gtkhotkey/ChangeLog
index ec829aa50bb0..95ae54f0f8fc 100644
--- a/x11-libs/gtkhotkey/ChangeLog
+++ b/x11-libs/gtkhotkey/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtkhotkey
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkhotkey/ChangeLog,v 1.5 2009/03/22 11:04:02 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkhotkey/ChangeLog,v 1.6 2009/03/22 15:51:29 serkan Exp $
+
+  22 Mar 2009; Serkan Kaba <serkan@gentoo.org>
+  +files/gtkhotkey-0.2.0-fix-implicit-declaration.patch, gtkhotkey-0.2.0:
+  Fix bug #259052 c#5. Thanks to Markus Meier <maekke@gentoo.org> for
+  spotting the issue.
 
   22 Mar 2009; Serkan Kaba <serkan@gentoo.org> gtkhotkey-0.2.0:
   Restrict tests per bug #259052 c#3
diff --git a/x11-libs/gtkhotkey/Manifest b/x11-libs/gtkhotkey/Manifest
index 6b486b37b988..c2f08b37a1e1 100644
--- a/x11-libs/gtkhotkey/Manifest
+++ b/x11-libs/gtkhotkey/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA1
 
 AUX gtkhotkey-0.2.0-buildfixes.patch 3301 RMD160 4c7111ceb04400ae9db6725402d11e0aaa88e521 SHA1 c2486c5ba8dc14cb383799401c878125d338ca89 SHA256 f6e5bede0c0d9fe040292bc6a6a13c5e7fdb9cb22cfe0b3f9c1bf59d538a4ecf
+AUX gtkhotkey-0.2.0-fix-implicit-declaration.patch 3194 RMD160 b8f907ce3dd75f12ecd69bb16248990088f45c01 SHA1 967865c892b38e5a7c8aa4f52f891cc58c944395 SHA256 62b5d8e30bdde941464ba809f52a79a26df70ee8555e1cc6dc5f5897c9f7da39
 DIST gtkhotkey-0.2.0.tar.gz 443750 RMD160 c74ac7cf0fb85c4efe94c94aa2bffdceb9a269cc SHA1 7fe04c61e45daab4a819bfd3ff0b5dd725ab8b96 SHA256 19fd868e97adf9d93596d95c005773ffe23d6ac378d461c22c2642e53014d1db
-EBUILD gtkhotkey-0.2.0.ebuild 1174 RMD160 c0d5ac83bcb64d39cc19e31fdff0c5b20aef2320 SHA1 023ad36116d687d980866de093532bf3e729e8f5 SHA256 7bb4483fc73fcee2bb93f22da7607aa3e9c54df6c9f9c6d8ce420c1e0bed2575
-MISC ChangeLog 1046 RMD160 a42bff8fa1299ef2a58d2fb2ae35de1013b1a7bb SHA1 3a86354383ce7354a7f14500e9c1ce35618b69ac SHA256 d345969e50f256c1cd8ac08e6a4166471b6783fe2e1b1718774ac8526202ec97
+EBUILD gtkhotkey-0.2.0.ebuild 1232 RMD160 6eda6777a9d6de9073f4a79b6cda57a353600f8c SHA1 1965d18f1efae5f3136f46aae54a6f841e55c083 SHA256 073f1cafc0265d7bc9d57f15e2585e12f06b895ff3a8de82996a16665c49c9be
+MISC ChangeLog 1260 RMD160 5dcb3f57caebe2bb044061d489be4c07c9d71d9c SHA1 ce427e426ecc749aefcfa146af956d6a2055a4cd SHA256 3bb95e762f3760f443f2d5e427917a20c866420ee398c26c0fd83888e4b83bad
 MISC metadata.xml 292 RMD160 6e2715b1e46eec24c66e8f750f7edf8cc3cb7962 SHA1 c7db2fb6d6a9ba34d3c3b6166f5c60bca70cd7f3 SHA256 fcb84d92a48c8e66792c10f87ce8158fab173a768d18a56b333d089693acc8ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAknGGygACgkQRh6X64ivZaISaQCePrfTwDUaotZhkb9CXzmcwZAY
-938An3erEVn03PPhD/HrszJYfmHbvfv6
-=N1am
+iEYEARECAAYFAknGXoYACgkQRh6X64ivZaLzmwCfYlX70In2RPG3CE5iKI6rW+Lh
+JIEAn2ab7VOjc/Pifd9d3aALOdB4IoCi
+=afs7
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtkhotkey/files/gtkhotkey-0.2.0-fix-implicit-declaration.patch b/x11-libs/gtkhotkey/files/gtkhotkey-0.2.0-fix-implicit-declaration.patch
new file mode 100644
index 000000000000..a7c832f75c0a
--- /dev/null
+++ b/x11-libs/gtkhotkey/files/gtkhotkey-0.2.0-fix-implicit-declaration.patch
@@ -0,0 +1,62 @@
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: serkan@gentoo.org-20090322154025-il95by1cherlcq3w
+# target_branch: ../gtkhotkey-0.2
+# testament_sha1: 57cd0c86a0dc8abd9938a6c3453158860577fdfc
+# timestamp: 2009-03-22 17:40:48 +0200
+# base_revision_id: mikkel.kamstrup@gmail.com-20081028221117-\
+#   90lhle1k6yd06j6f
+# 
+# Begin patch
+=== modified file 'configure.ac'
+--- configure.ac	2008-10-27 22:28:44 +0000
++++ configure.ac	2009-03-22 15:40:25 +0000
+@@ -45,7 +45,7 @@
+ AM_PROG_LIBTOOL
+ 
+ 
+-PKG_CHECK_MODULES(GTK_HOTKEY, [glib-2.0 >= 2.15.6 gobject-2.0 >= 2.15.6 gio-2.0 >= 2.15.6 gtk+-2.0 >= 2.12])
++PKG_CHECK_MODULES(GTK_HOTKEY, [glib-2.0 >= 2.15.6 gobject-2.0 >= 2.15.6 gio-2.0 >= 2.15.6 gio-unix-2.0 >= 2.15.6 gtk+-2.0 >= 2.12])
+ AC_SUBST(GTK_HOTKEY_CFLAGS)
+ AC_SUBST(GTK_HOTKEY_LIBS)
+ 
+
+=== modified file 'src/gtk-hotkey-key-file-registry.c'
+--- src/gtk-hotkey-key-file-registry.c	2008-10-27 21:09:19 +0000
++++ src/gtk-hotkey-key-file-registry.c	2009-03-22 15:40:25 +0000
+@@ -20,6 +20,7 @@
+ #include "gtk-hotkey-utils.h"
+ 
+ #include <gio/gio.h>
++#include <gio/gdesktopappinfo.h>
+ 
+ enum  {
+ 	GTK_HOTKEY_KEY_FILE_REGISTRY_DUMMY_PROPERTY
+
+# Begin bundle
+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
+NQ/8XckU4UJDbd7DRA==
diff --git a/x11-libs/gtkhotkey/gtkhotkey-0.2.0.ebuild b/x11-libs/gtkhotkey/gtkhotkey-0.2.0.ebuild
index fc1ce07df8b2..de9671cb59a7 100644
--- a/x11-libs/gtkhotkey/gtkhotkey-0.2.0.ebuild
+++ b/x11-libs/gtkhotkey/gtkhotkey-0.2.0.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/x11-libs/gtkhotkey/gtkhotkey-0.2.0.ebuild,v 1.6 2009/03/22 11:04:02 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkhotkey/gtkhotkey-0.2.0.ebuild,v 1.7 2009/03/22 15:51:29 serkan Exp $
 
 EAPI="2"
 
@@ -34,6 +34,7 @@ DEPEND="${COMMON_DEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-buildfixes.patch
+	epatch "${FILESDIR}"/${P}-fix-implicit-declaration.patch
 	eautoreconf
 	sed -i -e "s: install-gtkhotkeydocDATA ::" Makefile.in || die "Patching Makefile.in failed"
 }