Add upstream patches to fix various crashes, hangs, and rendering problems. Fixes bug #424781 (thanks to Pim Vullers). Probably fixes bug #418153 (thanks to Hristo Venev). Drop old.

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

3 files changed, 31 insertions, 12 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index b61e00d713b4..5aa364c000f6 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.598 2012/06/03 12:48:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.599 2012/07/04 22:48:58 tetromino Exp $
+
+*gtk+-3.4.3-r1 (04 Jul 2012)
+
+  04 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org> -gtk+-3.4.2.ebuild,
+  +gtk+-3.4.3-r1.ebuild:
+  Add upstream patches to fix various crashes, hangs, and rendering problems.
+  Fixes bug #424781 (thanks to Pim Vullers). Probably fixes bug #418153 (thanks
+  to Hristo Venev). Drop old.
 
   03 Jun 2012; Justin Lecher <jlec@gentoo.org> gtk+-2.24.8-r1.ebuild,
   gtk+-2.24.10-r1.ebuild, +files/gtk+-2.24.10-gold.patch,
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 2e87e8a134e0..98d7534ecffb 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX gtk+-1.2-locale_fix.patch 419 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a SHA1 569c877ff692a7694e8aca5aceae9558844ba5dd SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb
 AUX gtk+-1.2.10-as-needed.patch 19865 RMD160 17c6b5d447b2d1c56fcc89dad676156caf0d700e SHA1 1027f38d29492c6f77205fc40992d8e625da8dbe SHA256 0864194a1e2be5f1b3df91d7dceb50bbe038fbb29f24901891c22829d55d4da7
@@ -35,7 +35,7 @@ DIST gtk+-3.0.12-use-const2.patch.xz 12500 RMD160 2cebd73630f83530a76ac263d797e1
 DIST gtk+-3.0.12.tar.xz 13104092 RMD160 c82d14e113ae287476f5887ca03b8b01b8d22e1b SHA1 1b87e12ef3dfe598ee757db1f5bdff6cd66e6558 SHA256 219fdea120897981840e909fac40d4d433fe061a37b12b9402e215c819ebeae9
 DIST gtk+-3.2.3.tar.xz 12668948 RMD160 48a19eb3df1e38c161aca6573d1f218f2552cd70 SHA1 8b95f6c65f9307a920780847e7c72bafa358eabb SHA256 e2cf20f2510ebbc7be122a1a33dd1f472a7d06aaf16b4f2a63eb048cd9141d3d
 DIST gtk+-3.2.4.tar.xz 12261004 RMD160 bbf0922f53a2acc2cb0337c08583208b39255768 SHA1 3d0b6413750bc0cb51e98a387abbd606a1aa021e SHA256 f981bf514858c00d7084bd6f6c34b3c60b8aebdb959e7aca6faa59ed67c136bd
-DIST gtk+-3.4.2.tar.xz 12839736 RMD160 46d862e13ad8c806a3af311543f9d7b4c2c32413 SHA1 ff6cc08d51f666b6d19eba159b2103751398ae7c SHA256 b1ab72bc61434418160ff0c7edfd93c74758ed8a35e2ed3d07e3e218c2705480
+DIST gtk+-3.4.3-patches-1.tar.xz 12728 RMD160 543033eee0f8286a47bbc451119528638a834931 SHA1 3b6179500e90565cb23689ffeac1de3e01216ff8 SHA256 a62d36d53d689a19d52a8f6ab3604d254ff9a8a36fdaf9c7cc1faa6771ea972f
 DIST gtk+-3.4.3.tar.xz 12851676 RMD160 1de8254156426d6a2b4bfd5b681def93275027f6 SHA1 645150ddc417b7bd109b956beeebcccf94a50f24 SHA256 846010442a96590469cde16ed6a1fdfe09397e435165459f04d31cfa5713799f
 DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae
 EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9bd5 SHA1 93a6ec39cde941b4939c04da955475d017a6ff6f SHA256 e4874d2dd01bc266e7e0f5b691fcf4e54f6bd3a79658dcec6d5374c5910aa78b
@@ -44,15 +44,18 @@ EBUILD gtk+-2.24.8-r1.ebuild 7991 RMD160 c75c292fbd3de554775ae7f5e69ad6328933c4c
 EBUILD gtk+-3.0.12-r1.ebuild 6148 RMD160 16c65b32d1a2a26405b425afef123ca514505f35 SHA1 588f461d293a8db56c8523ebc940e724e44b8d7b SHA256 57e6c1b9bae37bf29720ee20007dd6d17a33382f0939a88dec9622329bd8a0a3
 EBUILD gtk+-3.2.3.ebuild 6763 RMD160 f6552dd368034a8d93a85e755aa4442af3bf0890 SHA1 0b62e49c7749bc69459f3f94516665b8d07c14b1 SHA256 36e19f2ef5931e3b1824e2193cbd8e039e8ad072d71485954a47357b54c07c88
 EBUILD gtk+-3.2.4-r1.ebuild 7007 RMD160 50f3374ff76c9b57b7e6d4f982580f6b0deee0a5 SHA1 27b7bb965d09b8241137e27b6ea94dd73fd1f7fb SHA256 5fcc293224482f42b00d4b8ca19aec411a42b2a8980bef5cc29f904f4656cd94
