Fix bug 308985

(Portage version: 2.1.7.17/cvs/Linux x86_64)

3 files changed, 240 insertions, 1 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 8bdf00e31661..89ab30cbf6a9 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.446 2010/03/06 18:47:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.447 2010/03/11 14:52:23 pacho Exp $
+
+*gtk+-2.18.7-r1 (11 Mar 2010)
+
+  11 Mar 2010; Pacho Ramos <pacho@gentoo.org> +gtk+-2.18.7-r1.ebuild,
+  +files/gtk+-2.18.7-destroy-crash.patch:
+  Fix bug 308985, thanks to Michael Bombach for reporting and finding the
+  fix.
 
   06 Mar 2010; Pacho Ramos <pacho@gentoo.org> gtk+-2.18.7.ebuild:
   amd64 stable, bug 304777
diff --git a/x11-libs/gtk+/files/gtk+-2.18.7-destroy-crash.patch b/x11-libs/gtk+/files/gtk+-2.18.7-destroy-crash.patch
new file mode 100644
index 000000000000..d6129844e995
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.18.7-destroy-crash.patch
@@ -0,0 +1,38 @@
+From 325cbef27edd58b801509a2016aee6ab6e49d2f1 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Tue, 23 Feb 2010 17:32:36 +0000
+Subject: Protect against X errors when clearing the DND cache
+
+This was reported as a problem in bug 609952.
+---
+diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
+index 2da9567..824f96d 100644
+--- a/gdk/x11/gdkdnd-x11.c
++++ b/gdk/x11/gdkdnd-x11.c
+@@ -573,15 +573,21 @@ static void
+ gdk_window_cache_destroy (GdkWindowCache *cache)
+ {
+   GdkWindow *root_window = gdk_screen_get_root_window (cache->screen);
+-  
+-  XSelectInput (GDK_WINDOW_XDISPLAY (root_window), 
++
++  XSelectInput (GDK_WINDOW_XDISPLAY (root_window),
+ 		GDK_WINDOW_XWINDOW (root_window),
+ 		cache->old_event_mask);
+   gdk_window_remove_filter (root_window, gdk_window_cache_filter, cache);
+   gdk_window_remove_filter (NULL, gdk_window_cache_shape_filter, cache);
+ 
+-  g_list_foreach (cache->children, (GFunc)free_cache_child, 
++  gdk_error_trap_push ();
++
++  g_list_foreach (cache->children, (GFunc)free_cache_child,
+       gdk_screen_get_display (cache->screen));
++
++  gdk_flush ();
++  gdk_error_trap_pop ();
++
+   g_list_free (cache->children);
+   g_hash_table_destroy (cache->child_hash);
+ 
+--
+cgit v0.8.3.1
diff --git a/x11-libs/gtk+/gtk+-2.18.7-r1.ebuild b/x11-libs/gtk+/gtk+-2.18.7-r1.ebuild
new file mode 100644
index 000000000000..8ff553e3b9da
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.18.7-r1.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.18.7-r1.ebuild,v 1.1 2010/03/11 14:52:23 pacho Exp $
+
+EAPI="2"
+
+inherit gnome.org flag-o-matic eutils libtool virtualx
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="aqua cups debug doc jpeg jpeg2k tiff test vim-syntax xinerama"
+
+# FIXME: configure says >=xrandr-1.2.99 but remi tells me it's broken
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+RDEPEND="!aqua? (
+		x11-libs/libXrender
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXt
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.2
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		>=x11-libs/cairo-1.6[X,svg]
+	)
+	aqua? (
+		>=x11-libs/cairo-1.6[aqua,svg]
+	)
+	xinerama? ( x11-libs/libXinerama )
+	>=dev-libs/glib-2.21.3
+	>=x11-libs/pango-1.20
+	>=dev-libs/atk-1.13
+	media-libs/fontconfig
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.2.1
+	cups? ( net-print/cups )
+	jpeg? ( >=media-libs/jpeg-6b-r2:0 )
+	jpeg2k? ( media-libs/jasper )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	!<gnome-base/gail-1000"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	!aqua? (
+		x11-proto/xextproto
+		x11-proto/xproto
+		x11-proto/inputproto
+		x11-proto/damageproto
+	)
+	x86-interix? (
+		sys-libs/itx-bind
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	>=dev-util/gtk-doc-am-1.11
+	doc? (
+		>=dev-util/gtk-doc-1.11
+		~app-text/docbook-xml-dtd-4.1.2 )
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+set_gtk2_confdir() {
+	# An arch specific config directory is used on multilib systems
+	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
+}
+
+pkg_setup() {
+	use prefix || EPREFIX=
+}
+
+src_prepare() {
+	# use an arch-specific config directory so that 32bit and 64bit versions
+	# dont clash on multilib systems
+	has_multilib_profile && epatch "${FILESDIR}/${PN}-2.8.0-multilib.patch"
+
+	# Don't break inclusion of gtkclist.h, upstream bug 536767
+	epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
+
+	# add correct framework linking options, for aqua
+	epatch "${FILESDIR}/${PN}-2.18.5-macosx-aqua.patch"
+
+	# Fix chromium crash, bug 308985
+	epatch "${FILESDIR}/${PN}-2.18.7-destroy-crash.patch"
+
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	use ppc64 && append-flags -mminimal-toc
+
+	# Non-working test in gentoo's env
+	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
+		-i gtk/tests/testing.c || die "sed 1 failed"
+	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
+		-i gtk/tests/recentmanager.c || die "sed 2 failed"
+
+	if use x86-interix; then
+		# activate the itx-bind package...
+		append-flags "-I${EPREFIX}/usr/include/bind"
+		append-ldflags "-L${EPREFIX}/usr/lib/bind"
+	fi
+
+	elibtoolize
+}
+
+src_configure() {
+	# png always on to display icons (foser)
+	local myconf="$(use_enable doc gtk-doc) \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
+		$(use_with tiff libtiff) \
+		$(use_enable xinerama) \
+		$(use_enable cups cups auto) \
+		--disable-papi \
+		--with-libpng"
+	if use aqua; then
+		myconf="${myconf} --with-gdktarget=quartz"
+	else
+		myconf="${myconf} --with-gdktarget=x11 --with-xinput"
+	fi
+
+	# Passing --disable-debug is not recommended for production use
+	use debug && myconf="${myconf} --enable-debug=yes"
+
+	# need libdir here to avoid a double slash in a path that libtool doesn't
+	# grok so well during install (// between $EPREFIX and usr ...)
+	econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation failed"
+
+	set_gtk2_confdir
+	dodir ${GTK2_CONFDIR}
+	keepdir ${GTK2_CONFDIR}
+
+	# see bug #133241
+	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
+	insinto ${GTK2_CONFDIR}
+	doins "${T}"/gtkrc
+
+	# Enable xft in environment as suggested by <utx@gentoo.org>
+	echo "GDK_USE_XFT=1" > "${T}"/50gtk2
+	doenvd "${T}"/50gtk2
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
+
+	# This has to be removed, because it's multilib specific; generated in
+	# postinst
+	rm "${D%/}${EPREFIX}/etc/gtk-2.0/gtk.immodules"
+
+	# add -framework Carbon to the .pc files
+	use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do
+		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${D%/}${EPREFIX}"/usr/lib/pkgconfig/$i || die "sed failed"
+	done
+}
+
+pkg_postinst() {
+	set_gtk2_confdir
+
+	if [ -d "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}" ]; then
+		gtk-query-immodules-2.0  > "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+		gdk-pixbuf-query-loaders > "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
+	else
+		ewarn "The destination path ${ROOT%/}${EPREFIX}${GTK2_CONFDIR} doesn't exist;"
+		ewarn "to complete the installation of GTK+, please create the"
+		ewarn "directory and then manually run:"
+		ewarn "  cd ${ROOT%/}${EPREFIX}${GTK2_CONFDIR}"
+		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
+		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
+	fi
+
+	if [ -e "${ROOT%/}${EPREFIX}"/usr/lib/gtk-2.0/2.[^1]* ]; then
+		elog "You need to rebuild ebuilds that installed into" "${ROOT%/}${EPREFIX}"/usr/lib/gtk-2.0/2.[^1]*
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
+	fi
+
+	elog "Please install app-text/evince for print preview functionality."
+	elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+	elog "add it to your gtkrc."
+}