Fix build with recent glib, bug #436462.

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

4 files changed, 53 insertions, 15 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 6a1253c22f25..74c54e5aaaa6 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.262 2012/10/07 02:02:09 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.263 2012/10/10 21:48:06 eva Exp $
+
+  10 Oct 2012; Gilles Dartiguelongue <eva@gentoo.org> gtkhtml-3.32.2.ebuild,
+  +files/gtkhtml-3.32.2-g_thread_init.patch:
+  Fix build with recent glib, bug #436462.
 
   07 Oct 2012; Anthony G. Basile <blueness@gentoo.org> gtkhtml-4.4.3.ebuild:
   stable ppc64, bug #427544
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index 5c06904da67f..e90a7687f9f1 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gtkhtml-3.32.2-g_thread_init.patch 669 SHA256 a633ca81745ff46e0b9aaa8c6748014779d64bb38f8ca4d290f6e6046dcce115 SHA512 9462abc3c0b3d3c7edfde95af27334bb0be5bcdd78c59e0e33b53bd5dfaa4bce1227d380c87b71956c544463fe5d4c4be1d32b2e71224215e8609be5be93d735 WHIRLPOOL 3f102b287b684078d5b2a9ea2d4d12e881157346a6d648581c30d8330a91149de74051fa4755fefe96637d123add41157b8979b2253ffac25bac5305975ccaba
 AUX libgtkhtml-2.2.0-alpha.patch 652 SHA256 37fc95e6c2443e37b59dee81509f64d1ebca884c3797020f805e5da88a3a72f1 SHA512 e813d77294adcad0adca261d0bfed8315bcc563573a6a975d10f50f9972097a932e0f6eca285a4c6d28e1ef86fe09eacec0b6bda9a28073642debed234046f09 WHIRLPOOL 56fcba164b9f87b0db035da796acf7cd8f8a57a92ea3776c4fa30cb046a75ab8a0209a9e4bdbd620f7f9828b92f595b4962c1cd3461df061002b01a235efbf8a
 DIST gtkhtml-3.32.2.tar.bz2 1217025 SHA256 8746053cf709e1de37c7ac775ab1364ddda4b75167660ed7f98a237b3797e39f SHA512 a641a6e2208ad9db9ab3c3dc4696cf010b70f64d302b6f889a275db396544570ee5c894835a18ea94699375d0e2fd91fd7414a0546ce5f62bcb6d603d331b1d5 WHIRLPOOL e6563edfd31a430853533dbdc3a07101e919c672b3ce79f6cf94167067c615e60b5677712cfa5672767895f099cc548efe821d1b1515e1f84c5ddd19a5f9a73f
 DIST gtkhtml-4.2.2.tar.xz 1067944 SHA256 e20bb5d461e9ae9d3a8d4e13d544db1813707810ded7cbde9287485f2394dd2c SHA512 23668312fa5eef7e8540cde9aaa29e5d65145212f6cb74939810c51ccc427d9e19a3c9cf99b83c059f55eb6a7218a4be4321c4418f273877201f1367b6341c06 WHIRLPOOL 2da103a919e6527dfb614334bb6b95716e739e9a3a3c5875630f8948a2bc554d6b7c5d606a70e9b6e5e3f7ef513857bcad08eb2d4db1a353acd67ad5bf7bdaa6
@@ -9,17 +10,17 @@ DIST gtkhtml-4.4.3.tar.xz 1038092 SHA256 da1f593dafcb202dbed0e99bc14ef20bfd5c54e
 DIST gtkhtml-4.4.4.tar.xz 1038460 SHA256 737536d03c05d70e30f9b7aa45b4b810f7255dad2a9f0d4e16936a2e4852c7c9 SHA512 00ff8b886c47f51d63737338b9d06ec603a544a491129e46aed0711e9c181409aa8e0057c7dcbeb015c3c6c032d2b9eb34177b2f8997235ffc41ceb5ddf35ddf WHIRLPOOL 65d38adc67b9361df73ecdbcd6b060d638b5d027c894b7e0597914e44b57c2cd8cf327a31d6b584443e470561909c086d15c1cfe933586eae076cc7060ab6ab6
 DIST libgtkhtml-2.11.1.tar.bz2 597923 SHA256 3ca77a0d0f15e94fb654097c2f78cf928194d4c4bf64ff7b2ba408d29c924a57 SHA512 8eb887ba2430b3c18eb585569fc2f60645ba767b3d246b582404de53e4113db8e625b085de06d8433df77162e0b28ca83ed996e2ad7a16c7a80a0c9eee3b9fa7 WHIRLPOOL e18c6988dcfc3cc2defd5a2fffac7ec4dd4a68694fa959fa798ed4fe8947f70bdc537e148f571a93bff24d42d7ed0fb8816ffb0dab5585a74b0c6ec0b1a987a2
 EBUILD gtkhtml-2.11.1.ebuild 1207 SHA256 5e36241bc19411be1c5ccb755706e2041c196c5e8afefe78bdcf7531c2d51b4d SHA512 216b8efcb75683d893af50049061ade6fc0c90f4997311b83712dac0d41cee5540d22641f5c185246fc2c0f183cad544e7fa760f667cd647863ad885ae04082b WHIRLPOOL 07ece6c700aac9349895e7a635f8dafdd8cef3d155d8e1c9dd6421dd16fc04ff8c3bf96b2222462bdc2d14902465962c126ee40d3dfb648a14ad3b98147a3593
