diff options
author | Mart Raudsepp <leio@gentoo.org> | 2007-09-24 20:21:42 +0000 |
---|---|---|
committer | Mart Raudsepp <leio@gentoo.org> | 2007-09-24 20:21:42 +0000 |
commit | 28ab03675acd7182aa70f957ee6f4c25d17539b1 (patch) | |
tree | 6ddea12a5cd931e0c2305de6fa3e2f5485f9c116 /x11-libs | |
parent | fix quoting of D (diff) | |
download | historical-28ab03675acd7182aa70f957ee6f4c25d17539b1.tar.gz historical-28ab03675acd7182aa70f957ee6f4c25d17539b1.tar.bz2 historical-28ab03675acd7182aa70f957ee6f4c25d17539b1.zip |
Hopefully fix netscape-flash crashes and infinite loops and Java SWT tooltips weird behaviour and related crashes. Bug #193513 and part of bug #192310 and self-observation
Package-Manager: portage-2.1.3.9
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/gtk+/ChangeLog | 11 | ||||
-rw-r--r-- | x11-libs/gtk+/Manifest | 29 | ||||
-rw-r--r-- | x11-libs/gtk+/files/digest-gtk+-2.12.0-r1 | 3 | ||||
-rw-r--r-- | x11-libs/gtk+/files/gtk+-2.12.0-flash-workaround.patch | 12 | ||||
-rw-r--r-- | x11-libs/gtk+/files/gtk+-2.12.0-swt-tooltips-fix.patch | 14 | ||||
-rw-r--r-- | x11-libs/gtk+/gtk+-2.12.0-r1.ebuild | 162 |
6 files changed, 223 insertions, 8 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index 5be5e1febeb3..302f8b75c0ad 100644 --- a/x11-libs/gtk+/ChangeLog +++ b/x11-libs/gtk+/ChangeLog @@ -1,6 +1,15 @@ # 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.336 2007/09/21 18:58:28 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.337 2007/09/24 20:21:41 leio Exp $ + +*gtk+-2.12.0-r1 (24 Sep 2007) + + 24 Sep 2007; Mart Raudsepp <leio@gentoo.org> + +files/gtk+-2.12.0-flash-workaround.patch, + +files/gtk+-2.12.0-swt-tooltips-fix.patch, +gtk+-2.12.0-r1.ebuild: + Hopefully fix netscape-flash crashes and infinite loops and Java SWT + tooltips weird behaviour and related crashes. Bug #193513 and part of bug + #192310 and self-observation *gtk+-2.12.0 (21 Sep 2007) diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index b47ed2e34cb8..c6be7851d99e 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -33,6 +33,10 @@ AUX gtk+-2.10.7-mozilla-dnd-fix.patch 2899 RMD160 2cc33847d78fe0c207bc79f5145461 MD5 ffd8534d7546dad5d54fd70be4af97f7 files/gtk+-2.10.7-mozilla-dnd-fix.patch 2899 RMD160 2cc33847d78fe0c207bc79f514546113d740ca2c files/gtk+-2.10.7-mozilla-dnd-fix.patch 2899 SHA256 9ec24dbe7e652aaee7d6118adffb4919ee0b3d7887587649cb475f3e69f5d729 files/gtk+-2.10.7-mozilla-dnd-fix.patch 2899 +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 @@ -41,6 +45,10 @@ 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-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 @@ -88,6 +96,10 @@ 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 4661 RMD160 d8909607ed7abe55ccb797ea950e8245ed50f877 SHA1 4a84ea33b08e231d222832a5527d094546df37a3 SHA256 42004a04455f5870c19c9ca94d07a24f298e4ec8792c9caf8566e76518cdfa79 +MD5 7f7e323bec983e04e7568fc238aa501b gtk+-2.12.0-r1.ebuild 4661 +RMD160 d8909607ed7abe55ccb797ea950e8245ed50f877 gtk+-2.12.0-r1.ebuild 4661 +SHA256 42004a04455f5870c19c9ca94d07a24f298e4ec8792c9caf8566e76518cdfa79 gtk+-2.12.0-r1.ebuild 4661 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 @@ -104,10 +116,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 47170 RMD160 b41d8b9fe5002707440d62d4b08359225afa27d8 SHA1 cf9814dd4010d1a6033c4981e5d7b54879a426ae SHA256 cd22a3673f25e1bc26ebe91ba4036b75bc7866d4ec61e748cd229cf309a42826 -MD5 2577629f68ea0aae96d0d1d827108bf2 ChangeLog 47170 -RMD160 b41d8b9fe5002707440d62d4b08359225afa27d8 ChangeLog 47170 -SHA256 cd22a3673f25e1bc26ebe91ba4036b75bc7866d4ec61e748cd229cf309a42826 ChangeLog 47170 +MISC ChangeLog 47541 RMD160 ac8eabd4cdeb93e7aeaf3ba1900914385f0396e6 SHA1 41f71056e723da28b786b20b0a31e1cd7a92ee82 SHA256 393a1c8e94d55d941747da89e09d15da27c919c9771c86591fffa328522ba9bb +MD5 7fcbf7a4b919fc380d6e7ff495964177 ChangeLog 47541 +RMD160 ac8eabd4cdeb93e7aeaf3ba1900914385f0396e6 ChangeLog 47541 +SHA256 393a1c8e94d55d941747da89e09d15da27c919c9771c86591fffa328522ba9bb ChangeLog 47541 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 metadata.xml 424 @@ -127,6 +139,9 @@ SHA256 ef2f3edecff46be6433fbbf80837b1911339138e0e51d5ab5e8b5cc5dc8a198c files/di 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 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 @@ -139,7 +154,7 @@ SHA256 87a06d8202ce31cb65090a54522b8c4cd3021dd5d5d42ff53ff22f754f9b2b97 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFG9aqLkeYb6olFHJcRAsvcAJ97h+h4qZzqzWlvSZ5bX5T6j0f1HwCeOXTR -aNSU36eE/LKjoRkVxZkUPXE= -=8aNp +iD8DBQFG+BxWkeYb6olFHJcRAjZiAJ41kosYKBIpVcPplUPp1Om1L7J3wACfc/TI +0QLFlE8CwW0FOjia4S1gSoo= +=FRJb -----END PGP SIGNATURE----- diff --git a/x11-libs/gtk+/files/digest-gtk+-2.12.0-r1 b/x11-libs/gtk+/files/digest-gtk+-2.12.0-r1 new file mode 100644 index 000000000000..f17cb4db830f --- /dev/null +++ b/x11-libs/gtk+/files/digest-gtk+-2.12.0-r1 @@ -0,0 +1,3 @@ +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/gtk+-2.12.0-flash-workaround.patch b/x11-libs/gtk+/files/gtk+-2.12.0-flash-workaround.patch new file mode 100644 index 000000000000..7beccc39c872 --- /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-swt-tooltips-fix.patch b/x11-libs/gtk+/files/gtk+-2.12.0-swt-tooltips-fix.patch new file mode 100644 index 000000000000..8277cdf08e66 --- /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-r1.ebuild b/x11-libs/gtk+/gtk+-2.12.0-r1.ebuild new file mode 100644 index 000000000000..a2920a4ec76a --- /dev/null +++ b/x11-libs/gtk+/gtk+-2.12.0-r1.ebuild @@ -0,0 +1,162 @@ +# 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.1 2007/09/24 20:21:41 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" + + # 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" + + # -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 +} |