Incorporate the patches

svn path=/trunk/overlay/; revision=47

6 files changed, 312 insertions, 0 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 927db65..bacd536 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -22,6 +22,10 @@ AUX gtk+-2.10.7-textview-fix.patch 937 RMD160 32e9a321151742e29dc15f891c91218bfd
 MD5 4af2fc5215284f8bf11c5fe9f71c3c9c files/gtk+-2.10.7-textview-fix.patch 937
 RMD160 32e9a321151742e29dc15f891c91218bfd94fe49 files/gtk+-2.10.7-textview-fix.patch 937
 SHA256 9f251fe7d50a7e9280d331bece4956ceb12044ac64a01cc6effcb28ec672baae files/gtk+-2.10.7-textview-fix.patch 937
+AUX gtk+-2.12.0-flash-workaround.patch 532 RMD160 24d6d96f11c1fd8c8d6fe3702de2dc4d824d7ee5 SHA1 7db980e782a5b04d27bffb55e3dc0190ad22e118 SHA256 da2ce04a400e45cc5e5cf78547699006e70e91e6620b4232a8fd7eea4de90007
+MD5 36c2cd86437f1d35de3f559a87da6bc2 files/gtk+-2.12.0-flash-workaround.patch 532
+RMD160 24d6d96f11c1fd8c8d6fe3702de2dc4d824d7ee5 files/gtk+-2.12.0-flash-workaround.patch 532
+SHA256 da2ce04a400e45cc5e5cf78547699006e70e91e6620b4232a8fd7eea4de90007 files/gtk+-2.12.0-flash-workaround.patch 532
 AUX gtk+-2.12.0-icon-cache-speedup.patch 969 RMD160 822ebb9e3b59eab5cda16ca3ff9cfffa04df3671 SHA1 2b199886215bb4bb0372e11665dab72d494e3077 SHA256 cb117bf1bbfc1e9509c614ba3c2d4a193f7b486fad9d7922208134749793e5ec
 MD5 1edb4111800bb328c4b04a98d20a2adc files/gtk+-2.12.0-icon-cache-speedup.patch 969
 RMD160 822ebb9e3b59eab5cda16ca3ff9cfffa04df3671 files/gtk+-2.12.0-icon-cache-speedup.patch 969
@@ -30,6 +34,18 @@ AUX gtk+-2.12.0-libtracker_so.patch 585 RMD160 c8d857b5bb7398f34f9f84fd59ed3b124
 MD5 e61c470b1296b6f7e3deb79673d0ab2f files/gtk+-2.12.0-libtracker_so.patch 585
 RMD160 c8d857b5bb7398f34f9f84fd59ed3b1247964375 files/gtk+-2.12.0-libtracker_so.patch 585
 SHA256 5c922a06bbacc20df5e8ea9c22656236a0d780e55cb955a261fb604628b4b56f files/gtk+-2.12.0-libtracker_so.patch 585
