Version bump. Include patch to fix firefox print preview crash for bug #195644

Package-Manager: portage-2.1.3.15

8 files changed, 66 insertions, 194 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index d49f0cd39c44..215465392a28 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.339 2007/09/25 23:00:34 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.340 2007/10/20 05:44:35 leio Exp $
+
+*gtk+-2.12.1 (20 Oct 2007)
+
+  20 Oct 2007; Mart Raudsepp <leio@gentoo.org>
+  +files/gtk+-2.12.1-firefox-print-preview.patch, -gtk+-2.12.0.ebuild,
+  -gtk+-2.12.0-r1.ebuild, +gtk+-2.12.1.ebuild:
+  Version bump. Include patch to fix firefox print preview crash for bug #195644
 
 *gtk+-2.12.0-r2 (25 Sep 2007)
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 14f5eb1cfe71..3c71c2f3e433 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -57,6 +57,10 @@ AUX gtk+-2.12.0-swt-tooltips-fix.patch 523 RMD160 0af17ef2e2813a7e927750e88dfcfa
 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.12.1-firefox-print-preview.patch 888 RMD160 6fedfd6e63e61ec7f7301d2d881d3e69a44176dd SHA1 5eb4779ee1a8cbfb672a2b19f15dc20b96bcda84 SHA256 eadd5a4c4084ecd39317f3eb39e7d4e35aa7d26a8b7010bdd6aeb94c69f362aa
+MD5 6d4ca4a0b23f46151a38bf245cfe2a46 files/gtk+-2.12.1-firefox-print-preview.patch 888
+RMD160 6fedfd6e63e61ec7f7301d2d881d3e69a44176dd files/gtk+-2.12.1-firefox-print-preview.patch 888
+SHA256 eadd5a4c4084ecd39317f3eb39e7d4e35aa7d26a8b7010bdd6aeb94c69f362aa files/gtk+-2.12.1-firefox-print-preview.patch 888
 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
@@ -83,6 +87,7 @@ DIST gtk+-2.10.11.tar.bz2 15031543 RMD160 2c1297ace8c6893fdf6e682e7f7faabdb1866b
 DIST gtk+-2.10.13.tar.bz2 15163566 RMD160 bd812db8b11fbca5283e04958660fd3beec23caa SHA1 8d00b928a8788ff86d97197c20c18d41f9a1b1cd SHA256 6443ecc087a7cf771406264044e3f942ca49cc5fcb84f66d700fd291d55d0b4e
 DIST gtk+-2.10.14.tar.bz2 15172170 RMD160 234d7240732b28a31a260aa9e04c34fc502acbf4 SHA1 78b819814d52caa66739ab64611e41f35e5b48c3 SHA256 d02344239d048390ba02fcfd7de4f9efc0dfb51e7b06dfa46a6314d666ea4de2
 DIST gtk+-2.12.0.tar.bz2 15732170 RMD160 226c8f38eb7895d63f81feb60152db1ca3599628 SHA1 f5ecbf73a789a8880a6b2e15279267bb113980e2 SHA256 faa1dc73f8077f72849ade14963202d8af22b51469c1e8e88e20c69d330fd2fd
+DIST gtk+-2.12.1.tar.bz2 15856678 RMD160 3c3facd971a20178060c7e7cfe9d4cefd651250b SHA1 80114570273608251ef5acf9ee3daa4a3eb3d56b SHA256 7dceb0a5e6edc2398cd94415b336d7b37eb8941c2c41403c2c60bfb6ae47d6d6
 DIST gtk+-2.6-smoothscroll-r5.patch.bz2 3758 RMD160 b1db44f5055cef48239f69620e0bc13b1dccc139 SHA1 4ee4af7ebb1e013b14afeac94e8bd14b12badd58 SHA256 1322ed086c0b7353c5a28f23fe422ab23fd553ca8f3047b47fe5ae9a69c6c5eb
 DIST gtk+-2.6.1-lib64.patch.bz2 6047 RMD160 0ce3bf05fe59910ea019b4157dd1066367df2af6 SHA1 4a83215ef6a420db5f8080288567437941f72daf SHA256 fe171fc78e10f49ff69c2db424b816a331e21f362aef55b8624031c53ebcfc72
 DIST gtk+-2.6.10.tar.bz2 11521380 RMD160 5bb2e4de406e0e6ccf5c66ec48f6ba3e5b0911ff SHA1 9ba627683e0dc4bceb5fb900c1ee687638d95fcd SHA256 d408b606c8dd414dfbf220ccc168a0bc85a419945439796792a5357a96ff02af
