From 82c8cd095e77670e06eeedc16f262363d46d8bdf Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Wed, 14 Mar 2007 16:01:52 +0000 Subject: [PATCH] Bump to 2.10.11 - Tons of bug fixes... Package-Manager: portage-2.1.2.2 --- x11-libs/gtk+/ChangeLog | 8 +- x11-libs/gtk+/Manifest | 26 +++- x11-libs/gtk+/files/digest-gtk+-2.10.11 | 3 + x11-libs/gtk+/gtk+-2.10.11.ebuild | 151 ++++++++++++++++++++++++ 4 files changed, 183 insertions(+), 5 deletions(-) create mode 100644 x11-libs/gtk+/files/digest-gtk+-2.10.11 create mode 100644 x11-libs/gtk+/gtk+-2.10.11.ebuild diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index 6027e68ce695..ebb56db293c7 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.301 2007/03/14 11:09:49 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.302 2007/03/14 16:01:52 dang Exp $ + +*gtk+-2.10.11 (14 Mar 2007) + + 14 Mar 2007; Daniel Gryniewicz +gtk+-2.10.11.ebuild: + Bump to 2.10.11 + - Tons of bug fixes... 14 Mar 2007; Simon Stelling gtk+-2.10.9.ebuild: stable on amd64; security bug 163678 diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 8837eb29f29f..7c635a463b55 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX gtk+-1.2-locale_fix.patch 419 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a SHA1 569c877ff692a7694e8aca5aceae9558844ba5dd SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a files/gtk+-1.2-locale_fix.patch 419 @@ -44,6 +47,7 @@ RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 files/gtkrc 627 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294 files/gtkrc 627 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 RMD160 fa41bb12e41f0c60c605dbeac03a1aaa905f4333 SHA1 7350d1ed147e52ddc870a4d4b52073f7407d9f0d SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684 DIST gtk+-1.2.10.tar.gz 2868322 RMD160 9b38310d2768e947c4f6173db009243dd11db288 SHA1 a5adcb909257da01ae4d4761e1d41081d06e4d7c SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34 +DIST gtk+-2.10.11.tar.bz2 15031543 RMD160 2c1297ace8c6893fdf6e682e7f7faabdb1866b3a SHA1 3c68f3fa13ab72f6b190cbe958813d29955042e2 SHA256 9b1d724e39e1650ffc0719596bf1aaf140e27b924e96380020050c0cd7ae25f1 DIST gtk+-2.10.6.tar.bz2 14561124 RMD160 929386610a634e82b7ddb10f43930b27194fa67b SHA1 aad6e1ef964d8acb8a04942b8dd2e00a9db56450 SHA256 ca98edcea2034ab36c1024121a44d047de192d282127c8f8b77d14afba0ca468 DIST gtk+-2.10.7.tar.bz2 14955229 RMD160 130af39787b146166846f44b104ea0c3683d0578 SHA1 784a7ecc75767306efe1f200a1251968f944143e SHA256 3daead5f578ec2a3752997e6048eb3ecdce208cee560f7289dd9d069ca623276 DIST gtk+-2.10.9.tar.bz2 14933330 RMD160 f415eb350edbf53965a1ec32f99c386cfd3d7df5 SHA1 aa3260d9093398445cfbecf355f4728db3e827bf SHA256 3aab107fb97a280b77fa30d07540e325d1511907bbce1e7efa5b4db2dffa28a3 @@ -56,6 +60,10 @@ EBUILD gtk+-1.2.10-r12.ebuild 2319 RMD160 c1e42732cfe898710723ad432e224e914892d6 MD5 45e4f70fc1f7c9ba9b4619ed742d9fe3 gtk+-1.2.10-r12.ebuild 2319 RMD160 c1e42732cfe898710723ad432e224e914892d679 gtk+-1.2.10-r12.ebuild 2319 SHA256 97f42788bb05fa6611b9422027f0eb8635b79b7429cc99aeabd9d5295d213da1 gtk+-1.2.10-r12.ebuild 2319 +EBUILD gtk+-2.10.11.ebuild 4051 RMD160 cfd60c65db156f53afaa7d4c424c4a5a7d0fd50c SHA1 a2af3e04ff4c3c47f171db538e28f4fb0e28f9e0 SHA256 8067c1b095eefdc74298b1db46bd4ac529f524984291785af4e17b1a6ef62261 +MD5 d5f4d60ef3cb0e9d7f141a920fcf84aa gtk+-2.10.11.ebuild 4051 +RMD160 cfd60c65db156f53afaa7d4c424c4a5a7d0fd50c gtk+-2.10.11.ebuild 4051 +SHA256 8067c1b095eefdc74298b1db46bd4ac529f524984291785af4e17b1a6ef62261 gtk+-2.10.11.ebuild 4051 EBUILD gtk+-2.10.6.ebuild 3893 RMD160 354ee4716b84f28df1320538e8c94a8c6dd3c7d7 SHA1 098f51da4dbea131ca8ea881f2636476f9f64971 SHA256 e4ca6e74b371da926c6588fef80cb7490f0e624016f07c80c4819078cea51b29 MD5 290fbdb32a07b1b65df99e5bb523e1c8 gtk+-2.10.6.ebuild 3893 RMD160 354ee4716b84f28df1320538e8c94a8c6dd3c7d7 gtk+-2.10.6.ebuild 3893 @@ -80,10 +88,10 @@ EBUILD gtk+-2.8.20-r1.ebuild 4092 RMD160 63a741c0bbf75fe549277f5cad36d2b21d7afe7 MD5 cd6eb30366994c8450fa9359d2d4fcd5 gtk+-2.8.20-r1.ebuild 4092 RMD160 63a741c0bbf75fe549277f5cad36d2b21d7afe71 gtk+-2.8.20-r1.ebuild 4092 SHA256 10933d9f04fc0124a446e88fd29892fdb9c2c737b0604d74eae3df8bc4d8b4e1 gtk+-2.8.20-r1.ebuild 4092 -MISC ChangeLog 42661 RMD160 e28e5bc0b95b49158acba739d2a7aed294fc76b3 SHA1 64a80b9b4e45c82743ce7b9ca6af9fdad52afe82 SHA256 21b1c91bd53fcc37816d21262d6d1ee4f7cfc1e544bf2fa30b895310cfe9a4f7 -MD5 ea0a9e540d0559809d8f5b527392d80d ChangeLog 42661 -RMD160 e28e5bc0b95b49158acba739d2a7aed294fc76b3 ChangeLog 42661 -SHA256 21b1c91bd53fcc37816d21262d6d1ee4f7cfc1e544bf2fa30b895310cfe9a4f7 ChangeLog 42661 +MISC ChangeLog 42807 RMD160 6ecd96b096d9b6070fd91ac6fbba8ed1e0f6e8e7 SHA1 b1d555629acca5e4b506e0d7f9d2bae82f294317 SHA256 4456b67ba96900f4caa871dd14b0b9557650eb71fbd4c0c60f20b9c3ca8d514d +MD5 00eea38d0e9ce2315c5c6b8894b7d498 ChangeLog 42807 +RMD160 6ecd96b096d9b6070fd91ac6fbba8ed1e0f6e8e7 ChangeLog 42807 +SHA256 4456b67ba96900f4caa871dd14b0b9557650eb71fbd4c0c60f20b9c3ca8d514d ChangeLog 42807 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 metadata.xml 424 @@ -91,6 +99,9 @@ SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d metadata MD5 9a443de5999df036ffd6e66f5b0f83ce files/digest-gtk+-1.2.10-r12 506 RMD160 45ddc3e7c5ca97084139787b6be318498a9965db files/digest-gtk+-1.2.10-r12 506 SHA256 4bd7f7ef31547e6dabca532b07bc6be7e37c96d234abd2818afbb85d725aed47 files/digest-gtk+-1.2.10-r12 506 +MD5 243331e51ce452c0613ceee64d80f77d files/digest-gtk+-2.10.11 247 +RMD160 649617bd811670f0ce9bbffd5165a400d42e7d1d files/digest-gtk+-2.10.11 247 +SHA256 d0eb86fc1575869bcad882c9bcfcf3e5dddb0ed962e7f455582824179a24e4ec files/digest-gtk+-2.10.11 247 MD5 c8326ddbc6cc256207f438f1907fc185 files/digest-gtk+-2.10.6 244 RMD160 52d7da5456f30a8fef7f96c0eca54f3c6c63a260 files/digest-gtk+-2.10.6 244 SHA256 55bbe220e1f771910fc8c1bbaae3a8a5d984af059306f8904ed77a0e76e1947b files/digest-gtk+-2.10.6 244 @@ -109,3 +120,10 @@ SHA256 0be521aa113e9334cffe0bb4078bd8a363029c2a8ddae0b8005bbf2e3eb69f09 files/di MD5 5987bda64cc0a2c5d968d200029e4f26 files/digest-gtk+-2.8.20-r1 244 RMD160 ef26312aa81fad817ff4350262c7675927298af6 files/digest-gtk+-2.8.20-r1 244 SHA256 87a06d8202ce31cb65090a54522b8c4cd3021dd5d5d42ff53ff22f754f9b2b97 files/digest-gtk+-2.8.20-r1 244 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFF+BvgomPajV0RnrERApSyAJwJuTFg1EX48FwLR6VxIA/C4ReQUACeIIF0 +j0K9DPWZ5YR49/wUpd/8e5E= +=zX3c +-----END PGP SIGNATURE----- diff --git a/x11-libs/gtk+/files/digest-gtk+-2.10.11 b/x11-libs/gtk+/files/digest-gtk+-2.10.11 new file mode 100644 index 000000000000..c86fcf92fb7d --- /dev/null +++ b/x11-libs/gtk+/files/digest-gtk+-2.10.11 @@ -0,0 +1,3 @@ +MD5 3b32eab43bf5195d981867d25ba55d66 gtk+-2.10.11.tar.bz2 15031543 +RMD160 2c1297ace8c6893fdf6e682e7f7faabdb1866b3a gtk+-2.10.11.tar.bz2 15031543 +SHA256 9b1d724e39e1650ffc0719596bf1aaf140e27b924e96380020050c0cd7ae25f1 gtk+-2.10.11.tar.bz2 15031543 diff --git a/x11-libs/gtk+/gtk+-2.10.11.ebuild b/x11-libs/gtk+/gtk+-2.10.11.ebuild new file mode 100644 index 000000000000..5974566acf3e --- /dev/null +++ b/x11-libs/gtk+/gtk+-2.10.11.ebuild @@ -0,0 +1,151 @@ +# 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.10.11.ebuild,v 1.1 2007/03/14 16:01:52 dang 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="debug doc jpeg tiff xinerama" + +RDEPEND="x11-libs/libXrender + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXt + x11-libs/libXext + x11-libs/libXcursor + x11-libs/libXrandr + x11-libs/libXfixes + xinerama? ( x11-libs/libXinerama ) + >=dev-libs/glib-2.12.1 + >=x11-libs/pango-1.12.0 + >=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 + 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 + xinerama? ( x11-proto/xineramaproto ) + doc? ( + >=dev-util/gtk-doc-1.4 + ~app-text/docbook-xml-dtd-4.1.2 + )" + +RESTRICT="confcache" + +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}" + + # Optionalize xinerama support + epatch "${FILESDIR}"/${PN}-2.8.10-xinerama.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 + + # Revert DND change that makes mozilla products DND broken + EPATCH_OPTS="-R" epatch "${FILESDIR}/${PN}-2.10.7-mozilla-dnd-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() { + make DESTDIR="${D}" install || 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* +} + +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 +} -- 2.26.2