Fix g_thread_init/glib-2.32 build failure (bug #432938, thanks to Oschtan).

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

4 files changed, 59 insertions, 11 deletions

diff --git a/games-board/aisleriot/ChangeLog b/games-board/aisleriot/ChangeLog
index 2419db5a0ad0..61ef2781f48f 100644
--- a/games-board/aisleriot/ChangeLog
+++ b/games-board/aisleriot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/aisleriot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/aisleriot/ChangeLog,v 1.7 2012/08/26 15:43:23 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/aisleriot/ChangeLog,v 1.8 2012/08/28 18:56:47 tetromino Exp $
+
+  28 Aug 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  aisleriot-3.2.3.2-r1.ebuild, +files/aisleriot-3.2.3.2-g_thread_init.patch:
+  Fix g_thread_init/glib-2.32 build failure (bug #432938, thanks to Oschtan).
 
 *aisleriot-3.4.1-r1 (26 Aug 2012)
 *aisleriot-3.2.3.2-r1 (26 Aug 2012)
diff --git a/games-board/aisleriot/Manifest b/games-board/aisleriot/Manifest
index 27e6e52228f9..59df0b45f19a 100644
--- a/games-board/aisleriot/Manifest
+++ b/games-board/aisleriot/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX aisleriot-3.2.3.2-g_thread_init.patch 1152 SHA256 1e924da51c5b3e2b60751a4792def2710c346ebdce2ebecc063348f4fb49b047 SHA512 26b5f287a42b0a8756754c5b4840d478ac82eac1575a4fb7831d80a8d2975f9898d6cedc23f927c1bc35d5161bd2d3cb5d3b1b26459cf7364c77949b9d489a28 WHIRLPOOL ef1158633da3aa25537df3b2a9f093acbc40152b7bc21221a385a163ddbe4b5f80e24fb5cd7519c9363b69de30df598ee665f73c008cf574927728671ae94fbb
 DIST aisleriot-3.2.3.2.tar.xz 4202212 SHA256 06eeeef49e7a0f8a98142085a64bc7830d0dd02e480fbfa1309545fccc977a36 SHA512 28525fbe6d89c859d2379145e5931f1e79af79cf8f22328c92e7a4fcc87d7691743ebe20d61dd04ebe51ff2d7b53f0add43969915e94c5f9fac0b27ee3ae0451 WHIRLPOOL 155abc9a8641f23164a2edcf597344cc11106d00f9a36bf50b14f1c280fd5b5f7e8293ebedaaff031bd83993f0bfb77c870ea5dfdcdc7d0cb47d09d3841279b8
 DIST aisleriot-3.4.1.tar.xz 4164560 SHA256 f62629fdaf9af23dd3f6a780258b15c927f50a4c43b72d29e9fed4d625e2451b SHA512 2abdb02846cdc8dd74b0c22c5c7f19420d27a8f4dab3b459066744f13274b480e22e4a0ae0bd20d4239d38cd01dbcdc521a96a5e86a7ed0f799302201563b9d2 WHIRLPOOL f6adf09504b377f18fcd7112824b25f339d4a01da09f255a601aa89e723a93183304af4a8557ce6370292596adb212262471b921ff913362f53ba62514d7bda5
-EBUILD aisleriot-3.2.3.2-r1.ebuild 2304 SHA256 512be474fe5ac9a07bbab5b8bf8a63278abb4423f30c65227e469d2464e5b7a9 SHA512 fb3506db3edcccc521b5338243b4db3876cebfdc4c3730a79759b19d780ead965d5da989df62525efa3f350b4a44d51df17123539e08c82d7be6451f7fb3f5b6 WHIRLPOOL edd24f2eb8137cc82273a42d1cc67c482255ba308c62f4eaccd087f08f180d48698fca4232f5e28d11adecff779bdb6cb51e5a6d2d170df54b11c6a039332b9a
+EBUILD aisleriot-3.2.3.2-r1.ebuild 2398 SHA256 f430e02eaf2ff3b18794d2aaa6b16565b3183a4b76b4cae60dec4ea3b2f389b9 SHA512 f01e6f46ca43a6ccc07388401b7dff3448f591a31bb8c78de7fef21a32a4a1c54a54e9336ab387674dd6c06af18e9080c221feb5f6b121adfee72bfbe75e61ce WHIRLPOOL e7ae41d77d5f88928a8f1d35a1af5f4a45a4f34cfa64cd56b00b09ebb74a3063f60a79788f4ed35ba205105b1a7c613388684313c95fbed8368ab4af8dd69cb7
 EBUILD aisleriot-3.2.3.2.ebuild 1979 SHA256 18ac1f266a690248331279c1be4d2a5e222c0f0ff7c6deb08bb567b58279c76d SHA512 1b27eab4b4f57b1a2b1beb7994db521b3739c8b978f7dab7f4275e3c9b56016fd8b506b167295061bf680d46c5daeb4c449655d43c29e776f42e44b6d65b6675 WHIRLPOOL 274ae5c025bcf7e0c08a20f04ab8d215f8640e818a920c2f9d58aef2b5f81b7a3a7517a50b99f25ddc81e56c76473ec9e448a7d7954e94b9e2af6e6131789b7d
 EBUILD aisleriot-3.4.1-r1.ebuild 2362 SHA256 fd99fce028114d4f41043dd7af77a621fe3052b7a6edaa1d7117dcc20d97d312 SHA512 3cd0d8657291975e97fc1350cea8b6ac47389bbf675093e1105e7ab339f19e801cb864f2a1bab6998cb7a3dec08bab5c6c86c187b07fa9b47669297dcbbfde93 WHIRLPOOL 626d165742aad30b0089aa2a66a56dcdf9574b2367ea80eed938dc2598815c52f232c3164ac442e9f1f0a407151760e6a539d541111d02e06d138167071d202a
 EBUILD aisleriot-3.4.1.ebuild 2037 SHA256 daea29da9538b3bb2eec475697adf613ff1dd952f7eea15b803dd59881b75008 SHA512 ea636ff5846fcd3c782947510ef164e305ddd261a57b9a5d4d10180d371dfb60fd27b1f5ab1c6969fd22cf305f9e77ea0d1e2c69a128e02c8b33715968516236 WHIRLPOOL b295232aa3dba87f1e76469b8bc4cf3a9191832e2492677475fcaafd7e2b17a12e8327a61789bdc05d81c6700b6d15b92d30d8e5ffd17b45fa786e51bd4fb6fe
-MISC ChangeLog 1926 SHA256 07010eee133280d08e7982036e682436adf8c2080e293aacb72408a82b22b236 SHA512 0dca2b73fa061e5860e8b1dfc6f8b04c6ebc64eb5ddf4444198f4379e58393087485007ed51a2a9e47b465f3e81947379840c5c5147d3ab3319a550b7621ca1e WHIRLPOOL d65b9be5ec1befe599654818a4e5261fd68cf5aebf7c4ad4e37e439946bca81cab9df643b2808a509fd887f7c9982e665cadb9a1448b3539a4a458b207b3160c
+MISC ChangeLog 2141 SHA256 4804234a742fc1b13726e412da40e89a2a3810f2e5b934f72c3cee3bb20f81d3 SHA512 bf9a6f840870e920bce5a653d4bdf07f1cb2b666cf99e0322c9b8fc5ca6ee7889d4651621538ac37d33a47c1181464cf835a3bc16502b5f8deafb888fa2e4478 WHIRLPOOL f293d30003890026e177e82214aeaf3154ea99a11e72fdd6e73c0d6299ad6fe7f4faaf635ef7befb16d06d887b55c0fd67229c0d09b38435f31ffec19fb0f6c9
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQOkQhAAoJEJ0WA1zPCt1hzkkIALaig1sC9bgJFto0Q0ez7gBQ
-O+xT70UF0nkCspJTSHUrdIBDqH4YoeBXsU8UATsxagKqtz9jAMmEV4zMEKgWXm7I
-dtQNfM3na3kazsuF+4ZiH/8LgfI1bov7tWxXonKwke0SROr4CoQM6kltbsol1Ubh
-YlaqgN3SDbNckgOw4uxZdY/XFhkDolsCqf97EZSo/CZ63amuyTaD4jkJZISwynmX
-zSeR7C2Jv1O5X6+BhkRrS87hdQx1zcdEelbc6w+CHkcpmcPJENkIv8WfatBYn7xg
-99i10/IrZrzsS+GTh8/10s19Gep69+McW23crn002LeQu20ihKg4iagYOONO6hw=
-=Uv2x
+iQEcBAEBCAAGBQJQPRR0AAoJEJ0WA1zPCt1hHI8IAIaQYYbXnRsOTIGuH2m1IbLh
+v3sgeet4I8peQNzf74zU2eGHLooY6r2nMTnlYj1maVz+kSKlMacnMfuWMI+3EhCE
+M+FHbh3L4hHQillNBYj4poTZhPteNReA44d0ZkJaoVOEMipKpLpFi8dCFzYj4li0
+QKtqKzvdqEuhC29kC2EOnBbij1WMWguWXtFAE5lONKFXmswTXxF7DNsHrMy2BXT5
+CKvGXGEt46I4M5jWYPBbG/P8B3zVhzOHt6XIufogyIo1cBSHCthF/5N3lZh+rW7F
++AzC2vmG00uexkDmUArlNWBGkwjb0Rwgc9h7pjPvWJwI6SyEfEdxExTZIFLA3mo=
+=n2GR
 -----END PGP SIGNATURE-----
diff --git a/games-board/aisleriot/aisleriot-3.2.3.2-r1.ebuild b/games-board/aisleriot/aisleriot-3.2.3.2-r1.ebuild
index 12b1abc4ba64..e23fc6ebedc5 100644
--- a/games-board/aisleriot/aisleriot-3.2.3.2-r1.ebuild
+++ b/games-board/aisleriot/aisleriot-3.2.3.2-r1.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/games-board/aisleriot/aisleriot-3.2.3.2-r1.ebuild,v 1.1 2012/08/26 15:43:23 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/aisleriot/aisleriot-3.2.3.2-r1.ebuild,v 1.2 2012/08/28 18:56:47 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -69,6 +69,11 @@ pkg_setup() {
 	games_pkg_setup
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-g_thread_init.patch" #432938
+	gnome2_src_prepare
+}
+
 src_install() {
 	gnome2_src_install
 	prepgamesdirs
diff --git a/games-board/aisleriot/files/aisleriot-3.2.3.2-g_thread_init.patch b/games-board/aisleriot/files/aisleriot-3.2.3.2-g_thread_init.patch
new file mode 100644
index 000000000000..2b050887b33c
--- /dev/null
+++ b/games-board/aisleriot/files/aisleriot-3.2.3.2-g_thread_init.patch
@@ -0,0 +1,38 @@
+From ee73ae586a307aad04f00908122f3950303153db Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@gnome.org>
+Date: Wed, 5 Oct 2011 20:07:09 +0200
+Subject: [PATCH] Just call g_type_init
+
+This will init gthreads, so no need to do it manually.
+---
+ src/lib/ar-runtime.c | 14 +++-----------
+ 1 file changed, 3 insertions(+), 11 deletions(-)
+
+diff --git a/src/lib/ar-runtime.c b/src/lib/ar-runtime.c
+index eeff9f9..f51766f 100644
+--- a/src/lib/ar-runtime.c
++++ b/src/lib/ar-runtime.c
+@@ -286,17 +286,9 @@ ar_runtime_init (const char *name)
+   }
+ #endif /* G_OS_WIN32 */
+ 
+-#if defined(HAVE_GNOME) || defined(HAVE_RSVG_GNOMEVFS) || defined(ENABLE_SOUND)
+-  /* If we're going to use gconf, gnome-vfs, or canberra, we need to
+-   * init threads; and this has to be done before calling any other glib functions.
+-   */
+-#if defined(LIBGAMES_SUPPORT_GI)
+-  /* Seed has already called g_thread_init() */
+-  g_assert (g_thread_get_initialized());
+-#else
+-  g_thread_init (NULL);
+-#endif
+-#endif
++  /* This also initialises gthread */
++  g_type_init ();
++
+   /* May call any glib function after this point */
+ 
+   ar_profilestart ("ar_runtime_init");
+-- 
+1.7.12
+