From 21ed120309643c5857def5e6dc0c8d12f7abd9ab Mon Sep 17 00:00:00 2001 From: Remi Cardona Date: Fri, 21 Sep 2007 18:58:29 +0000 Subject: Add x11-libs/gtk+-2.12.0 (Gnome 2.20) Package-Manager: portage-2.1.3.9 --- x11-libs/gtk+/ChangeLog | 8 +- x11-libs/gtk+/Manifest | 20 ++- x11-libs/gtk+/files/digest-gtk+-2.12.0 | 3 + .../files/gtk+-2.12.0-icon-cache-speedup.patch | 28 ++++ x11-libs/gtk+/gtk+-2.12.0.ebuild | 152 +++++++++++++++++++++ 5 files changed, 206 insertions(+), 5 deletions(-) create mode 100644 x11-libs/gtk+/files/digest-gtk+-2.12.0 create mode 100644 x11-libs/gtk+/files/gtk+-2.12.0-icon-cache-speedup.patch create mode 100644 x11-libs/gtk+/gtk+-2.12.0.ebuild diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index 4f5e631e533d..5be5e1febeb3 100644 --- a/x11-libs/gtk+/ChangeLog +++ b/x11-libs/gtk+/ChangeLog @@ -1,6 +1,12 @@ # 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.335 2007/09/21 01:44:39 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.336 2007/09/21 18:58:28 remi Exp $ + +*gtk+-2.12.0 (21 Sep 2007) + + 21 Sep 2007; Rémi Cardona + +files/gtk+-2.12.0-icon-cache-speedup.patch, +gtk+-2.12.0.ebuild: + Add gtk+-2.12.0 (Gnome 2.20) 21 Sep 2007; Brent Baude gtk+-2.10.14.ebuild: Marking gtk+-2.10.14 ppc64 for bug #190019 diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index b4e4c3c207d7..0aa9d1ba7abf 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -30,6 +30,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-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 +SHA256 cb117bf1bbfc1e9509c614ba3c2d4a193f7b486fad9d7922208134749793e5ec files/gtk+-2.12.0-icon-cache-speedup.patch 969 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 @@ -55,6 +59,7 @@ DIST gtk+-1.2.10.tar.gz 2868322 RMD160 9b38310d2768e947c4f6173db009243dd11db288 DIST gtk+-2.10.11.tar.bz2 15031543 RMD160 2c1297ace8c6893fdf6e682e7f7faabdb1866b3a SHA1 3c68f3fa13ab72f6b190cbe958813d29955042e2 SHA256 9b1d724e39e1650ffc0719596bf1aaf140e27b924e96380020050c0cd7ae25f1 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.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 @@ -76,6 +81,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.ebuild 4111 RMD160 a32d0411445f30735ce19533bd9d311128467db2 SHA1 03a54e724c5176cd12092d01a791d23ad890ef79 SHA256 5ff638363457c6b6e05b80dab1d3df7034bce74496fa93a18e2d955cde0f271a +MD5 5427c5b8685c3f48e3808ada2477d92c gtk+-2.12.0.ebuild 4111 +RMD160 a32d0411445f30735ce19533bd9d311128467db2 gtk+-2.12.0.ebuild 4111 +SHA256 5ff638363457c6b6e05b80dab1d3df7034bce74496fa93a18e2d955cde0f271a gtk+-2.12.0.ebuild 4111 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 @@ -88,10 +97,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 46997 RMD160 4800076ffa6930e6967e8c3c9147d246e4f671d5 SHA1 8bb303511220038832bcab32544794711efaf42e SHA256 fb2ca24555574a9872c333777450838bde1a92187b98ecd23c7f976908a05d73 -MD5 651063b25e57f2d95e8f891a84b9a416 ChangeLog 46997 -RMD160 4800076ffa6930e6967e8c3c9147d246e4f671d5 ChangeLog 46997 -SHA256 fb2ca24555574a9872c333777450838bde1a92187b98ecd23c7f976908a05d73 ChangeLog 46997 +MISC ChangeLog 47170 RMD160 b41d8b9fe5002707440d62d4b08359225afa27d8 SHA1 cf9814dd4010d1a6033c4981e5d7b54879a426ae SHA256 cd22a3673f25e1bc26ebe91ba4036b75bc7866d4ec61e748cd229cf309a42826 +MD5 2577629f68ea0aae96d0d1d827108bf2 ChangeLog 47170 +RMD160 b41d8b9fe5002707440d62d4b08359225afa27d8 ChangeLog 47170 +SHA256 cd22a3673f25e1bc26ebe91ba4036b75bc7866d4ec61e748cd229cf309a42826 ChangeLog 47170 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 metadata.xml 424 @@ -108,6 +117,9 @@ 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 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 diff --git a/x11-libs/gtk+/files/digest-gtk+-2.12.0 b/x11-libs/gtk+/files/digest-gtk+-2.12.0 new file mode 100644 index 000000000000..f17cb4db830f --- /dev/null +++ b/x11-libs/gtk+/files/digest-gtk+-2.12.0 @@ -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-icon-cache-speedup.patch b/x11-libs/gtk+/files/gtk+-2.12.0-icon-cache-speedup.patch new file mode 100644 index 000000000000..99311df5fd96 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-2.12.0-icon-cache-speedup.patch @@ -0,0 +1,28 @@ +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtk+-2.12.0.orig/gtk/gtkiconcache.c gtk+-2.12.0/gtk/gtkiconcache.c +--- gtk+-2.12.0.orig/gtk/gtkiconcache.c 2007-09-13 16:35:41.000000000 -0400 ++++ gtk+-2.12.0/gtk/gtkiconcache.c 2007-09-14 15:33:01.000000000 -0400 +@@ -127,14 +127,19 @@ _gtk_icon_cache_new_for_path (const gcha + info.n_directories = 0; + info.flags = CHECK_OFFSETS|CHECK_STRINGS; + +- if (!_gtk_icon_cache_validate (&info)) ++#ifdef G_ENABLE_DEBUG ++ if (gtk_debug_flags & GTK_DEBUG_ICONTHEME) + { +- g_mapped_file_free (map); +- g_warning ("Icon cache '%s' is invalid\n", cache_filename); ++ if (!_gtk_icon_cache_validate (&info)) ++ { ++ g_mapped_file_free (map); ++ g_warning ("Icon cache '%s' is invalid\n", cache_filename); + +- goto done; ++ goto done; ++ } + } +- ++#endif ++ + GTK_NOTE (ICONTHEME, g_print ("found cache for %s\n", path)); + + cache = g_new0 (GtkIconCache, 1); diff --git a/x11-libs/gtk+/gtk+-2.12.0.ebuild b/x11-libs/gtk+/gtk+-2.12.0.ebuild new file mode 100644 index 000000000000..c64aa8b10cc8 --- /dev/null +++ b/x11-libs/gtk+/gtk+-2.12.0.ebuild @@ -0,0 +1,152 @@ +# 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.1 2007/09/21 18:58:28 remi 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.4 + ~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 + + # -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 + 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 +} -- cgit v1.2.3-65-gdbad