-EBUILD gtkhtml-3.32.2.ebuild 1383 SHA256 f11d0da622837b3832522261d434787c3bbad91e06ab5ab1f95053416eaf5a32 SHA512 7923ff9916c3ee7d63d708492c913badd2ba29e8ff8b74438ad452ff00f9d7504a6b56f733f13e883674c927f52b98038e58cbc705f4c9404d342fd22561f818 WHIRLPOOL 061dd568d6675e1a28237a7d96485b52b8d0e4f753275f4ae01112bc25e3c429290c0827033c1783326f356ad93a8db1005754521dc37868a7283150d3d663f4
+EBUILD gtkhtml-3.32.2.ebuild 1535 SHA256 4c7e15a1364897e70ed12ede6c4ced91a9ebee50743cf289ba71242f58b189e5 SHA512 bb60640873592c1bb2a3d7e701ceda4455f8e1cee7c1ea63d65ed6fda9ed3769dadaadf69d95674e316ab4021ed9eb0d5e918cad746b2ee72b36784e60084ca6 WHIRLPOOL 5a692b13162b61a2191cec04adafecca3064b9b2190fc5670bc341879b26bfca5ed051541adb77b795811ca235e8d77aa34b368628d01f9037faa166baa81eb0
 EBUILD gtkhtml-4.2.2.ebuild 1332 SHA256 029cb995a84f457096daabe24300331805b17a5752fa366fc41dcd131d39be35 SHA512 a2ada7a1dc51b77a3870cc084aaa555d7751679b3e8efc9008c00defe3398b7397360900f3dee749ee361499d5640e1f419553ad8fa2b4dc50ee574f1499bf7f WHIRLPOOL 1c6e5dd46bff29dd338efa71a4234b437bbe9ccab4f066413e9beb27e802bc6b23d60b4318e4d1b03463f7d762ac4481b0bf0bb69a481c4ab8fabc09042454ab
 EBUILD gtkhtml-4.2.3.ebuild 1296 SHA256 0d57e74494413cf3f523d53709984306b7198ccff6cb4ef9be0d96ffa00e4a02 SHA512 bc143226e6ddbff58b138ea0a0ebf593d38d93d043864be8a318f7cf80764bcfdf7fff9ebeea964d4e05189bd41e226810890f9f58d4cc97531f06cd7d751093 WHIRLPOOL 7634e33bb8468579ce99c9c91c692095f371fffc2ddf8b7b161bd3b06b3c4adcbd308fd20709c3fd40769003418814fd5948bd04fdfca5eb0a7ec37dce048b7d
 EBUILD gtkhtml-4.4.3.ebuild 1507 SHA256 b9400e9e9f0ab7302b29597cc84b7b5efd4980ccedf98e3b0d913492aa7f293a SHA512 564fef3719170151c6dc8348237885ec1969fac606283f3b7589cff6891a9af87ecc729485edc7e03e7b97975a4b32de6564b70af06af0ea2ea50459364b9dc9 WHIRLPOOL 484b66766f3c99a441384eb4e07d1306572c2f8e5a7556192acf9cffc2b9ce8809012237459e611c84471e737dd2862e9638388cb4383993fa1cb32106602375
 EBUILD gtkhtml-4.4.4.ebuild 1512 SHA256 aca0fbe2bd288ac219b651b1aa71f39eaab5065b458d3bdb3c85e03c34e50459 SHA512 f7962397ff9c558123296a01893d7fda632fba5ce52b6fd5b9ba14e73c587d31217b16c98b91bd3245874d7230af2bbd84ed625ab851402c84a135c376be6185 WHIRLPOOL 145820c2fe20bc7836cc7ecb31560f5eb2ac972b8853d330636604e6eb8cb29a5f9eab6814e0d550f7e2317e77a521516d73ee0dc43474dba012afa6519994de