+AUX gtk+-2.12.0-openoffice-freeze-workaround.patch 363 RMD160 40ee74aece5ce7a24d9e091bafddd880a8589a02 SHA1 783920d179ba0755ccab9186b6bff9f293828a96 SHA256 4c8d1873c8f972d8d840f1eb12a175931ecb47fb102fe701c965b38c2f35ecce
+MD5 c49046f7a1e7b35414a6f5312ac0e05b files/gtk+-2.12.0-openoffice-freeze-workaround.patch 363
+RMD160 40ee74aece5ce7a24d9e091bafddd880a8589a02 files/gtk+-2.12.0-openoffice-freeze-workaround.patch 363
+SHA256 4c8d1873c8f972d8d840f1eb12a175931ecb47fb102fe701c965b38c2f35ecce files/gtk+-2.12.0-openoffice-freeze-workaround.patch 363
+AUX gtk+-2.12.0-searchenginesimple-crash-fix.patch 2666 RMD160 b90b97d47b57ff2a3cef565d74ab047aa29b6fd7 SHA1 1ae3ab211722e57dd4aaa8494657c97ed1beec55 SHA256 0010cd6307c16ead6c7726861700141055f209907c6a39cf4abf84d66ed01a84
+MD5 eaff892372995dea5985e7f3783d9573 files/gtk+-2.12.0-searchenginesimple-crash-fix.patch 2666
+RMD160 b90b97d47b57ff2a3cef565d74ab047aa29b6fd7 files/gtk+-2.12.0-searchenginesimple-crash-fix.patch 2666
+SHA256 0010cd6307c16ead6c7726861700141055f209907c6a39cf4abf84d66ed01a84 files/gtk+-2.12.0-searchenginesimple-crash-fix.patch 2666
+AUX gtk+-2.12.0-swt-tooltips-fix.patch 523 RMD160 0af17ef2e2813a7e927750e88dfcfa3b7ef91252 SHA1 83bbb52d3b724e32432799773675f9896c534ed9 SHA256 8529919c483c4d60adb92c38a684a76dfae42eb0d66552a542836965cd0a850f
+MD5 0b0e7e407948b9a4a4af82749a2c5cf7 files/gtk+-2.12.0-swt-tooltips-fix.patch 523
+RMD160 0af17ef2e2813a7e927750e88dfcfa3b7ef91252 files/gtk+-2.12.0-swt-tooltips-fix.patch 523
+SHA256 8529919c483c4d60adb92c38a684a76dfae42eb0d66552a542836965cd0a850f files/gtk+-2.12.0-swt-tooltips-fix.patch 523
 AUX gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383 RMD160 f2557ee984df766bce0b5e5ea8c41962a2ccff13 SHA1 5be2ba7cdac1bf48fdca5dc49d2adf96480452f0 SHA256 f4b916c7d26ba60b5d5af63ff694a5203f0dcd31b7310fb375c324fc1df72e05
 MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
 RMD160 f2557ee984df766bce0b5e5ea8c41962a2ccff13 files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
@@ -95,6 +111,10 @@ EBUILD gtk+-2.10.9.ebuild 4465 RMD160 ca094080d083baa12901ab95eb07d9c66de9475b S
 MD5 46544d312c97b9fa72a8996eede21647 gtk+-2.10.9.ebuild 4465
 RMD160 ca094080d083baa12901ab95eb07d9c66de9475b gtk+-2.10.9.ebuild 4465
 SHA256 c60acce7ca82fcfaafcbd4d9af88c29dbfbea8b5152436e33c61668587f279e3 gtk+-2.10.9.ebuild 4465
+EBUILD gtk+-2.12.0-r2.ebuild 5204 RMD160 6cb034c9442f6b45cff6230394839caab5cfa01d SHA1 1886af88f93a4026ea5929ef1e8d158308f93e50 SHA256 5db05ed4d7dc339222ee16cc9df045ff8a1976193c906ccbb13616ab6e98b194
+MD5 c37e5bee66fada9548147edbad30a142 gtk+-2.12.0-r2.ebuild 5204
+RMD160 6cb034c9442f6b45cff6230394839caab5cfa01d gtk+-2.12.0-r2.ebuild 5204
+SHA256 5db05ed4d7dc339222ee16cc9df045ff8a1976193c906ccbb13616ab6e98b194 gtk+-2.12.0-r2.ebuild 5204
 EBUILD gtk+-2.12.0.ebuild 4318 RMD160 588e665cbe20b4894dce301ef5addce5ce0a4547 SHA1 bf96b4c8b55cf37b0966277dc9ce64b7eff48956 SHA256 a88c6e3983d589d429f283da8a6802845e9133e3021246552dde8c6f1075065b
 MD5 761e581e26ca0cf169689d11d4ecd063 gtk+-2.12.0.ebuild 4318
 RMD160 588e665cbe20b4894dce301ef5addce5ce0a4547 gtk+-2.12.0.ebuild 4318