@@ -104,18 +109,14 @@ EBUILD gtk+-2.10.14.ebuild 4149 RMD160 429f3d7ba893f47ff513a4c1d646c473c4bfb554
 MD5 f54569ad545cfb8800db1f6f8fd1b0c9 gtk+-2.10.14.ebuild 4149
 RMD160 429f3d7ba893f47ff513a4c1d646c473c4bfb554 gtk+-2.10.14.ebuild 4149
 SHA256 ee46a48aa4d1be7574ef84f94127812361f0b2353abf4dd8aeb8d817f997ad84 gtk+-2.10.14.ebuild 4149
-EBUILD gtk+-2.12.0-r1.ebuild 4670 RMD160 fb6491163e6dcf5ea616be575c605fde0f23c2f8 SHA1 5c30340fa5af1c8651d6e72c9f7c11961f065003 SHA256 df2d3f1964cc79ca075c9e5e00f4e0590739745e3cbcdeb9768baf941837759e
-MD5 4a4ce324072a5dcb9d15390c306a4f6f gtk+-2.12.0-r1.ebuild 4670
-RMD160 fb6491163e6dcf5ea616be575c605fde0f23c2f8 gtk+-2.12.0-r1.ebuild 4670
-SHA256 df2d3f1964cc79ca075c9e5e00f4e0590739745e3cbcdeb9768baf941837759e gtk+-2.12.0-r1.ebuild 4670
 EBUILD gtk+-2.12.0-r2.ebuild 5105 RMD160 0b063a83b4a8e6c7f6cc19939fb29db050347003 SHA1 6d532567b785b7a4050278f15bb825c9d313c5ce SHA256 31d6d1b0b42c82e840aaf957ae9978ee0b6b1beca34288e925f90ed4bedd586d
 MD5 7e9149ee9dc0d2a7928054c80545f8da gtk+-2.12.0-r2.ebuild 5105
 RMD160 0b063a83b4a8e6c7f6cc19939fb29db050347003 gtk+-2.12.0-r2.ebuild 5105
 SHA256 31d6d1b0b42c82e840aaf957ae9978ee0b6b1beca34288e925f90ed4bedd586d gtk+-2.12.0-r2.ebuild 5105
-EBUILD gtk+-2.12.0.ebuild 4219 RMD160 b33750e8d316c8aa055aaffc14be247b2838bfe9 SHA1 3e2ebf4e30dc2e74c71a88fdec700ce35a85472d SHA256 00451a15330e5497d9903849c13f9dd94c7ada4d04bb1644d6fbcbfbada83252
-MD5 79b24e2d934a9a27cc4e4b9df0aad556 gtk+-2.12.0.ebuild 4219
-RMD160 b33750e8d316c8aa055aaffc14be247b2838bfe9 gtk+-2.12.0.ebuild 4219
-SHA256 00451a15330e5497d9903849c13f9dd94c7ada4d04bb1644d6fbcbfbada83252 gtk+-2.12.0.ebuild 4219
+EBUILD gtk+-2.12.1.ebuild 4449 RMD160 45d3ab327e48fc9ba9deafc60a708c99e053287c SHA1 a8104d7e09fcf0a6f63484030c93bfd1b575d879 SHA256 deb5c67b1f6c0707ab119d0eee48c4ccbcbf8e751895a21c25b83076b8504901
+MD5 af29226d8932178d5fc675d99901c5e5 gtk+-2.12.1.ebuild 4449
+RMD160 45d3ab327e48fc9ba9deafc60a708c99e053287c gtk+-2.12.1.ebuild 4449
+SHA256 deb5c67b1f6c0707ab119d0eee48c4ccbcbf8e751895a21c25b83076b8504901 gtk+-2.12.1.ebuild 4449
 EBUILD gtk+-2.6.10-r1.ebuild 3370 RMD160 e680dd3f5686877d2ca70a5206c7bbbc09544a7f SHA1 6159c523651f475cad047d02351c5bb6179e1aeb SHA256 a7dad34c747da64c4303a8d76e034a67bfafefb2cd15035c54e73b42382766b2
 MD5 61d993dde25b05cac0042ec233000311 gtk+-2.6.10-r1.ebuild 3370
 RMD160 e680dd3f5686877d2ca70a5206c7bbbc09544a7f gtk+-2.6.10-r1.ebuild 3370
@@ -128,10 +129,10 @@ EBUILD gtk+-2.8.20-r1.ebuild 3992 RMD160 f7e91d3d2ccde1b5058d121603800ff7c993c1d
 MD5 dd9b7bf1a0491e24fdb72d683e194fe3 gtk+-2.8.20-r1.ebuild 3992
 RMD160 f7e91d3d2ccde1b5058d121603800ff7c993c1dd gtk+-2.8.20-r1.ebuild 3992
 SHA256 cd31aacbe6486049f05002275b28724c5cbeee15b851df99e194c6815bee9994 gtk+-2.8.20-r1.ebuild 3992
