Backport upstream patch for calling g_type_init() only when appropiate.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 47 insertions, 12 deletions

diff --git a/x11-misc/shared-mime-info/ChangeLog b/x11-misc/shared-mime-info/ChangeLog
index 7d42e9c215bf..c0e1d6b793cf 100644
--- a/x11-misc/shared-mime-info/ChangeLog
+++ b/x11-misc/shared-mime-info/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/shared-mime-info
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/ChangeLog,v 1.196 2013/10/07 14:55:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/ChangeLog,v 1.197 2013/10/11 07:32:03 ssuominen Exp $
+
+  11 Oct 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +files/shared-mime-info-1.2-g_type_init.patch, shared-mime-info-1.2.ebuild:
+  Backport upstream patch for calling g_type_init() only when appropiate.
 
 *shared-mime-info-1.2 (07 Oct 2013)
 
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index e42384a10cff..86023a841df3 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX shared-mime-info-1.2-g_type_init.patch 696 SHA256 5a0add1740c052a8ed0e3b069eaf717468fc27c48f7134a143899cbb568729ab SHA512 b3b7b2539d4d6faf555b34ec490d51d6c5de4582ac7a2b891ce26a3315d33437377566434bf26ff094aca9a0b12b1383c0b94af737fc0a2e11c0c6c6f9e8d4d3 WHIRLPOOL 6e38b3fb21cd4f7f7cf61e753a4fff07a431be281102cf82d5b2ca2f835fc850529f036ad90107a5fac7e4c87c1e5a27904d473140e3782bd329f8529e5684eb
 DIST shared-mime-info-1.0.tar.xz 496700 SHA256 d2e830e5aae213dd906e64495e9618cc4ef40d7b249e0971a190b04d5802ae8f SHA512 d4b8ad9a982519681fa0fb5b25d8e6b5c4701bca96785b2729e34330a75668c65b0303ad882c7a1928f48cafc7e5a5803f4bdee4db3cfd76dd58e61435c7e6ca WHIRLPOOL 6873f0737be3c902e8cd508fcb725cc6735604c2b9685a07112fcf6f3a25532f3f9c47e1dada67120bd4c984120cf1a5cd6b993da8eaa8269ff316d7397ac0ce
 DIST shared-mime-info-1.1.tar.xz 506660 SHA256 184d094b157a9ec2607ad26a1a1837e6e07f3fcbeb38d8b6d412906156f9e06c SHA512 16aab85d30bc6ec10cbc92667e64a9d4c30f30ab1bcb652cc93387f0f3bf342af9ba318db19325c5e26eacf7caeaa77c496d2aa7fabd3e99dae6ef8d4a57d841 WHIRLPOOL 52cb91b786e89bcba1907e40336e25153c5dc8f0202d5f832b0d59e6728887cf63571c692a0d870204782d99af0652556d1a1fa82024f43c21f2bcdcc6b8d24d
 DIST shared-mime-info-1.2.tar.xz 514612 SHA256 a5516ae241b95a948a6749b1cbf65dc20c3bb563a73cc7bedb7065933788bb78 SHA512 25888c2500e21a9dfdb189e7f48edf409523e0c1566d1f5b0d61eaf4faa4bcb83eca5f56d6d2ab03e44d5d4a0cc4504a566b9c773c8a634c0798f7560fe83d4c WHIRLPOOL 40a6cbf9dbba7fd037d01a34a711f3f484e3be5c240232f6925d31ffb5eda129f1f6f29edb4cff168938161f68558577099d6e9750e5e2a0659df5982c2df6aa
 EBUILD shared-mime-info-1.0.ebuild 1518 SHA256 e955276f2473c7f3e1bc5d9356776e2be2e34ad8e857af8d74cebee659e2114a SHA512 4de5b541e076dab45efceefe22d85c32cfa87ee8d0286a77123bfb6569087a0d27050a58a1b05a186f982ddaafd923af9dcf5ed14010b8c4fddaef01f02cd04c WHIRLPOOL 9a43a96b63b899973654eda8c3457fc67557e68172f9e6c84e1c2dd28b57f88d0351429e0db83ae4f2b02bd0995579da4a45eb1c9032796ef08efafafd106bca
 EBUILD shared-mime-info-1.1.ebuild 1571 SHA256 36cee9959d5940c6a4dc11d641a5efc7f21c64b9b318587562637b4bfef8211e SHA512 a9557fdd2c55bd4e0ed500ea2bd0aed8260e65798103f5bc8c79e8b0895c8eb482d3c5e4231c8537b5d5f8e8b91c779016e870ee45f509f27ab831631c579ccb WHIRLPOOL c337163cd445a26635baa510ab29a96dfb21fa7d12dd5a839678642bbd8860b1b42f0a3b4b2c1c13b181d3eb421fce65c4a7a901b092a6ef50bb1983f92184c5