diff --git a/x11-libs/gtk+/files/gtk+-2.12.0-flash-workaround.patch b/x11-libs/gtk+/files/gtk+-2.12.0-flash-workaround.patch
new file mode 100644
index 0000000..7beccc3
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.12.0-flash-workaround.patch
@@ -0,0 +1,12 @@
+Index: gtk+2.0-2.11.6/gtk/gtkclipboard.c
+===================================================================
+--- gtk+2.0-2.11.6.orig/gtk/gtkclipboard.c	2007-08-31 16:52:48.000000000 +0200
++++ gtk+2.0-2.11.6/gtk/gtkclipboard.c	2007-08-31 16:53:16.000000000 +0200
+@@ -287,6 +287,7 @@
+ gtk_clipboard_get_for_display (GdkDisplay *display, 
+ 			       GdkAtom     selection)
+ {
++  g_return_val_if_fail (display != NULL, NULL);
+   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+   g_return_val_if_fail (!display->closed, NULL);
+ 
diff --git a/x11-libs/gtk+/files/gtk+-2.12.0-openoffice-freeze-workaround.patch b/x11-libs/gtk+/files/gtk+-2.12.0-openoffice-freeze-workaround.patch
new file mode 100644
index 0000000..453bd5d
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.12.0-openoffice-freeze-workaround.patch
@@ -0,0 +1,10 @@
+--- gdk/gdkscreen.c.orig	2007-09-13 23:36:09.000000000 +0300
++++ gdk/gdkscreen.c	2007-09-25 18:16:53.000000000 +0300
+@@ -417,6 +417,7 @@
+ const cairo_font_options_t *
+ gdk_screen_get_font_options (GdkScreen *screen)
+ {
++    g_return_val_if_fail (screen != NULL, NULL);
+     g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+ 
+     return screen->font_options;
diff --git a/x11-libs/gtk+/files/gtk+-2.12.0-searchenginesimple-crash-fix.patch b/x11-libs/gtk+/files/gtk+-2.12.0-searchenginesimple-crash-fix.patch
new file mode 100644
index 0000000..af9aeb1
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.12.0-searchenginesimple-crash-fix.patch
@@ -0,0 +1,84 @@
+Index: gtk/gtksearchenginesimple.c
+===================================================================
+--- gtk/gtksearchenginesimple.c	(revision 18864)
++++ gtk/gtksearchenginesimple.c	(working copy)
+@@ -72,19 +72,27 @@ struct _GtkSearchEngineSimplePrivate 
+ G_DEFINE_TYPE (GtkSearchEngineSimple, _gtk_search_engine_simple, GTK_TYPE_SEARCH_ENGINE);
+ 
+ static void
+-finalize (GObject *object)
++gtk_search_engine_simple_dispose (GObject *object)
+ {
+   GtkSearchEngineSimple *simple;
++  GtkSearchEngineSimplePrivate *priv;
+   
+   simple = GTK_SEARCH_ENGINE_SIMPLE (object);
++  priv = simple->priv;
+   
+-  if (simple->priv->query) 
++  if (priv->query) 
++    {
++      g_object_unref (priv->query);
++      priv->query = NULL;
++    }
++
++  if (priv->active_search)
+     {
+-      g_object_unref (simple->priv->query);
+-      simple->priv->query = NULL;
++      priv->active_search->cancelled = TRUE;
++      priv->active_search = NULL;
+     }
+   
+-  G_OBJECT_CLASS (_gtk_search_engine_simple_parent_class)->finalize (object);
++  G_OBJECT_CLASS (_gtk_search_engine_simple_parent_class)->dispose (object);
+ }
+ 
+ static SearchThreadData *
+@@ -131,12 +139,10 @@ search_thread_done_idle (gpointer user_d
+ 
+   data = user_data;
+   
+-  if (!data->cancelled) 
+-    {
+-      _gtk_search_engine_finished (GTK_SEARCH_ENGINE (data->engine));
+-      data->engine->priv->active_search = NULL;
+-    }
+-  
++  if (!data->cancelled)
++    _gtk_search_engine_finished (GTK_SEARCH_ENGINE (data->engine));
++     
++  data->engine->priv->active_search = NULL;
+   search_thread_data_free (data);
+   
+   return FALSE;
+@@ -181,6 +187,7 @@ send_batch (SearchThreadData *data)
+       hits = g_new (SearchHits, 1);
+       hits->uris = data->uri_hits;
+       hits->thread_data = data;
++      
+       gdk_threads_add_idle (search_thread_add_hits_idle, hits);
+     }
+   data->uri_hits = NULL;
+@@ -349,7 +356,7 @@ _gtk_search_engine_simple_class_init (Gt
+   GtkSearchEngineClass *engine_class;
+   
+   gobject_class = G_OBJECT_CLASS (class);
+-  gobject_class->finalize = finalize;
++  gobject_class->dispose = gtk_search_engine_simple_dispose;
+   
+   engine_class = GTK_SEARCH_ENGINE_CLASS (class);
+   engine_class->set_query = gtk_search_engine_simple_set_query;
+Index: gtk/gtkfilechooserdefault.c
+===================================================================
+--- gtk/gtkfilechooserdefault.c	(revision 18864)
++++ gtk/gtkfilechooserdefault.c	(working copy)
+@@ -8994,6 +8994,8 @@ search_stop_searching (GtkFileChooserDef
+   
+   if (impl->search_engine)
+     {
++      _gtk_search_engine_stop (impl->search_engine);
++      
+       g_object_unref (impl->search_engine);
+       impl->search_engine = NULL;
+     }
diff --git a/x11-libs/gtk+/files/gtk+-2.12.0-swt-tooltips-fix.patch b/x11-libs/gtk+/files/gtk+-2.12.0-swt-tooltips-fix.patch
new file mode 100644
index 0000000..8277cdf
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.12.0-swt-tooltips-fix.patch
@@ -0,0 +1,14 @@
+Fix http://bugzilla.gnome.org/show_bug.cgi?id=460194
+Patch from http://svn.gnome.org/viewcvs/gtk%2B/trunk/gtk/gtktooltips.c?view=patch&r1=18864&r2=18863&pathrev=18864
+Will be part of gtk+-2.12.1
+
+--- trunk/gtk/gtktooltips.c	2007/09/24 17:13:40	18863
++++ trunk/gtk/gtktooltips.c	2007/09/24 18:23:01	18864
+@@ -230,6 +230,7 @@
+     }
+   
+   if (tooltips->active_tips_data 
++      && tooltipsdata
+       && tooltips->active_tips_data->widget == widget
+       && GTK_WIDGET_DRAWABLE (tooltips->active_tips_data->widget))
+     {
diff --git a/x11-libs/gtk+/gtk+-2.12.0-r2.ebuild b/x11-libs/gtk+/gtk+-2.12.0-r2.ebuild
new file mode 100644
index 0000000..83b1eee
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.12.0-r2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.12.0-r2.ebuild,v 1.1 2007/09/25 23:00:34 leio Exp $
+
+inherit gnome.org flag-o-matic eutils autotools 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"
+IUSE="cups debug doc jpeg tiff xinerama"
+
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	xinerama? ( x11-libs/libXinerama )
+	>=dev-libs/glib-2.13.5
+	>=x11-libs/pango-1.17.3
+	>=dev-libs/atk-1.10.1
+	>=x11-libs/cairo-1.2.0
+	media-libs/fontconfig
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.2.1
+	cups? ( net-print/cups )
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	tiff? ( >=media-libs/tiff-3.5.7 )"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	>=dev-util/pkgconfig-0.9
+	=sys-devel/automake-1.7*
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/inputproto
+	x11-proto/damageproto
+	xinerama? ( x11-proto/xineramaproto )
+	doc? (
+			>=dev-util/gtk-doc-1.6
+			~app-text/docbook-xml-dtd-4.1.2
+		 )"
+
+pkg_setup() {
+	if ! built_with_use x11-libs/cairo X; then
+		eerror "Please re-emerge x11-libs/cairo with the X USE flag set"
+		die "cairo needs the X flag set"
+	fi
+}
+
+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}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# By default expand the silly file chooser.
+	epatch "${FILESDIR}"/${PN}-2.8.11-filechooser.patch
+
+	# 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"
+
+	# http://bugzilla.gnome.org/show_bug.cgi?id=476342
+	epatch "${FILESDIR}/${P}-icon-cache-speedup.patch"
+
+	# http://bugzilla.gnome.org/show_bug.cgi?id=478173
+	epatch "${FILESDIR}/${PN}-2.12.0-libtracker_so.patch"
+
+	# Workaround adobe flash infinite loop. Patch from http://bugzilla.gnome.org/show_bug.cgi?id=463773#c11
+	epatch "${FILESDIR}/${P}-flash-workaround.patch"
+
+	# Gtk tooltips + swt crash at a later point, upstream has committed this by now - http://bugzilla.gnome.org/show_bug.cgi?id=460194
+	# Seems to also fix a weird behaviour where GtkTreeView rows got a tooltip that shouldn't be there
+	epatch "${FILESDIR}/${P}-swt-tooltips-fix.patch"
+
+	# OpenOffice.org might hang at startup (on non-gnome env) without this workaround, bug #193513
+	epatch "${FILESDIR}/${P}-openoffice-freeze-workaround.patch"
+
+	# Fix for crashes with simple search engine (the one used when neither beagle nor tracker are available) when cancelling dialog
+	# before the search is finished - http://bugzilla.gnome.org/show_bug.cgi?id=480123
+	epatch "${FILESDIR}/${P}-searchenginesimple-crash-fix.patch"
+
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	use ppc64 && append-flags -mminimal-toc
+
+	# remember, eautoreconf applies elibtoolize.
+	# if you remove this, you should manually run elibtoolize
+	export WANT_AUTOMAKE=1.7
+	cp aclocal.m4 old_macros.m4
+	AT_M4DIR="." eautoreconf
+
+	epunt_cxx
+}
+
+src_compile() {
+	# png always on to display icons (foser)
+	local myconf="$(use_enable doc gtk-doc) \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		$(use_enable xinerama) \
+		--with-libpng \
+		--with-gdktarget=x11 \
+		--with-xinput"
+
+	# Passing --disable-debug is not recommended for production use
+	use debug && myconf="${myconf} --enable-debug=yes"
+
+	econf ${myconf} || die "configure failed"
+
+	emake || die "compile failed"
+}
+
+src_test() {
+	Xmake check || die
+}
+
+src_install() {
+	einstall || die "Installation failed"
+
+	set_gtk2_confdir
+	dodir ${GTK2_CONFDIR}
+	keepdir ${GTK2_CONFDIR}
+
+	# see bug #133241
+	echo 'gtk-fallback-icon-theme = "gnome"' > "${D}/${GTK2_CONFDIR}/gtkrc"
+
+	# Enable xft in environment as suggested by <utx@gentoo.org>
+	dodir /etc/env.d
+	echo "GDK_USE_XFT=1" > "${D}/etc/env.d/50gtk2"
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+	# This has to be removed, because it's multilib specific; generated in
+	# postinst
+	rm "${D}/etc/gtk-2.0/gtk.immodules"
+}
+
+pkg_postinst() {
+	set_gtk2_confdir
+
+	if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then
+		gtk-query-immodules-2.0  > ${ROOT}${GTK2_CONFDIR}/gtk.immodules
+		gdk-pixbuf-query-loaders > ${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders
+	else
+		ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;"
+		ewarn "to complete the installation of GTK+, please create the"
+		ewarn "directory and then manually run:"
+		ewarn "  cd ${ROOT}${GTK2_CONFDIR}"
+		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
+		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
+	fi
+
+	if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then
+		elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]*
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)"
+	fi
+}