-MISC ChangeLog 48052 RMD160 6073d78d8aed39ff7f59684e06c859cda98f38d4 SHA1 7e5b9ce4bd8c95b0a1204cd9fd26422816fe206d SHA256 a673f006146fe108d4361bb9c29655191ac4be1be14590c9ef9210526131df10
-MD5 ce948134a00e787ef5f78f95034408fb ChangeLog 48052
-RMD160 6073d78d8aed39ff7f59684e06c859cda98f38d4 ChangeLog 48052
-SHA256 a673f006146fe108d4361bb9c29655191ac4be1be14590c9ef9210526131df10 ChangeLog 48052
+MISC ChangeLog 48327 RMD160 60bb0a23ad5089b88a98fa7a1366c549ec856c20 SHA1 7782cefe5d578854d6cf7e6f3f1f5e15f53e9a5c SHA256 f0a55b87d3a7a33af3c2c905984883f12bfd27853eff892e0854a46eedfd3485
+MD5 21c8402cd0adaf0212e2e8bcff1d8759 ChangeLog 48327
+RMD160 60bb0a23ad5089b88a98fa7a1366c549ec856c20 ChangeLog 48327
+SHA256 f0a55b87d3a7a33af3c2c905984883f12bfd27853eff892e0854a46eedfd3485 ChangeLog 48327
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 metadata.xml 424
@@ -148,15 +149,12 @@ SHA256 9f0cafcfeb47855f4c2ee132d581b32e1246607906f82840a89dceb1f766becc files/di
 MD5 cd3140e59008423025e51bfff870eea7 files/digest-gtk+-2.10.14 247
 RMD160 1243ae7ce3a392933e4e56750945396b4cb48578 files/digest-gtk+-2.10.14 247
 SHA256 ef2f3edecff46be6433fbbf80837b1911339138e0e51d5ab5e8b5cc5dc8a198c files/digest-gtk+-2.10.14 247
-MD5 0e2763959f967fce165ece267e5489b0 files/digest-gtk+-2.12.0 244
-RMD160 c26bd49dc4cb613ebe788023c40485b625b891fb files/digest-gtk+-2.12.0 244
-SHA256 06f40719ec74a015134e6e3269a1a8b5b10966ba8d72b961f8d4425d8beff06b files/digest-gtk+-2.12.0 244
-MD5 0e2763959f967fce165ece267e5489b0 files/digest-gtk+-2.12.0-r1 244
-RMD160 c26bd49dc4cb613ebe788023c40485b625b891fb files/digest-gtk+-2.12.0-r1 244
-SHA256 06f40719ec74a015134e6e3269a1a8b5b10966ba8d72b961f8d4425d8beff06b files/digest-gtk+-2.12.0-r1 244
 MD5 0e2763959f967fce165ece267e5489b0 files/digest-gtk+-2.12.0-r2 244
 RMD160 c26bd49dc4cb613ebe788023c40485b625b891fb files/digest-gtk+-2.12.0-r2 244
 SHA256 06f40719ec74a015134e6e3269a1a8b5b10966ba8d72b961f8d4425d8beff06b files/digest-gtk+-2.12.0-r2 244
+MD5 952b086559c0de52e60b7794efc0062b files/digest-gtk+-2.12.1 244
+RMD160 2e7ecbd60b30605a792b84f7357f43ff3d531de4 files/digest-gtk+-2.12.1 244
+SHA256 566f0bbb5618303d45184fb311f2fa87d6b9838a6ffdee40b7df443ed3a87191 files/digest-gtk+-2.12.1 244
 MD5 4db8c558f465f191df15e6d4b6198e6b files/digest-gtk+-2.6.10-r1 774
 RMD160 b07163c72c7096fb0f6fae53857bfce45994af49 files/digest-gtk+-2.6.10-r1 774
 SHA256 219aadd2affc04b82e80378f93bc4acbb03123573cc4e16c2f3366c20e4854cf files/digest-gtk+-2.6.10-r1 774
