From 4c1773f6d145d67e031d99fc6f9b2a1720fcd38c Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Wed, 12 Oct 2011 23:01:17 +0000 Subject: [PATCH] Fiy for undelinking, #367605 Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64 --- media-gfx/gimp/ChangeLog | 8 +- media-gfx/gimp/Manifest | 16 ++- media-gfx/gimp/gimp-2.6.11-r6.ebuild | 151 +++++++++++++++++++++++++++ media-gfx/gimp/metadata.xml | 22 ++-- 4 files changed, 183 insertions(+), 14 deletions(-) create mode 100644 media-gfx/gimp/gimp-2.6.11-r6.ebuild diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog index 3c41bbcd3d41..f85139c8c9ee 100644 --- a/media-gfx/gimp/ChangeLog +++ b/media-gfx/gimp/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/gimp # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.345 2011/10/10 00:03:58 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.346 2011/10/12 23:01:17 jlec Exp $ + +*gimp-2.6.11-r6 (12 Oct 2011) + + 12 Oct 2011; Justin Lecher +gimp-2.6.11-r6.ebuild, + metadata.xml: + Fiy for undelinking, #367605 10 Oct 2011; Sebastian Pipping gimp-2.7.3-r1.ebuild: Add dev-util/gtk-doc-am (not gtk-doc) to DEPEND due to the call to diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index 7dee55b99b70..3fd687ea4367 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + AUX gimp-2.6.11-cve-2011-2896.patch 1818 RMD160 4cc01a8197a31f3793897150e190ea097135efe7 SHA1 fc510e48d6a0e4840b7d98d93d0d4350add167ca SHA256 6613af30b70afb984a89dc8fa75ca6ba3271471d7fd62de23a1a9fda2fd5ec89 AUX gimp-2.6.11-file-uri.patch 2209 RMD160 17cd5c7b454e7f64f7ed50cec4d9fe160ce7f2fc SHA1 77b3f6f50934a70f2ac938cfa0a1876ee72c2d14 SHA256 cb9da632417fcc866c047104cfbe25b5b9964fa5e65e333c042fdf23c19e692f AUX gimp-2.6.11-poppler-0.17.patch 15620 RMD160 5f22b65bcadecbff1b67a42a6dd48fd167272bc9 SHA1 418cbe80cc5cd7f6476ce196c755344954df83e0 SHA256 69b214ff495c7cbc1f52c0c56fa9a09e4dfba47f54da8bb3c8b063b26b8d04bd @@ -6,6 +9,7 @@ AUX gimp-CVE-2010-4540-to-4543.diff 5678 RMD160 0947a979ae64b2520967a6e8c3493aa3 AUX gimp-curl-headers.diff 358 RMD160 b3c5d4120a203280ae9625a11de0ff5d3330dbc3 SHA1 46f694eb7d01a9d952e5651bb8c2ec22c62ccbd4 SHA256 34c706af2ba690be90ef6d0f68fef552b90fdf3a6ff0290e7d5fc02024b76b6f AUX gimp-libpng15-v2.diff 18466 RMD160 fc9490eb1525841c19236b4141f9adbdd0c3a273 SHA1 6d0b91b0aa107cba7a0592d0d523a22a1a67b124 SHA256 d3a4f0b365497adf1eaeaf6b4ecb5eff5517eb0ce4373ef15da0e4cece5703aa AUX gimp-libpng15.diff 17119 RMD160 c04595754b3b3bf2631ab834261d14d7debb08ca SHA1 a56e8dc7e7d9df47d582285effa94b25e552093f SHA256 d77b61592d4943b052200eb98305b6cd15c24259b538c9a56afa498328470086 +DIST gimp-2.6.11-underlinking.patch.xz 5544 RMD160 289359e3b2367cf85dd2f838350ae340ff21256c SHA1 7b7daa0144da506519070835a101455f87e6bfba SHA256 5e7f2f16b8fe9b186b94cbe4cea1cda6242b066c07d36ca4907e276e32976d56 DIST gimp-2.6.11.tar.bz2 16473561 RMD160 a116377499e58dc2bfe231ab3c057d0be94091ff SHA1 2f9d596e727bdbf304fa78257c1731d9faf3934c SHA256 9b6d08d0803b3912ea596d1b77b9c21ee13778c23388a225c004b8c1587cb0a1 DIST gimp-2.7.3.tar.bz2 18206530 RMD160 5740b1b62b0fca255d0ca046477c21ab9c57a5ca SHA1 bea6edc3423774ace8dd86222314f4ef2278cdd8 SHA256 669811e66c6a5dffdca0df3f39f699b3a013aa5634447d9b90268f4068a8a4d9 EBUILD gimp-2.6.11-r1.ebuild 3248 RMD160 324ff1505eeed9d839cc9695df3289dff0e5bf6e SHA1 b163b4ce5567abeb087b4f50eb4bfc2bb431a040 SHA256 07c2eafd3ce4e49f05a7b154b30be3f40a069e6617e1538c5e97d901dc424925 @@ -13,8 +17,16 @@ EBUILD gimp-2.6.11-r2.ebuild 3259 RMD160 0f869b84f27b578b0c50da27545afc724ec236f EBUILD gimp-2.6.11-r3.ebuild 3442 RMD160 6c00cf7623c95dd96c2ff7ff4dbc20b85f0626ee SHA1 78a5a60ff16cbe6b60db16c141ad5c330247ab68 SHA256 8ef54a8f1812a0f951c621c1adfc556629c65cd151411679bb197a9202a3c406 EBUILD gimp-2.6.11-r4.ebuild 3599 RMD160 716dc59bece8d051abbff3342792967c3bbad8c8 SHA1 b084de1d1852f47b47538c436a1e821fd83396d6 SHA256 a2092b38bc668c4d642957d141139e8a020361d2ae1f4405b89c741abbde7fb5 EBUILD gimp-2.6.11-r5.ebuild 3866 RMD160 de7cfd740b410accb111b9c47d44254b6ee8f4f2 SHA1 92dd136e0541f9b7fcd6b8f3b9d6141d73ddaab7 SHA256 54692cd675c252bd2ef63b160e2b5862a7efa20684b5f3fc87f46fdc733f7d55 +EBUILD gimp-2.6.11-r6.ebuild 4093 RMD160 ce29357b397594e15e688f0e435d513e953e4aa4 SHA1 681270b1ca32d0c7e5d143bbe3d9d046bf3b727a SHA256 afc3de862429bc9e2ff6b3da013decfff2e194578b887a679b4ce79b0d3e67ad EBUILD gimp-2.7.3-r1.ebuild 3532 RMD160 4ac837cbe5c19e197c86749a7a6755c4bb24fcf2 SHA1 cc3b7a196311d2abbd616c0be7b45ec207e8f0c0 SHA256 faa79ee28a87b6772f84a1579d7b0a85d7fbda416675f325784d9026c0c54b99 EBUILD gimp-2.7.3.ebuild 3230 RMD160 6b38a0a065ec8425f8a4f148091d9592654df883 SHA1 ac744bc74f5f667dde7f81b51c2119e417bf2f8c SHA256 7158983e329c36765e33024aef0559640ea49a9f1e6bcca25508129d7663a2e4 EBUILD gimp-9999.ebuild 3392 RMD160 308b6dcfc512a74997da17a398e6fe57e33203a9 SHA1 9634fc3c3885024e0d8a7838ed60439282a0bbfb SHA256 93845cca2a9da9be82bbd35a1bb629bc04fc52266fbebf192795cfecd093a81d -MISC ChangeLog 47475 RMD160 eff52df517deb22edc5e2abb3b6b49fd1e03ed71 SHA1 71f1cc457f5d7f1228f9f4e974f901f24b8e0690 SHA256 45e735f3aa849df80d812c744e60980b4f515d5bd0aa346fc6d9a74ff4f28fd6 -MISC metadata.xml 451 RMD160 c2366a451084b99caa969c8893e290131989f8b1 SHA1 12cf8d4d3369f89b059ba8866f1d95c3c5345a75 SHA256 7039e67746d36107db19e625b77e97b840877159dd5629c7f92010b3aa736396 +MISC ChangeLog 47624 RMD160 9b3fcd2e8b58d8d1da2f2b9897cf1e4ab08a6260 SHA1 5176cc81ab6e34f60aceeacc75bc001b98e3eba0 SHA256 3306ddc511b5c19122d0336edf3aa0e8165a588b64498589d579967834a06944 +MISC metadata.xml 462 RMD160 cb311ab74afc9d195f6842547963548d6b3ac7a1 SHA1 be380dc28cedfa1518ce53b29212e866ebbbe8eb SHA256 40de9a434ad047e58b38fe4fc1811234083396faa538d8667b9db9906189f873 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iEYEAREKAAYFAk6WHEgACgkQgAnW8HDreRZ+qgCfdvYz2VYtJhTa/R66B07XC6fd +nygAoIe0lXWdnjEVOjF47djyImlQTtcu +=T5e2 +-----END PGP SIGNATURE----- diff --git a/media-gfx/gimp/gimp-2.6.11-r6.ebuild b/media-gfx/gimp/gimp-2.6.11-r6.ebuild new file mode 100644 index 000000000000..d7df8fb50036 --- /dev/null +++ b/media-gfx/gimp/gimp-2.6.11-r6.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r6.ebuild,v 1.1 2011/10/12 23:01:17 jlec Exp $ + +EAPI="3" + +PYTHON_DEPEND="python? 2:2.5" + +inherit eutils gnome2 fdo-mime multilib python + +DESCRIPTION="GNU Image Manipulation Program" +HOMEPAGE="http://www.gimp.org/" +SRC_URI=" + http://dev.gentoo.org/~jlec/distfiles/${P}-underlinking.patch.xz + mirror://gimp/v2.6/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +IUSE="alsa aalib altivec curl dbus debug doc exif gnome jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf" + +RDEPEND=" + >=dev-libs/glib-2.18.1:2 + dev-libs/libxml2 + dev-libs/libxslt + >=media-libs/fontconfig-2.2.0 + >=media-libs/freetype-2.1.7 + >=media-libs/gegl-0.0.22 + >=x11-libs/gtk+-2.12.5:2 + x11-libs/libXpm + >=x11-libs/pango-1.18.0 + sys-libs/zlib + x11-misc/xdg-utils + x11-themes/hicolor-icon-theme + aalib? ( media-libs/aalib ) + alsa? ( media-libs/alsa-lib ) + curl? ( net-misc/curl ) + dbus? ( dev-libs/dbus-glib ) + exif? ( >=media-libs/libexif-0.6.15 ) + gnome? ( gnome-base/gvfs ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( =media-libs/lcms-1* ) + mng? ( media-libs/libmng ) + pdf? ( >=app-text/poppler-0.12.3-r3[cairo] ) + png? ( >=media-libs/libpng-1.2.2:0 ) + python? ( >=dev-python/pygtk-2.10.4:2 ) + svg? ( >=gnome-base/librsvg-2.8.0:2 ) + tiff? ( >=media-libs/tiff-3.5.7 ) + webkit? ( net-libs/webkit-gtk:2 ) + wmf? ( >=media-libs/libwmf-0.2.8 )" +DEPEND="${RDEPEND} + >=dev-util/intltool-0.40 + >=dev-util/pkgconfig-0.12.0 + >=sys-devel/gettext-0.17 + doc? ( >=dev-util/gtk-doc-1 )" + +DOCS="AUTHORS ChangeLog* HACKING NEWS README*" + +pkg_setup() { + G2CONF="--enable-default-binary \ + --with-x \ + $(use_with aalib aa) \ + $(use_with alsa) \ + $(use_enable altivec) \ + $(use_with curl libcurl) \ + $(use_with dbus) \ + --without-hal \ + $(use_with gnome gvfs) \ + --without-gnomevfs \ + $(use_with webkit) \ + $(use_with jpeg libjpeg) \ + $(use_with exif libexif) \ + $(use_with lcms) \ + $(use_enable mmx) \ + $(use_with mng libmng) \ + $(use_with pdf poppler) \ + $(use_with png libpng) \ + $(use_enable python) \ + $(use_enable smp mp) \ + $(use_enable sse) \ + $(use_with svg librsvg) \ + $(use_with tiff libtiff) \ + $(use_with wmf)" + + if use python; then + python_set_active_version 2 + python_pkg_setup + fi +} + +src_prepare() { + # security fixes from upstream, see + # https://bugzilla.gnome.org/show_bug.cgi?id=639203 + epatch "${FILESDIR}"/gimp-CVE-2010-4540-to-4543.diff + + # security fix from upstream, see + # https://bugs.gentoo.org/show_bug.cgi?id=379289 + epatch "${FILESDIR}"/${P}-cve-2011-2896.patch + + # fixes for libpng 1.5 (incomplete), see + # https://bugzilla.gnome.org/show_bug.cgi?id=640409 + epatch "${FILESDIR}"/gimp-libpng15-v2.diff + + # don't use empty, removed header + # https://bugs.gentoo.org/show_bug.cgi?id=377075 + epatch "${FILESDIR}"/gimp-curl-headers.diff + + # apply file-uri patch by upstream + # https://bugs.gentoo.org/show_bug.cgi?id=372941 + # https://bugzilla.gnome.org/show_bug.cgi?id=653980#c6 + epatch "${FILESDIR}"/${P}-file-uri.patch + + # fix compilation against poppler 0.17/0.18 + # https://bugs.gentoo.org/show_bug.cgi?id=384903 + epatch "${FILESDIR}"/${P}-poppler-0.17.patch + + # fix underlinking detected by usage of gold linker + # https://bugs.gentoo.org/show_bug.cgi?id=367605 + epatch "${WORKDIR}"/${P}-underlinking.patch + + echo '#!/bin/sh' > py-compile + gnome2_src_prepare +} + +src_install() { + gnome2_src_install + + if use python; then + python_convert_shebangs -r $(python_get_version) "${ED}" + python_need_rebuild + fi + + # Workaround for bug #321111 to give GIMP the least + # precedence on PDF documents by default + mv "${D}"/usr/share/applications/{,zzz-}gimp.desktop || die +} + +pkg_postinst() { + gnome2_pkg_postinst + + use python && python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \ + /usr/$(get_libdir)/gimp/2.0/plug-ins +} + +pkg_postrm() { + gnome2_pkg_postrm + + use python && python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \ + /usr/$(get_libdir)/gimp/2.0/plug-ins +} diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml index e9264cd7cfde..be291cf80dc5 100644 --- a/media-gfx/gimp/metadata.xml +++ b/media-gfx/gimp/metadata.xml @@ -1,19 +1,19 @@ - - hanno@gentoo.org - - - sping@gentoo.org - backup maintainer - - - + + hanno@gentoo.org + + + sping@gentoo.org + backup maintainer + + + Enable the webkit rendering engine - + Enable support for multiprocessors - + -- 2.26.2