-EBUILD gtk+-3.4.2.ebuild 7129 RMD160 f28085bb4fea92291b39a0d762d9e7a15c1c6781 SHA1 9d303e5f0259e1aa88efde96c74cdb0d49456cb6 SHA256 ce8a39b83e8d4120aca40554fbd2d427c4e70559250f9dc1dfd8dee4c386ce81
+EBUILD gtk+-3.4.3-r1.ebuild 7324 RMD160 9eab8293077993b448836c766f1a915a80ed3677 SHA1 356f7b07ee78608195106dd253a98acb51900b08 SHA256 1f06eba1cbd547ae20590d1c69b2592aca5485eddd0d21d4806acc032de0c3f6
 EBUILD gtk+-3.4.3.ebuild 7266 RMD160 3213e1a4e5e39408268f4a2552879645f8014d4a SHA1 8b403afa9844c64c1692d800a79c805e6a3bce6f SHA256 4a116fed27cf769aac30947359a9a79d2f934ec3e57b9d0966e3960bcf8bd764
-MISC ChangeLog 92681 RMD160 41d4df0a615b1b926615ec4f6d84f41fdcb0843e SHA1 34d446765d1a5f321823f8c8963604f1d92a49ba SHA256 54212d9f499d0f0eef0f85a20aa2f47287e02a80ded786f99ae0a287dd2d663e
+MISC ChangeLog 93009 RMD160 2bcf4c3f46ed5b067b5c973ff854bcf07e79c95d SHA1 53d1c4d0e94b7d8fb46cccf6a8b4c56451395d8f SHA256 77e449cc2bb003004f401a4b7a405a3ed72bb88447825146c11483809efaa692
 MISC metadata.xml 870 RMD160 a94fb5c6acb8fb9015e5f4c40c8b9b1eb3ddf9d8 SHA1 2769a95a236ce2a234c7d5bd75231de142345445 SHA256 90835d0edfdbbc25c781b0c7bcf9b7b6db82ce5f412082ec56d250891e1853ea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk/LmecACgkQgAnW8HDreRa6MgCeNvAd7l316V6nppVz4apc8fz9
-LEEAoLMM8hIDGP0la53mb9DMWrl4gsZK
-=tlH3
+iQEcBAEBAgAGBQJP9MhfAAoJEJ0WA1zPCt1hNmMH/RrQfw8nITyqhnE7Tx/I6lcD
+sBs1b1Mpla4P/g8hHsZJsookd61A0gIcgKcoqLXd6wBZZejjj07cJLTRk0NjDAoE
++pBKiSibUnNyB4csb/gTm3cO4WZU100/5NGArMcVyoN9GtgvtJL7tXND7RDjKKst
+qlsyjcxJ8tOOcXuGgyu0ZslH+1GL7SVDVLeV4CpWapNjDDgKEQbK3fD02JKTriUS
+TBi94SRKzeOjWHCbxm1L4Udgdib1aYuWL5NgG1SAdt0BLz9K0iZa/D7MfUfySQUi
+lRZXziN/lMoP/bYqjNx+Qf6U6baHMi0m69RG0kUDFHMX6fmBNacXoIrPKjRGJ4E=
+=Kn1t
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-3.4.2.ebuild b/x11-libs/gtk+/gtk+-3.4.3-r1.ebuild
index 6c684abdc6ce..91c873cb052a 100644
--- a/x11-libs/gtk+/gtk+-3.4.2.ebuild
+++ b/x11-libs/gtk+/gtk+-3.4.3-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/x11-libs/gtk+/gtk+-3.4.2.ebuild,v 1.6 2012/06/03 12:48:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.4.3-r1.ebuild,v 1.1 2012/07/04 22:48:58 tetromino Exp $
 
 EAPI="4"
 
@@ -9,6 +9,9 @@ inherit eutils flag-o-matic gnome.org gnome2-utils multilib virtualx
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
 
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-patches-1.tar.xz"
+
 LICENSE="LGPL-2"
 SLOT="3"
 # NOTE: This gtk+ has multi-gdk-backend support, see:
@@ -97,12 +100,15 @@ src_prepare() {
 	replace-flags -O3 -O2
 	strip-flags
 
-	# https://bugzilla.gnome.org/show_bug.cgi?id=65410
+	# https://bugzilla.gnome.org/show_bug.cgi?id=654108
 	epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
 
 	# Apparently needed for new libxkbcommon headers; bug #408131
 	epatch "${FILESDIR}/${PN}-3.3.20-wayland-xkbcommon-headers.patch"
 
+	# Various upstream patches, will be in next 3.4 release
+	epatch ../patch/*.patch
+
 	# Work around https://bugzilla.gnome.org/show_bug.cgi?id=663991
 	if [[ ${CHOST} == *-solaris* ]]; then
 		sed -i -e '/_XOPEN_SOURCE/s/500/600/' gtk/gtksearchenginesimple.c || die
@@ -173,7 +179,9 @@ src_test() {
 		ewarn "required version of gnome-themes-standard."
 		return 0
 	fi
+
 	unset DBUS_SESSION_BUS_ADDRESS
+
 	# Exporting HOME fixes tests using XDG directories spec since all defaults
 	# are based on $HOME. It is also backward compatible with functions not
 	# yet ported to this spec.
@@ -189,7 +197,7 @@ src_install() {
 	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
 
 	# Remove unneeded *.la files
-	find "${D}" -name '*.la' -exec rm -f {} +
+	find "${D}" -name '*.la' -exec rm -f {} + || die
 
 	# add -framework Carbon to the .pc files
 	use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do