media-gfx/gimp: Fix compilation (bug #395695)

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 118ead9ac8daaad7e02ee2629e7b53bd43d6574c..3665adba5b0f57359edd5ee1cdcceff9e982ddc6 100644 (file)
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.350 2012/01/01 15:36:55 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.351 2012/01/02 18:49:04 sping Exp $
+
+  02 Jan 2012; Sebastian Pipping <sping@gentoo.org> gimp-2.7.4.ebuild,
+  +files/gimp-2.7.4-no-deprecation.patch:
+  Fix compilation with non-dependency dev-libs/atk-1.32.0-r1. Thanks to
+  cyberbat for testing. (bug #395695)
 
 *gimp-2.7.4 (01 Jan 2012)
 

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 63515a0c8d2057dc13cad14ce95e708fd6787d19..5ff55fe938bd7f4394bc020504a53f8669b68698 100644 (file)
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -6,6 +6,7 @@ AUX gimp-2.6.11-file-uri.patch 2209 RMD160 17cd5c7b454e7f64f7ed50cec4d9fe160ce7f
 AUX gimp-2.6.11-poppler-0.17.patch 15620 RMD160 5f22b65bcadecbff1b67a42a6dd48fd167272bc9 SHA1 418cbe80cc5cd7f6476ce196c755344954df83e0 SHA256 69b214ff495c7cbc1f52c0c56fa9a09e4dfba47f54da8bb3c8b063b26b8d04bd
 AUX gimp-2.7.3-glib-2.29.patch 478 RMD160 24895c62b2ad03247a8bc47d79cd55059188b283 SHA1 c4b8719c7904f4b1349e40ca1e409367a9f5997a SHA256 76a2bac5fbcaacbef592e6c137e12b72320f38224c3c9a717b82f6c34404bbdc
 AUX gimp-2.7.3-libm.patch 995 RMD160 7db10366261d3b302cac3fda669d805fa3a9d09e SHA1 612e372060d37ea13939a92eff6b5383710f9b51 SHA256 cb49b9611aca4e0082cc2f3e0c334341df3ac41009fda41355bd8af77b8601ca
+AUX gimp-2.7.4-no-deprecation.patch 1061 RMD160 b49a7e6681238be6e21fe2f4d52bdc71d1e50ed9 SHA1 5757e2b04d4b2bc4b7edebfc8bc759104bbcfbf5 SHA256 fb9532406b62a6fa12f8598b142186fad1dc4e937328c8859cb4e8e76d2b19c7
 AUX gimp-CVE-2010-4540-to-4543.diff 5678 RMD160 0947a979ae64b2520967a6e8c3493aa37e425c3d SHA1 9b9cae60c775d4312552434373618c6cb9188e3e SHA256 b1fb9d83959cfc8e7a1ebf5d8812454686d618463010bbc0e802a1476e58305f
 AUX gimp-curl-headers.diff 358 RMD160 b3c5d4120a203280ae9625a11de0ff5d3330dbc3 SHA1 46f694eb7d01a9d952e5651bb8c2ec22c62ccbd4 SHA256 34c706af2ba690be90ef6d0f68fef552b90fdf3a6ff0290e7d5fc02024b76b6f
 AUX gimp-libpng15-v2.diff 18466 RMD160 fc9490eb1525841c19236b4141f9adbdd0c3a273 SHA1 6d0b91b0aa107cba7a0592d0d523a22a1a67b124 SHA256 d3a4f0b365497adf1eaeaf6b4ecb5eff5517eb0ce4373ef15da0e4cece5703aa
@@ -22,14 +23,14 @@ EBUILD gimp-2.6.11-r5.ebuild 3867 RMD160 b0eebc0e7b3cd9b8366ed2343b1e2465cd398f4
 EBUILD gimp-2.6.11-r6.ebuild 4095 RMD160 bbfbf61addd5cf33fb56e2107b62e0e06f5bb6b6 SHA1 b9a35f81feef39c4ecd8833348695c22d26fe7f8 SHA256 552e6b7d8a21e071a75bdf59e80d9b05270f87f8a3a32a3d08d2292cf3564d36
 EBUILD gimp-2.7.3-r1.ebuild 3626 RMD160 d074ad38f0044b1d3e405b4609c1df6fa33265f9 SHA1 855b6e26ec07ecbb04b7c2bd9407e8513222d2ba SHA256 aed8112ba79253851498cad67a25a3960fcef97ffafcc56f503a65130704850f
 EBUILD gimp-2.7.3.ebuild 3231 RMD160 23b84300a99be3edc52caf73e0a0704a97a485d3 SHA1 54577dd2fd1cbe58196750fab720bd3f7ab37394 SHA256 5788d4722d6e7f63a55d51a9c3fccc6392c5eaa19054c2121aecd8bcd5d99899
-EBUILD gimp-2.7.4.ebuild 3373 RMD160 bc8303b85555cf6b9b6b4eaad02a470eaa596127 SHA1 d450f560176f8e0c25cd9d9dfc69067219b66384 SHA256 ff5f3c533a5b1d2e5537edbbcbb9274d66b6dfb258c65bcbecd1538ed68ee953
+EBUILD gimp-2.7.4.ebuild 3626 RMD160 31d1d55354410e4a37fe801e8d319d7fedc767ac SHA1 a14d2c6307c3577f8ad233c290d1278f472e340e SHA256 29071e85d79fec518f4567357cdf4fbf02cef697e630d0038a522722f37102b7
 EBUILD gimp-9999.ebuild 3400 RMD160 daf3c36bea297dcbeb7f50284dd105b7ea7a118b SHA1 0da5a192f04ef994ac3d753e9c78656d3dd89ec6 SHA256 1f4fc471e2157ff7730e5e2ae9ba6f1c6a6f5feb2c751dac24634a538b0b320c
-MISC ChangeLog 48415 RMD160 84a06b0af973d1a71d8280f620ed9fa594cfe1dd SHA1 c5549d3065600b0306809276e5ae85cb1ca294a9 SHA256 73effba2535966595dc430d3ca32d3aa61856466dbf787208196ef8a8bd40c12
+MISC ChangeLog 48639 RMD160 1121bbe98a3ab8bbeb63a8c8a07e5e3aab590f18 SHA1 221b30070c3e86f89ce076dac1e29f4590f50bc7 SHA256 8ef0bd30900d982d1342c101b7877394f6d0e014149f9e565983468e4b551fb8
 MISC metadata.xml 462 RMD160 cb311ab74afc9d195f6842547963548d6b3ac7a1 SHA1 be380dc28cedfa1518ce53b29212e866ebbbe8eb SHA256 40de9a434ad047e58b38fe4fc1811234083396faa538d8667b9db9906189f873
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8AfYkACgkQsAvGakAaFgBrvwCgy8tmRKEr2cr1x976hTq28c5w
-/54AoMc87oxaRktQH0Cr8T+IFOrGBflq
-=BEcT
+iEYEARECAAYFAk8B/BIACgkQsAvGakAaFgAdpgCgkHTyTig6g2xus9g+lsfDgyJB
+u+MAnA5yh+4gRDd/g8xa9TIBzrwdztji
+=/3V4
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/gimp/files/gimp-2.7.4-no-deprecation.patch b/media-gfx/gimp/files/gimp-2.7.4-no-deprecation.patch
new file mode 100644 (file)
index 0000000..66bd93d
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.7.4-no-deprecation.patch
@@ -0,0 +1,36 @@
+--- configure.ac       2012-01-02 13:15:53.695067626 +0100
++++ configure.ac       2012-01-02 13:21:49.161623684 +0100
+@@ -1943,33 +1943,6 @@
+ AC_SUBST(MIME_TYPES)
+ 
+ 
+-#########################
+-# Disable deprecated APIs
+-#########################
+-
+-CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED -DBABL_DISABLE_DEPRECATED -DGSEAL_ENABLE"
+-
+-# Make sure not to disable deprecated APIs for unreleased versions.
+-# We must build without problems with future releases of libraries
+-# and disabling deprecated API risks breaking the build
+-
+-if test "x$have_glib_2_31" != "xyes"; then
+-  CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
+-fi
+-
+-if test "x$have_gtk_2_26" != "xyes"; then
+-  CPPFLAGS="${CPPFLAGS} -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+-fi
+-
+-if test "x$have_gdk_pixbuf_2_26" != "xyes"; then
+-  CPPFLAGS="${CPPFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED"
+-fi
+-
+-if test "x$have_pango_1_32" != "xyes"; then
+-  CPPFLAGS="${CPPFLAGS} -DPANGO_DISABLE_DEPRECATED"
+-fi
+-
+-
+ ############################
+ # Require multihead safe API
+ ############################

diff --git a/media-gfx/gimp/gimp-2.7.4.ebuild b/media-gfx/gimp/gimp-2.7.4.ebuild
index 49c2ebaeebbe1efc6dc13daa1b12e8f5c323d1bb..f5f4266755db75a960eff30153307883267d94c2 100644 (file)
--- a/media-gfx/gimp/gimp-2.7.4.ebuild
+++ b/media-gfx/gimp/gimp-2.7.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.7.4.ebuild,v 1.1 2012/01/01 15:36:55 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.7.4.ebuild,v 1.2 2012/01/02 18:49:04 sping Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit versionator gnome2 fdo-mime multilib python
+inherit versionator autotools eutils gnome2 fdo-mime multilib python
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="http://www.gimp.org/"
@@ -57,7 +57,8 @@ DEPEND="${RDEPEND}
        >=sys-devel/gettext-0.17
        doc? ( >=dev-util/gtk-doc-1 )
        >=sys-devel/libtool-2.2
-       >=sys-devel/automake-1.11"
+       >=sys-devel/automake-1.11
+       dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
 
 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
@@ -97,6 +98,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+       epatch "${FILESDIR}"/${P}-no-deprecation.patch  # bug 395695, comment 9 and 16
+       eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
+
        echo '#!/bin/sh' > py-compile
        gnome2_src_prepare
 }