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

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 37 insertions, 3 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/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) \