-MISC ChangeLog 37032 SHA256 57f3f33c02aa27305be6d7864bc7b79ed7e2e044880689c672c7fd9eaed6fa52 SHA512 4ff756ace1cdb5afc0d2015215c8cb0e82adba60e700590cca66f33d8ea681277dbd4bcc24571023a797f4c129be4c9aac514b988e7335aba09adaff45d8f2f8 WHIRLPOOL 3ef6a06eabac6d32e909c933b7653fbb38ab5e927a3040a96c0cbbdcd3385214560e7c4c1b3688c43b0e45a45fc124d11d5268c14dd5139b621a33789615fb5b
+MISC ChangeLog 37193 SHA256 4e37f333c70ee4a8ef55789d977036e63bfef1370049a3ce05829635887b5d90 SHA512 26bafd2b1ef8ea221cc39595921414b02b080a9c87c567f7bb06e9ca3af6f6c0fa61013612b40041e5f7a42ccd5c4ab155afd6973c258d87fa1033a97b7f10b1 WHIRLPOOL 5fd5a75730678eb91f13722aa717c6574f50cee8f089dc297494cb2f3a7e45d08a61701bda8a04433f865421489b695f6e4e5350a905ed2b0fee04a4a7f540db
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBw4nAACgkQl5yvQNBFVTXLFQCgnKRVTpRnkTjPOltZ/fqEnhrq
-rWMAn13qNDSBQnudKCl1t2no1JGPpLmz
-=1IiD
+iEYEAREIAAYFAlB17RcACgkQ1fmVwcYIWAb4fgCeP9MxMpEajbitkleIokYmV3gx
+o44AoKKxTzB9GrhocQ+yCL37NPdVDwoz
+=l1qr
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.32.2-g_thread_init.patch b/gnome-extra/gtkhtml/files/gtkhtml-3.32.2-g_thread_init.patch
new file mode 100644
index 000000000000..5109cbc8db0b
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/gtkhtml-3.32.2-g_thread_init.patch
@@ -0,0 +1,25 @@
+From b9882960dab978b85cbd32fc9b31e588c8c817ff Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 10 Oct 2012 23:37:48 +0200
+Subject: [PATCH] Drop deprecated g_thread_init
+
+---
+ components/editor/main.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/components/editor/main.c b/components/editor/main.c
+index 0a0a37f..3c729a2 100644
+--- a/components/editor/main.c
++++ b/components/editor/main.c
+@@ -373,8 +373,6 @@ main (gint argc, gchar **argv)
+ 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ 	textdomain (GETTEXT_PACKAGE);
+ 
+-	g_thread_init (NULL);
+-
+ 	gtk_init (&argc, &argv);
+ 
+ 	editor = gtkhtml_editor_new ();
+-- 
+1.7.12
+
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.32.2.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.32.2.ebuild
index 0329a38dc71b..869e715936fc 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.32.2.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.32.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.32.2.ebuild,v 1.7 2012/05/05 06:25:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.32.2.ebuild,v 1.8 2012/10/10 21:48:06 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 
-inherit gnome2 eutils
+inherit eutils gnome2
 
 DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
 HOMEPAGE="http://www.gnome.org/"
@@ -15,7 +15,9 @@ SLOT="3.14"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2.20:2
+RDEPEND="
+	>=dev-libs/glib-2.24:2
+	>=x11-libs/gtk+-2.20:2
 	>=x11-themes/gnome-icon-theme-2.22.0
 	>=gnome-base/orbit-2
 	>=app-text/enchant-1.1.7
@@ -36,6 +38,18 @@ pkg_setup() {
 	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
 }
 
+src_prepare() {
+	# Fix build with recent glib, bug #436462
+	epatch "${FILESDIR}/${P}-g_thread_init.patch"
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	# Remove .la files since old will be removed anyway while updating
+	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
+}
+
 pkg_preinst() {
 	gnome2_pkg_preinst
 	preserve_old_lib /usr/$(get_libdir)/libgtkhtml-editor.so.0
@@ -45,9 +59,3 @@ pkg_postinst() {
 	gnome2_pkg_postinst
 	preserve_old_lib_notify /usr/$(get_libdir)/libgtkhtml-editor.so.0
 }
-
-src_install() {
-	gnome2_src_install
-	# Remove .la files since old will be removed anyway while updating
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}