From 85ace77e970122f07e15a367f7958b9dd06eefed Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Tue, 18 Oct 2011 18:43:57 +0000 Subject: Version bump, also skip broken pltcheck tests under gtk/ subdir (bug #333463). Package-Manager: portage-2.1.10.29/cvs/Linux x86_64 --- x11-libs/gtk+/ChangeLog | 9 +- x11-libs/gtk+/Manifest | 11 +- .../gtk+-2.24.7-darwin-quartz-introspection.patch | 44 ++++ x11-libs/gtk+/gtk+-2.24.7.ebuild | 236 +++++++++++++++++++++ 4 files changed, 295 insertions(+), 5 deletions(-) create mode 100644 x11-libs/gtk+/files/gtk+-2.24.7-darwin-quartz-introspection.patch create mode 100644 x11-libs/gtk+/gtk+-2.24.7.ebuild (limited to 'x11-libs') diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index d5d661bb3004..18694d267edc 100644 --- a/x11-libs/gtk+/ChangeLog +++ b/x11-libs/gtk+/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-libs/gtk+ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.535 2011/10/18 14:29:12 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.536 2011/10/18 18:43:56 pacho Exp $ + +*gtk+-2.24.7 (18 Oct 2011) + + 18 Oct 2011; Pacho Ramos +gtk+-2.24.7.ebuild, + +files/gtk+-2.24.7-darwin-quartz-introspection.patch: + Version bump, also skip broken pltcheck tests under gtk/ subdir (bug + #333463). 18 Oct 2011; Jeroen Roovers gtk+-2.24.5-r1.ebuild, gtk+-3.0.12-r1.ebuild: diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 203e519e7d99..df8f77bc3d50 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -11,6 +11,7 @@ AUX gtk+-2.21.3-multilib.patch 611 RMD160 eca8037e03582ee04ba454b2010ba640555123 AUX gtk+-2.24.4-old-icons.patch 17368 RMD160 e7638f603a06234814b8b342584ab4e80a481cd6 SHA1 2530c85a890b618aa8e3277b4f10da632d865be9 SHA256 4cb55c322e45ea151217db40c6761e6eaaea89551ff1a4134107c92774a7b635 AUX gtk+-2.24.5-background-repaint.patch 1884 RMD160 d20c7389127d7b6a6253c438c9b0a2563828b823 SHA1 9800e67a5457734871bb45d34e5b3724ee6e9708 SHA256 3573af25e8db2fb490b264f80cb9e617ee1a36e767e36e7bb1d830c0b715db93 AUX gtk+-2.24.5-darwin-quartz-introspection.patch 1127 RMD160 9b08611d585fe88d8db310f91efdd22396f567d9 SHA1 d36be7be62307d1a6f4e64cd14d3da523af97488 SHA256 a0f91bf77bd2827c10c31c0f2d7de106254d3b053e5a2bf734e35bd814db3493 +AUX gtk+-2.24.7-darwin-quartz-introspection.patch 1239 RMD160 d5f30d44113adab3c58a16166c53bf493dd993fb SHA1 c05bb0890e49fbb04d6e3610518cff0c79a4008d SHA256 c718aae4511d9de28ea7b300a7f3d5e1099889a320847c8e642a2e6010838069 AUX gtk+-3.0.11-darwin-quartz-introspection.patch 2515 RMD160 e03ad9794395099b729e4cba53135b34ace777d0 SHA1 deda072dc35c454facccc232493bca5a5150b443 SHA256 49f8e2f1635c3eb8d7a4b2d1039150fc573f6a931ad2b3736176691ad2df8faf AUX gtk+-3.0.12-use-const.patch 8069 RMD160 ca641c05aa678b046ec42a800c39ef80b9d9cf16 SHA1 19d46115ef68b3e77558bede23eb83853d9bc6c6 SHA256 4fbaf845da7aa757280711fc5e9a4b684b4f0f58ac78dc881336ca2cd0064749 AUX gtk+-3.0.8-darwin-quartz.patch 579 RMD160 e7cee263b7edbf2d8cdfb848939c0f588b595567 SHA1 5196ef95f68080e2bd8a1582db7d61b0a65b0aac SHA256 2d30683f849be9be698424514341e814833c102c4f41d12cd02536cba62846fc @@ -21,6 +22,7 @@ DIST gtk+-1.2.10.tar.gz 2868322 RMD160 9b38310d2768e947c4f6173db009243dd11db288 DIST gtk+-2.24.4.tar.bz2 17607752 RMD160 56a6f731cfdc47686c71f8f6b4253484e08dd230 SHA1 c15a25ba49eb459b2c4cdc46baedf6cecf08cbcf SHA256 7d3033ad83647079977466d3e8f1a7533f47abd5cc693f01b8797ff43dd407a5 DIST gtk+-2.24.5.tar.xz 13252580 RMD160 f0eb690c906166c5f0e296faac8fdb983955921b SHA1 eb1200fe42bd2d5e3dc1bdb69b524600cbc06df1 SHA256 d6b30889efbb9fab9aa598092d08887826a7b2a3069b3bd5155dede28d9866f3 DIST gtk+-2.24.6.tar.xz 13173032 RMD160 5d78546b5f2aeb79d8fd8839911ee9a442e674e9 SHA1 da835834fe882be1893d0df41216e8141737b51b SHA256 8a026b545dc1fa0c1a69b395232ad7c8ee8fa260be5f7d9a2f2ffcd799efefca +DIST gtk+-2.24.7.tar.xz 13224600 RMD160 37fcc2702da52ec9785a6886939b795fb3c764ae SHA1 5f5206b88498aba03fd2dc24a925c210410e6660 SHA256 1fdc7605501bd2932ef9a3c4c3c9a406e505f18667aea9e73af650da28fff994 DIST gtk+-3.0.12-use-const2.patch.xz 12500 RMD160 2cebd73630f83530a76ac263d797e196032994ee SHA1 697b8d41ba24386acd1cfec1d733361901e797dd SHA256 f10b251a52a4f5d73b435315c94297dd30a4bc3c20a25bc947842bb214808cc4 DIST gtk+-3.0.12.tar.xz 13104092 RMD160 c82d14e113ae287476f5887ca03b8b01b8d22e1b SHA1 1b87e12ef3dfe598ee757db1f5bdff6cd66e6558 SHA256 219fdea120897981840e909fac40d4d433fe061a37b12b9402e215c819ebeae9 DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae @@ -28,14 +30,15 @@ EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9b EBUILD gtk+-2.24.4.ebuild 7474 RMD160 6423a1cb33e4f0493c39da224d2a125c45494c8a SHA1 d6d4caaf3ad58d7d81884d82b3fd6fbff6a15120 SHA256 08ae86596433eca5aa8cfa82f6eca0f0463fb4860d5ebfca1363dacb08eb4cc5 EBUILD gtk+-2.24.5-r1.ebuild 7812 RMD160 2a49468764e8093d488a26504de3ad97ecfe8c52 SHA1 ab84e6222c9844ee8f1ca3da2cb43151efb6a73f SHA256 e4cfcdd3d20a34820da29e754dd9e2eafac34366da6735d2cad0c496150175e3 EBUILD gtk+-2.24.6.ebuild 7676 RMD160 b36290f910c27eee2fc2ddd0a4c506c71b92a6f3 SHA1 845a413728db1fc707b641175808ea97785c02ad SHA256 a02fc317af27b02b9dea43adab64c1845ae5f3a2b7ed346875cadd9e4f5d6ba2 +EBUILD gtk+-2.24.7.ebuild 7680 RMD160 72bb82e782cf3cbc41509b8d353186fdc781e821 SHA1 a5bd93f5415443d7b3c8a9413c99140aa9d68801 SHA256 a92648d881e6b15915136bde60e473ebb6f078b3554eae8d1988e3af47a7401c EBUILD gtk+-3.0.12-r1.ebuild 6170 RMD160 ebe92a71db978280d40a63e2966999084886e8e0 SHA1 e46274870fd65b1c4fb6e1275ea2d7ef685dca3b SHA256 8dc2ad3629877acedf276793b926d4da4dc5c4c8453cd2118343951a104ce168 EBUILD gtk+-3.0.12.ebuild 5924 RMD160 304c8786053b789687d2179b017e2bc8b6538943 SHA1 b15b6ffc22ae2c709af8249f8283d1150e209d20 SHA256 a28b2ead97e9a6d44d2aab8db2811befd406444ca7733ca5d4eb3851301f4c9e -MISC ChangeLog 80130 RMD160 c4e0b6701905b0357352b5a66df638d572d829af SHA1 ab2424f8a61a5c6b64f5a413d6fd8936c1f436c6 SHA256 525a5e83ff6ca919ea701f0a3052943a90b9713f4feec6ce563f0c3ffdfece8f +MISC ChangeLog 80367 RMD160 1ae9d58abe955c7aa5de3f977e55c918a2a6a0ec SHA1 cb6d78e7da7de4cf7d382591a0ddb854e640dc61 SHA256 18dbcfc2800c02c44eb22fb8d61f9ea4a34b793fbfb24711edb2b365a72dd673 MISC metadata.xml 549 RMD160 8d6692e4cf18e0c75421ddef09e2881624c5ce3e SHA1 ce3ed4bec69816eb61b5ca9d48c2db396085a923 SHA256 2e7f82b302d91c37ecf915de09e4b85ef093b790baacbef0325b6fe9b1bb304b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk6djT4ACgkQVWmRsqeSphNUYwCeIS5sCEv0xZjtvDB267NNisJa -y0wAnR8pZDSk8k1MzUGwskifM51g9w0Y -=rIja +iEYEARECAAYFAk6dyPMACgkQCaWpQKGI+9Qj4gCfY/OtJbj9MsQGMosk/tR/nxDi +2cUAnjNVzsPr3UpPdrFDsV1b8rm8HDIs +=tIOn -----END PGP SIGNATURE----- diff --git a/x11-libs/gtk+/files/gtk+-2.24.7-darwin-quartz-introspection.patch b/x11-libs/gtk+/files/gtk+-2.24.7-darwin-quartz-introspection.patch new file mode 100644 index 000000000000..f07b91259ff0 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-2.24.7-darwin-quartz-introspection.patch @@ -0,0 +1,44 @@ +https://bugs.gentoo.org/attachment.cgi?id=278091&action=diff&context=patch&collapsed=&headers=1&format=raw +https://bugs.gentoo.org/show_bug.cgi?id=372953 +https://bugzilla.gnome.org/show_bug.cgi?id=642085 + +--- gtk/Makefile.am~ 2011-10-18 00:38:28.000000000 +0200 ++++ gtk/Makefile.am 2011-10-18 20:28:40.187219540 +0200 +@@ -32,7 +32,7 @@ + endif + endif + +-INCLUDES = \ ++INCLUDES_COMMON = \ + -DG_LOG_DOMAIN=\"Gtk\" \ + -DGTK_LIBDIR=\"$(libdir)\" \ + -DGTK_DATADIR=\"$(datadir)\" \ +@@ -52,9 +52,18 @@ + -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ + -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ + $(GTK_DEBUG_FLAGS) \ +- $(GTK_DEP_CFLAGS) \ ++ $(GTK_DEP_CFLAGS) ++ ++ ++INCLUDES= \ ++ $(INCLUDES_COMMON) \ + $(INCLUDED_IMMODULE_DEFINE) + ++ ++INCLUDES_GIR= \ ++ $(INCLUDES_COMMON) \ ++ $(INCLUDED_IMMODULE_DEFINE) ++ + gtarget=$(gdktarget) + + if PLATFORM_WIN32 +@@ -1016,7 +1025,7 @@ + endif + Gtk_2_0_gir_INCLUDES = Atk-1.0 Gdk-2.0 + Gtk_2_0_gir_CFLAGS = \ +- $(INCLUDES) \ ++ $(INCLUDES_GIR) \ + -UGDK_DISABLE_DEPRECATED \ + -UGTK_DISABLE_DEPRECATED \ + -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API diff --git a/x11-libs/gtk+/gtk+-2.24.7.ebuild b/x11-libs/gtk+/gtk+-2.24.7.ebuild new file mode 100644 index 000000000000..d85a7475ed9c --- /dev/null +++ b/x11-libs/gtk+/gtk+-2.24.7.ebuild @@ -0,0 +1,236 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.7.ebuild,v 1.1 2011/10/18 18:43:56 pacho Exp $ + +EAPI="4" +PYTHON_DEPEND="2:2.4" + +inherit eutils flag-o-matic gnome.org libtool python virtualx autotools + +DESCRIPTION="Gimp ToolKit +" +HOMEPAGE="http://www.gtk.org/" +SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="aqua cups debug doc examples +introspection test vim-syntax xinerama" + +# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) +RDEPEND="!aqua? ( + x11-libs/libXrender + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXt + x11-libs/libXext + >=x11-libs/libXrandr-1.3 + x11-libs/libXcursor + x11-libs/libXfixes + x11-libs/libXcomposite + x11-libs/libXdamage + >=x11-libs/cairo-1.6[X,svg] + x11-libs/gdk-pixbuf:2[X,introspection?] + ) + aqua? ( + >=x11-libs/cairo-1.6[aqua,svg] + x11-libs/gdk-pixbuf:2[introspection?] + ) + xinerama? ( x11-libs/libXinerama ) + >=dev-libs/glib-2.27.3:2 + >=x11-libs/pango-1.20[introspection?] + >=dev-libs/atk-1.29.2[introspection?] + media-libs/fontconfig + x11-misc/shared-mime-info + cups? ( net-print/cups ) + introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) + ! "${T}/gtkrc" + insinto /etc/gtk-2.0 + doins "${T}"/gtkrc + + # Enable xft in environment as suggested by + echo "GDK_USE_XFT=1" > "${T}"/50gtk2 + doenvd "${T}"/50gtk2 + + dodoc AUTHORS ChangeLog* HACKING NEWS* README* + + # add -framework Carbon to the .pc files + use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do + sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED%/}"/usr/lib/pkgconfig/$i || die "sed failed" + done + + python_convert_shebangs 2 "${ED}"usr/bin/gtk-builder-convert + + find "${D}" -name '*.la' -exec rm -f {} + +} + +pkg_postinst() { + set_gtk2_confdir + + # gtk.immodules should be in their CHOST directories respectively. + gtk-query-immodules-2.0 > "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" \ + || ewarn "Failed to run gtk-query-immodules-2.0" + + if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then + elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST" + elog "aware location. Removing deprecated file." + rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules + fi + + # pixbufs are now handled by x11-libs/gdk-pixbuf + if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then + elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf" + elog "Removing deprecated file." + rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders + fi + + # two checks needed since we dropped multilib conditional + if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then + elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf" + elog "Removing deprecated file." + rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders + fi + + if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then + elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* + elog "to do that you can use qfile from portage-utils:" + elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)" + fi + + if ! has_version "app-text/evince"; then + elog "Please install app-text/evince for print preview functionality." + elog "Alternatively, check \"gtk-print-preview-command\" documentation and" + elog "add it to your gtkrc." + fi +} -- cgit v1.2.3-65-gdbad