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.

(Portage version: 2.2.0_alpha115/cvs/Linux x86_64)

2 files changed, 20 insertions, 4 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+/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