Fix building with dev-libs/glib >= 2.31 as reported by rlvampire (Freenode)

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 44 insertions, 12 deletions

diff --git a/x11-misc/google-gadgets/ChangeLog b/x11-misc/google-gadgets/ChangeLog
index 83b4e0a7c77b..7a9f1e3f81c2 100644
--- a/x11-misc/google-gadgets/ChangeLog
+++ b/x11-misc/google-gadgets/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/google-gadgets
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.44 2012/03/15 02:54:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.45 2012/04/20 12:00:11 ssuominen Exp $
+
+  20 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
+  google-gadgets-0.11.2.ebuild, +files/google-gadgets-0.11.2-glib-2.31.patch:
+  Fix building with dev-libs/glib >= 2.31 as reported by rlvampire (Freenode)
 
   15 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
   google-gadgets-0.11.2.ebuild:
diff --git a/x11-misc/google-gadgets/Manifest b/x11-misc/google-gadgets/Manifest
index 1682667086c0..9302fa1eaf01 100644
--- a/x11-misc/google-gadgets/Manifest
+++ b/x11-misc/google-gadgets/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX google-gadgets-0.11.2-glib-2.31.patch 522 RMD160 656c543a03bdf874c82dc0588e02c175b6b6dc92 SHA1 628339aeec9c745cf80f4b28419b9b2ab3d6c925 SHA256 44f9cb40ef7eaee7f5ff456593f81605724b5a61d21dc03bad16945cdb7605ee
 DIST google-gadgets-for-linux-0.11.2.tar.bz2 2539750 RMD160 6497189e64793d2cab16058b4baeb42f3198b97b SHA1 22716f5ae640c7f201012d9d75868137c23ebc79 SHA256 2f129ae6c294876b3bc29bdf66c0f02e2c1000f97aadb3540d296560a14f343f
-EBUILD google-gadgets-0.11.2.ebuild 4341 RMD160 36f0b155bbdcd3c6fb8852235d65e35560fa23b8 SHA1 346fddb530274baeb450e0c151b471a199976b4d SHA256 02a7e1199605058101ef8a9feb8d102c339e2517d80a0222ad35cbc6823c3e66
-MISC ChangeLog 8651 RMD160 4c8282975a8f1aa81c1a4106eed0942fcec7109a SHA1 2c3d9a29305e1d5fd1a232e31400d6721077af40 SHA256 50a5ee54c4338741c98afbf6a1dd8b2383c6e60f9b430b48644332213c72b240
+EBUILD google-gadgets-0.11.2.ebuild 4385 RMD160 bd6ef179d77abdedbfd199bf073d6703dff134ea SHA1 104b93fc832c61ddf6b1f60dfee3513f7906421f SHA256 644c81abe3549aac6b569a37ed3ec7fb308f3a5396f3ff378fba1b09d148dc1b
+MISC ChangeLog 8862 RMD160 1bbdf8c960dfc4038d8538854e208553097eea1e SHA1 63a00111e8a3f3780006f536a7686257f47fde29 SHA256 f1a9e688ceedbbd10518fc8d1289d94bd9d23b76744798c0d49559cb132bd14e
 MISC metadata.xml 464 RMD160 1c08fe6baa5fc02e03021ba76b2ac2bfbba0f735 SHA1 a1972f67e17c9449bbd43e3664da04cab8fdf21d SHA256 0743b51beb0949fc2f82bebe1a74f71c4c825214c90e10bf9ba6633e7f0658d6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPYVnvAAoJEEdUh39IaPFNEs0H/AxZnlBYQmdHST5QyY5qXfEq
-hPLpVdTyyBE72HNcXZHiCZuJN5uo20CLlvHeONK3xWLjJBYmTB/JOz4vxe46IXii
-3RULACw3h5GZEbt8dZPS5mvizSwYQE/j3YKLCmyfY/2HXGyDmH4rbq0bPpG/Wkw2
-pgI3Kgt49pvPFS6qDBffDdNEPMoe8X6pN5l/JfgBzVoJP0aHNcoTw/HLuAYGGjM1
-9Uqg2/kcOqYGGZtkMSO/9XBaJxYNjE2BPd6PJx+UYu8s21rha6tCHQlotKz/LlCl
-KkO49aO2v8j+w8zilJdodl+TOlN6SPXuajHKOp2jM4rzbEjiS+owBKl5Jz2gLfM=
-=Ob2m
+iQEcBAEBAgAGBQJPkU9wAAoJEEdUh39IaPFNdScH/iGkH6r4ulZH/qDxcM/EmO2L
+VPx7561uGW89N1WysSMhk3q34WbZ31DuO6gpd6Ags0FVkVpZV/uyH+uWabQp+pm9
+skumGpXjex8oW5EIe6Tnd2ZgXnu+/JSGn+dV99oFcr787k/5onAxjd6bRAuRSzxi
+CacIZxBcicrQmspNqGMJvOCaNb81ljf6x/ha6MrbxV61UlxdwEJJbaeHQsPuohGP
+Q9bmn6+AmKfdWsZLAecTShMBJ1LSFbPK9wV1GNiJNbXVEhmXET1xbs3zhQAjD7qy
+c+y0xBEyiYL22NyAdAJORkf5S4fnkYotF4Bu+00NY2rjxLuUQq5cGo99E0qqZj4=
+=I6hV
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/google-gadgets/files/google-gadgets-0.11.2-glib-2.31.patch b/x11-misc/google-gadgets/files/google-gadgets-0.11.2-glib-2.31.patch
new file mode 100644
index 000000000000..61de05162886
--- /dev/null
+++ b/x11-misc/google-gadgets/files/google-gadgets-0.11.2-glib-2.31.patch
@@ -0,0 +1,25 @@
+--- ggadget/gtk/main_loop.cc
++++ ggadget/gtk/main_loop.cc
+@@ -16,9 +16,8 @@
+ 
+ #include <fcntl.h>
+ #include <stdint.h>
+-#include <glib/ghash.h>
++#include <glib.h>
+ #include <gtk/gtk.h>
+-#include <glib/gthread.h>
+ #include <ggadget/common.h>
+ #include "main_loop.h"
+ #include "utilities.h"
+--- hosts/gtk/main.cc
++++ hosts/gtk/main.cc
+@@ -14,8 +14,8 @@
+   limitations under the License.
+ */
+ 
++#include <glib.h>
+ #include <gtk/gtk.h>
+-#include <glib/gthread.h>
+ #include <locale.h>
+ #include <signal.h>
+ #include <unistd.h>
diff --git a/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild b/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild
index 0365eab11531..c38fce6f4648 100644
--- a/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild
+++ b/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild,v 1.14 2012/03/15 02:54:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild,v 1.15 2012/04/20 12:00:11 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils fdo-mime multilib
@@ -81,6 +81,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-glib-2.31.patch
+
 	sed -i -r \
 		-e '/^GGL_SYSDEPS_INCLUDE_DIR/ c\GGL_SYSDEPS_INCLUDE_DIR=$GGL_INCLUDE_DIR' \
 		configure.ac || die