Fix building with dev-libs/glib >= 2.31 wrt #412323 by Andre Reinke

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

4 files changed, 53 insertions, 13 deletions

diff --git a/media-video/gxine/ChangeLog b/media-video/gxine/ChangeLog
index b511fec40d9e..0815097b6f96 100644
--- a/media-video/gxine/ChangeLog
+++ b/media-video/gxine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/gxine
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.118 2012/02/24 22:27:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.119 2012/04/17 11:39:45 ssuominen Exp $
+
+  17 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> gxine-0.5.907.ebuild,
+  +files/gxine-0.5.907-glib-2.31.patch:
+  Fix building with dev-libs/glib >= 2.31 wrt #412323 by Andre Reinke
 
 *gxine-0.5.907 (24 Feb 2012)
 
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index 061d1a71d0ec..f2d288a77df4 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -5,20 +5,21 @@ AUX gxine-0.5.905-desktop.patch 377 RMD160 ea7d11a796ff9142cf0f578b3b5a2fe3de4f2
 AUX gxine-0.5.905-fix-nspr-useage.patch 433 RMD160 65af0ddee220ca456acf20eea521fe6a4600cd23 SHA1 fc7a2ce90a8e84d1f519a786de9f477264ea925b SHA256 4d05d9144eba4f30976ed3e33e3985c782b95227d165ab90b4f453c377451ea6
 AUX gxine-0.5.906-endif.patch 349 RMD160 0683bb409616d8ef878e4144e747bd0032fc236f SHA1 0c48cf0457f21dea9bdc70bed62421cd6bbdebfb SHA256 d3d14fdffe9f8e1872bcbf28670d48b72ed76d7a882902bb298902bb8ca4b6fa
 AUX gxine-0.5.906-playlist_segfault.patch 784 RMD160 722c43658e6a74005d941a70db5ce8a0e7cca6a6 SHA1 109819cb076a9ea53f3a5adffb0415b5ee3005fa SHA256 b1fe13c17b71f871a82c7dcc58bc70270e6d3157506f91554a19b721b1591f7d
+AUX gxine-0.5.907-glib-2.31.patch 636 RMD160 07142250875de0c55b8ec74d462f0802ea6354a3 SHA1 413fd32963958b5efbdb9310f45fbdca801c8083 SHA256 c45a8fa2df4a779bbc7866a3d7fd56c4c9946e71656f06452f5f147a9ee4e15c
 DIST gxine-0.5.906.tar.xz 906964 RMD160 6c131bc266acf50bea6f240b3c93ee0fa8692426 SHA1 88495a76f5d7e885d8c75ef145667f21e9a55ede SHA256 7cab1f17cedddef947d32cdc94aa276d20f741db356b08e5efdbf954e9ceaf14
 DIST gxine-0.5.907.tar.xz 910528 RMD160 35be9f7737c1b45787a46dd61916c81c33bea15e SHA1 1b49b5b6a800611db032e4b7fd36af97a731a167 SHA256 b5c925806a35cb23a24a80a39d494cefb529e22c957987741f269a994ab258d5
 EBUILD gxine-0.5.906-r1.ebuild 2500 RMD160 3895697be41cc0ef442b47e3a5c0a101299973bd SHA1 345a411fb2c8c160036bdb391f32e14e667b765c SHA256 d52c3d02933c62e24a64fa5e26c303e5f16ecb8e3255d52f55b0747751c20919
-EBUILD gxine-0.5.907.ebuild 2639 RMD160 648529d0e9bd01f152900a7ef89a242b8e4f2f4e SHA1 f16209c5b5163de165120a985d44a626dd782fb1 SHA256 0c32f9e33047ed159d5983a8e77edd12c4d98d721fb4808a645e48e43171f455
-MISC ChangeLog 16976 RMD160 67fbd7746822b06f307681b6e25aa109c28f1735 SHA1 210df2e6514f6516c36d4ef8722d11a593a67057 SHA256 518482dd3b933f844caf7100ad58d5ebdac59a4c25faa130a00367ca21c9ac39
+EBUILD gxine-0.5.907.ebuild 2687 RMD160 8bf8f7f88182f363dcf49e7fe7f833c8c88aa029 SHA1 362f9a1a382a99e275c0ed2d60f5678ce47ba2b8 SHA256 08a29e0c4bf8683d718729da0cfff0cdc87331f172ab86c787381928de822d73
+MISC ChangeLog 17163 RMD160 155549239abb4a25c62988d77dcdf2faac003871 SHA1 2ca4a611f3b6c9af0a108d335a13c9dc6e3eaec2 SHA256 159ccfb52cae91f6b9f1917a40d4d3376e2d703d14ca239a507ae9dfbdd85b93
 MISC metadata.xml 373 RMD160 879bbceb1af5297cc90a6191f9a40375a4732c81 SHA1 9e40c5d9bb710cc676c38c9a097af598db072e60 SHA256 202b197a4f7feb227636e8de2bc00c6af351fd80f72a7916df100aeadd056bd9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPSA6yAAoJEEdUh39IaPFNZ7IIAJPYkb5Jubz8D+Y2LDUKhJBn