-EBUILD shared-mime-info-1.2.ebuild 1573 SHA256 5eae578806af0dce3c4c5f92c7f0059fe44050e7ec06a7e2ad01dfeda732e73e SHA512 8f4999049589c4d74c4fb32d9a02444d0b1ba1fc1bc70c985c4bc8165e96b8172e22d5884bc24c509794463f8781e68af5c6c91c135c4bcfb5b319dede6acd28 WHIRLPOOL 6336086d15aecb6ac873f021b76554be27bac7c22cafe34d965e802e960d2a3fd5d70ba7eb3ac13ba75f3e08748fa98eca78c40333e8e0e0c9975479c3e6094e
-MISC ChangeLog 24632 SHA256 80fea4a9a8ac7eb619f5c277dba896dcfbe654fc7c7cddef8a55bd758e44638d SHA512 bd3689ad71807ee03c7462e024c9f77f664da6bd0e11d71cfdbe52546c5f62da3164b542c554a856de750ddba989c33dec9de4dee214a4f6072968c98c6cc669 WHIRLPOOL 22e38c95974e3ac4c1da8312f2821e252900b8664d0c123ded9e98980ea3a59b797295b7313a7000459e2daa2563a7ebb2cb34752016230b8351166b55dd728d
+EBUILD shared-mime-info-1.2.ebuild 1644 SHA256 77d787fadfd06ef393c3cab4f1f459b04d537f35422640918b6acbc67a1eaad4 SHA512 52717b147934ec7c835848a514f98d9fa07ab70c72b9772dea8fef463dbb72bf102a6b32108a8041a4eb6f88fee6eb48601d4389fbdbe999872467621eb7af8b WHIRLPOOL 29654f463e488aca2b4b21d5faad9bc557d78eeb4615734a1c2da4a39761e6034c92365744e1e42be0742e2b5eef98f7d024f4efac5b366c8220dcc05bdb9185
+MISC ChangeLog 24839 SHA256 00956140a2deebeb94fc081448acb44310d2ccb7871945a9aa633f4007eceac1 SHA512 bb079d441fb9edf5dd063ee1756f8600352d26832787c763b2907a884f3e8345adebd744d686df2a7ef7a334e28ef8d889038b3cbebfe9e0b92e1c657e405ad1 WHIRLPOOL e6126dd06d4bcf6446849cf63c238f96dc3649c5755f44202ed7cd328570148fedc55ab9849118530c3288cc0e9382e9575ea8118f63ea490c05868af7decf28
 MISC metadata.xml 234 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97 SHA512 eed880663c66280f6688f896bd6b82d600cac0063eb79da7b1be0fe3bf866e7289edb389a505dfbf45bd9c7e5282748dadd7bf3477759788c1024300796545c3 WHIRLPOOL 79028c7efb93b6255351aebe7f35d1587d07ec1405e8fbee4fd874e42e57e6d10368b0f4ab60c89e115493a094f36af8be1bc2fe79fc2d34daae83dc0f8d7b16
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSUsrYAAoJEEdUh39IaPFNff8H/A6OMU2iy0YknSTdbIjRqT6i
-59PqalqStJ8oqoXYwisALONieEKo8MQVEQs2H8LBGFubX6acf6I2jyPrhWxD0VGc
-eHnFYqzN1d7cw6hv1PnCUSkFLaCPSxwIWHG28aBGmQ6X5tmXcTH239+9VMl3hRiu
-hoSBeMTlLNh2b9IxmsdZPSUnEeSCrdn30yHTpqRua+eVymx8JXKB3p/o4jS7mqF6
-N0Zzq99aKOUBePQQ5FUUE594AMt1Nzbi7C9DcQqDgSUtbuZp5Gq74EzTIxRml51e
-JXFsIVKoGrD4kAkwPMEoMR0raZ6qZfztfoocJ6SD7WBgCOpJbmTwdCP2u5ypVqI=
-=+wAm
+iQEcBAEBCAAGBQJSV6jZAAoJEEdUh39IaPFNi9IH/0u8b1G4eTrzSsnZKSx05V0W
+Qhm6FvAVpHsH64bkoUumQ48iOL4uh33LYaVQw6JnfOY+Za71CmPP218b6w2yugHo
+tlzpUt47XrafVAGpH8m74HI94fPmDR7WnEgFEg54uCFzsHUqBG9jyrmfvk43iMlB
+nNbMRn/OqiVR0XlhlbwZC3Ojn36gfvANjVogTLM6eBBklx2Ykn2nMYBVcm4MdFgD
+1fPDtINgS2cRTqKWH+eXZ4AhPkuTF14QiGzqEtsA2cNNV64KTZvYCrGLZa+w7MOs
+166+7EEBUj+LfJWGARRfyeTaKzdjT6ka2IPdfNAy21eZ170UHBB3y4ILc38n92w=
+=OqtB
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-1.2-g_type_init.patch b/x11-misc/shared-mime-info/files/shared-mime-info-1.2-g_type_init.patch
new file mode 100644
index 000000000000..196925eb5e84
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/shared-mime-info-1.2-g_type_init.patch
@@ -0,0 +1,26 @@
+From 2397314542265405498ea8c82121c174ed9011a5 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 09 Oct 2013 20:09:56 +0000
+Subject: test: Call g_type_init() with older glib
+
+Only call g_type_init() when compiling against an older glib.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=70255
+---
+diff --git a/test-tree-magic.c b/test-tree-magic.c
+index 9b4dfaf..fd5cd7e 100644
+--- a/test-tree-magic.c
++++ b/test-tree-magic.c
+@@ -637,7 +637,10 @@ int main (int argc, char **argv)
+ 	char *content, **lines;
+ 	guint i;
+ 
++#if GLIB_CHECK_VERSION(2,36,0)
++#else
+ 	g_type_init ();
++#endif
+ 
+ 	if (argc != 2) {
+ 		g_print ("Usage: %s [file]\n", argv[0]);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.2.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.2.ebuild
index 1d6e61f2bae4..144bfec959f2 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.2.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/shared-mime-info-1.2.ebuild,v 1.1 2013/10/07 14:55:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/shared-mime-info-1.2.ebuild,v 1.2 2013/10/11 07:32:03 ssuominen Exp $
 
 EAPI=5
-inherit fdo-mime
+inherit eutils fdo-mime
 
 DESCRIPTION="The Shared MIME-info Database specification"
 HOMEPAGE="http://freedesktop.org/wiki/Software/shared-mime-info"
@@ -23,6 +23,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( ChangeLog HACKING NEWS README )
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-g_type_init.patch
+}
+
 src_configure() {
 	econf \
 		$(use_enable test default-make-check) \