@@ -169,7 +167,7 @@ SHA256 87a06d8202ce31cb65090a54522b8c4cd3021dd5d5d42ff53ff22f754f9b2b97 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG+ZL/keYb6olFHJcRAnRmAJ4p9cGgR6XJ00VSc+Tjxn1veoTotQCg7gRh
-zbWT9S9NA9ygYUBSTQReTJg=
-=VigF
+iD8DBQFHGZVlkeYb6olFHJcRAlAnAKCKblLIOY5dgil2Fw313m9pQ02dGgCaAw8e
+7tMWX0Z3iMRX2PPG2asQKHg=
+=5m5r
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.12.0 b/x11-libs/gtk+/files/digest-gtk+-2.12.0
deleted file mode 100644
index f17cb4db830f..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.12.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e9c280afec29b11772af5a7c807abf41 gtk+-2.12.0.tar.bz2 15732170
-RMD160 226c8f38eb7895d63f81feb60152db1ca3599628 gtk+-2.12.0.tar.bz2 15732170
-SHA256 faa1dc73f8077f72849ade14963202d8af22b51469c1e8e88e20c69d330fd2fd gtk+-2.12.0.tar.bz2 15732170
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.12.0-r1 b/x11-libs/gtk+/files/digest-gtk+-2.12.0-r1
deleted file mode 100644
index f17cb4db830f..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.12.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e9c280afec29b11772af5a7c807abf41 gtk+-2.12.0.tar.bz2 15732170
-RMD160 226c8f38eb7895d63f81feb60152db1ca3599628 gtk+-2.12.0.tar.bz2 15732170
-SHA256 faa1dc73f8077f72849ade14963202d8af22b51469c1e8e88e20c69d330fd2fd gtk+-2.12.0.tar.bz2 15732170
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.12.1 b/x11-libs/gtk+/files/digest-gtk+-2.12.1
new file mode 100644
index 000000000000..c6d1447e5e6e
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.12.1
@@ -0,0 +1,3 @@
+MD5 c46f34addc2fe3ea6756055d59fb8856 gtk+-2.12.1.tar.bz2 15856678
+RMD160 3c3facd971a20178060c7e7cfe9d4cefd651250b gtk+-2.12.1.tar.bz2 15856678
+SHA256 7dceb0a5e6edc2398cd94415b336d7b37eb8941c2c41403c2c60bfb6ae47d6d6 gtk+-2.12.1.tar.bz2 15856678
diff --git a/x11-libs/gtk+/files/gtk+-2.12.1-firefox-print-preview.patch b/x11-libs/gtk+/files/gtk+-2.12.1-firefox-print-preview.patch
new file mode 100644
index 000000000000..f474c2af3e59
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.12.1-firefox-print-preview.patch
@@ -0,0 +1,29 @@
+http://bugzilla.gnome.org/show_bug.cgi?id=482531 - firefox crashed on print preview [@IA__gdk_window_get_toplevel] [@gdk_window_is_toplevel_frozen]
+
+Index: gtk+/gdk/gdkwindow.c
+===================================================================
+--- gtk+/gdk/gdkwindow.c	(revision 18802)
++++ gtk+/gdk/gdkwindow.c	(working copy)
+@@ -615,7 +615,11 @@ gdk_window_get_toplevel (GdkWindow *wind
+ 
+   obj = (GdkWindowObject *)window;
+   while (GDK_WINDOW_TYPE (obj) == GDK_WINDOW_CHILD)
+-    obj = (GdkWindowObject *)obj->parent;
++    {
++      obj = (GdkWindowObject *)obj->parent;
++      if (!obj)
++	return NULL;
++    }
+   
+   return GDK_WINDOW (obj);
+ }
+@@ -2297,6 +2301,9 @@ gdk_window_is_toplevel_frozen (GdkWindow
+ 
+   toplevel = (GdkWindowObject *)gdk_window_get_toplevel (window);
+ 
++  if (!toplevel)
++    return FALSE;
++
+   return toplevel->update_and_descendants_freeze_count > 0;
+ }
+ 
diff --git a/x11-libs/gtk+/gtk+-2.12.0.ebuild b/x11-libs/gtk+/gtk+-2.12.0.ebuild
deleted file mode 100644
index c33af9bc0988..000000000000
--- a/x11-libs/gtk+/gtk+-2.12.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# 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.ebuild,v 1.3 2007/09/22 23:51:35 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
-		einfo "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}
-
-	# 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"
-
-	# -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
-}
diff --git a/x11-libs/gtk+/gtk+-2.12.0-r1.ebuild b/x11-libs/gtk+/gtk+-2.12.1.ebuild
index e8ec8861cdc3..7f21d83b4469 100644
--- a/x11-libs/gtk+/gtk+-2.12.0-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.12.1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.2 2007/09/25 08:15:50 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.12.1.ebuild,v 1.1 2007/10/20 05:44:35 leio Exp $
 
 inherit gnome.org flag-o-matic eutils autotools virtualx
 
@@ -68,18 +68,14 @@ src_unpack() {
 	# 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"
+	epatch "${FILESDIR}/${PN}-2.12.0-flash-workaround.patch"
+
+	# OpenOffice.org might hang at startup (on non-gnome env) without this workaround, bug #193513
+	epatch "${FILESDIR}/${PN}-2.12.0-openoffice-freeze-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"
+	# Firefox print review crash fix, bug #195644
+	epatch "${FILESDIR}/${P}-firefox-print-preview.patch"
 
 	# -O3 and company cause random crashes in applications. Bug #133469
 	replace-flags -O3 -O2