-ZyXZT+ZkK0SUHpKjI1vpPzZxklF+gnB7ybov3uC62xQVAldCbgBd+6vtqoJXcXk4
-lEYjnYHZaiw2Xj9VtXMxfEbQ6tQBCJh9JMC2o6M62UmJ2qzebjJ2gwMndGkVo6LG
-0AFYrnae3BHNspuBHSuXks487sQhcm/cKGFauUYpA6ItivJMlXjrbNdcc6dXlsRS
-6g+2LBOFim0GijnL5p70iQNlix1l08/Vmst3CFH+BJcJ5LF45UukIG0viMP1xmYw
-+D8db4tYs0nUHhEd+wcepqXzh1DMvm0sIsySlsCfj0E1ZoFT+oOLi3alXzekRdc=
-=EJhy
+iQEcBAEBAgAGBQJPjVY1AAoJEEdUh39IaPFNhjsH/Au1Qj/mUD6EwqL5CvjNvAtm
+zjMuJ/yydDydwl55LALZuWQo+R8lQIhcSXl5u1lSAQlRcP6NUELVQePeOg7SEkp6
+sNXQVPm5iBc66CEFLsw85KCgcCRBjESuFk7sc+ldgVcVw6S82HUOxxfTa6cD301K
+XkBSAKek2A17NERPLv3FYO49xgts89krHwpsTBW/ZXAkjfx73c9LuaZdzqZRiuDk
+9vMOk/olyERu0CvkV5e3tdgb5jQ17ifojnExUpBEGUiTdzso1A6KEel1K81mNyEZ
+rDcuHNS2XadUpixjmvTwcCd0Eh6VaV3PlCPaG+9KfVQn55TE3Uen/v05VzbDUW0=
+=HPBF
 -----END PGP SIGNATURE-----
diff --git a/media-video/gxine/files/gxine-0.5.907-glib-2.31.patch b/media-video/gxine/files/gxine-0.5.907-glib-2.31.patch
new file mode 100644
index 000000000000..9edea6c84af6
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.5.907-glib-2.31.patch
@@ -0,0 +1,34 @@
+http://bugs.gentoo.org/412323
+
+--- src/console_output.h
++++ src/console_output.h
+@@ -21,7 +21,7 @@
+ #ifndef GXINE_CONSOLE_OUTPUT_H
+ #define GXINE_CONSOLE_OUTPUT_H
+ 
+-#include <glib/gmessages.h>
++#include <glib.h>
+ 
+ void console_output_init (void);
+ 
+--- src/engine.c
++++ src/engine.c
+@@ -30,7 +30,7 @@
+ #include <errno.h>
+ #include <unistd.h>
+ 
+-#include <glib/gthread.h>
++#include <glib.h>
+ 
+ #include "engine.h"
+ #include "ui.h"
+--- src/main.c
++++ src/main.c
+@@ -46,7 +46,6 @@
+ #include <gdk/gdk.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <glib.h>
+-#include <glib/gmessages.h>
+ 
+ #include "desktop_integration.h"
+ #include "engine.h"
diff --git a/media-video/gxine/gxine-0.5.907.ebuild b/media-video/gxine/gxine-0.5.907.ebuild
index 7c157f9b5bc0..ec97fb5c8356 100644
--- a/media-video/gxine/gxine-0.5.907.ebuild
+++ b/media-video/gxine/gxine-0.5.907.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/media-video/gxine/gxine-0.5.907.ebuild,v 1.1 2012/02/24 22:27:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.907.ebuild,v 1.2 2012/04/17 11:39:45 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils fdo-mime gnome2-utils multilib nsplugins
@@ -43,7 +43,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-0.5.905-desktop.patch \
 		"${FILESDIR}"/${PN}-0.5.905-fix-nspr-useage.patch \
-		"${FILESDIR}"/${PN}-0.5.906-endif.patch
+		"${FILESDIR}"/${PN}-0.5.906-endif.patch \
+		"${FILESDIR}"/${PN}-0.5.907-glib-2.31.patch
 
 	# need to disable calling of xine-list when running without
 	# userpriv, otherwise we get sandbox violations (bug #233847)