media-gfx/gimp: Add uclibc compile fix (bug #477794)

Package-Manager: portage-2.1.12.5/cvs/Linux x86_64
Manifest-Sign-Key: 0x401A1600

4 files changed, 60 insertions, 19 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 21caf5c2d77a..cde7f143d50b 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.411 2013/09/14 10:55:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.412 2013/09/15 19:02:17 sping Exp $
+
+  15 Sep 2013; Sebastian Pipping <sping@gentoo.org> gimp-2.8.6.ebuild,
+  +files/gimp-2.8.6-uclibc.patch:
+  Add uclibc compile fix (bug #477794) straight to stable, seems adequate to me
 
   14 Sep 2013; Agostino Sarubbo <ago@gentoo.org> gimp-2.8.6.ebuild:
   Stable for alpha, wrt bug #481736
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index f6742d0f01a0..5bf130e0cdf0 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX gimp-2.6.11-cve-2011-2896.patch 1818 SHA256 6613af30b70afb984a89dc8fa75ca6ba3271471d7fd62de23a1a9fda2fd5ec89 SHA512 8626a3b02c5a4590ccb1cc108f82e4848eaf821fe2c7c60b0af092261c729d0d7377a26c2776035d1587d656ef3a9dc95ea6a3751ed3d93f13d020d99e85472a WHIRLPOOL 345244b10abb7171a007816a122a1b98e40cd1bc80a665bca7ea2e394397c86c2e8098148a53ba4c140868d510e01ab7ae6b0bde3298f69093dedee289d06e85
 AUX gimp-2.6.11-file-uri.patch 2209 SHA256 cb9da632417fcc866c047104cfbe25b5b9964fa5e65e333c042fdf23c19e692f SHA512 358ba3b79ed0b8ec4b5e113ec2b272ecc6bfa560c8b7349607ceef6c61742ef5f2241c70eda89f7f7233d908dbe9d184eadfa864005796a6f5e25812c3d6a047 WHIRLPOOL 8c02aff601df9e9caff28104ea059a8ba461c93a2cc1bb84c22b5fee8b06bcb57a0add6e15ad40f4538e8fdd249e768ebb33637208e5a37e12758a1d76903888
@@ -16,6 +16,7 @@ AUX gimp-2.7.5-configure-gs-bzip2.patch 2141 SHA256 009076fe1006a95da864dc285064
 AUX gimp-2.8.0-bzip2.patch 709 SHA256 2e1c9808aff951362790ef35ca37aee39346647e7d202197cd77ffd5b6c5db93 SHA512 6666fc20f021dadaaf2f20c2d96beb76fbdac605a7623c2996e7abd52a9075f3e1165acc05c02e075870f6d25fb737a12f336f7dcbad764b6615b95cc004f3df WHIRLPOOL 6e6e0532601385768d1d261cf0daab01234e872d96b3f97849de610b67815db21c09c6b7ea024fc4795a7ac9cd11fc1c15a61803d461ea64d6291babf87cb313
 AUX gimp-2.8.2-xwd-file-security.patch 6982 SHA256 34343fa9611c8e11661e92e9d36a9db54e284e248935964b7f2e3523522137fa SHA512 5c820e6f2e49d57cde6a47d8a5590734b2d463e2e2bccfe6dd21f884876eec52537f4761e21731b20c12be7fda9ec53353ec0f3ebc1e2e1c074612eaa3d1959f WHIRLPOOL c2b69105f515093374049fe252fed176b0f04fbe0069ac8c7a67261279d707acce15f37a34474121bedcfcfe549103eefd19cb3c05930e708b7b3797f45bce78
 AUX gimp-2.8.4-valid-desktop-file.patch 1573 SHA256 8e2e04d24a02d1288b2d7cc7638f9044197c6844b6c9ac8792e07a514ba52b8f SHA512 f85f8758ebb8c0365c7c613416b08158163c75e4aea552ac461195f6e66153360e3f96efb7260734137ffcb2bf7a97160449ce65ccc999f270b6fd2b30af3a3a WHIRLPOOL a772999769fd91b790b9cb457c66e5c0bd4fb24dfb92125d98db4155aedea0f3e9be37898752bc655f58310188604fc3f20ebcb62bb20cb3567f657c1b5e3e6d
+AUX gimp-2.8.6-uclibc.patch 1317 SHA256 09dcec105a741627c74214ea8dec1696f921be94d3b5492b417f9a68043979c7 SHA512 0e7da897f0d654d2be233880bc80c869f869698122db779bd23f7b995de53840553a3b877b50f0297e56fc8627888b98b3206c08c03a4d22e748feeabe92391a WHIRLPOOL 0e65f6b620c23b2ff2f9b13fd555fe3c070d73b50b3ba93c61446783861f2f0fd7ecdc2102887e9673077d691e9cfcf05bd848242565776931c7f5bff628396b
 AUX gimp-CVE-2010-4540-to-4543.diff 5678 SHA256 b1fb9d83959cfc8e7a1ebf5d8812454686d618463010bbc0e802a1476e58305f SHA512 b12b7f8dea5c8fc8f553a810751375ce6ec2f21b12be0ff975f01de1a8f7c27df4225f166f1f0efce659fedc636032c1726697b75340b02822b858c9fe19935a WHIRLPOOL 7d1a92eb6ef1a247d538e53b9f967bbfd09366819bc64343772720d8de01bc226035e598fdce8630fe16e642e126e8fc9f138de56166ffdad4f1345ec308389b
 AUX gimp-curl-headers.diff 358 SHA256 34c706af2ba690be90ef6d0f68fef552b90fdf3a6ff0290e7d5fc02024b76b6f SHA512 e3523be4a5eeb48e7941fe0ec1e261a3086c5a8d118565070555a62d42fcc4b4bf9fd70ac37419de843a5249870248e7268f900df7fcca490e7a7f8c805b1298 WHIRLPOOL 6b9effa0436ff885296bce5676651c6ae3238c92bd6c7cfcef419da21f710c23f73b67db6e3a1bfb84465bee2c8aefa1d8107c4b3c4621b114aac7cbe558d96b
 AUX gimp-libpng15-v2.diff 18466 SHA256 d3a4f0b365497adf1eaeaf6b4ecb5eff5517eb0ce4373ef15da0e4cece5703aa SHA512 6dc2867c98ffeb9dac8f43a7714fcc67ca6661b319f7b7e8eb4063fa82f859fe1c3434330964730c372011eb1bfb9133bbd816e1869bfc276712cb9b3afa3651 WHIRLPOOL 17e7dd03f4785bd5e6bfa01d6af02f0af88fb2d763c5046e0e6a4a3784e1d0bac7562bd33ffb745a9119ce860d4da5146d1ec3c763e613839bb2c222b64a6a5e
@@ -29,24 +30,14 @@ EBUILD gimp-2.6.12-r5.ebuild 4728 SHA256 8b54be2c26f65f310289a59ca001a50f63e98c3
 EBUILD gimp-2.8.2-r1.ebuild 4791 SHA256 1e573f079c860f1dec248adde5cd0239887cdc070719a00c1ce6004e0f3764ae SHA512 8c8edaf3420499e34720904907eaf32a190964150e7dc9d86c22a4c1225874644afd253111e0374f21fcb42836fb776e49814b9c000ea4c5d924b22ad972565e WHIRLPOOL 70b36e0a0c77c987968894e36396a2052349a1a94aae4ffb82debba1426e0927493bfc0bc2bf4b11da5b9f8bb1b03ad210243c6a22efd1109f6c7b0e2c7681c2
 EBUILD gimp-2.8.2.ebuild 4686 SHA256 02b92f7a88bdfb096e078b5b89e827ba9a0d295e26f62d61f6b3a6bf2061c6b1 SHA512 440346dfe1581481788553dc1ae44e96630a0272480c2e24148ceb03af2e91d5564f082d888f90fe9e9ba89b4be9ce13d53fa02dc9c698dfcfc1cc99eed8f5f3 WHIRLPOOL 5e323bbfcfad4140907796fbed8ef047930cb2f73b98d0dc126e3bedad4dc30f334f6f2663b7e8480b411804445c18ebe16dd01872014e65c70aaaf44cdeb948
 EBUILD gimp-2.8.4.ebuild 4783 SHA256 60755d6b50c8ef853daccfdfbc018db734bdcbb0c7eaed93400908f9e932a31a SHA512 9ec14a99ae69925169c42566fd906a881521f61bac88cd24e9c4959292688e98e919cfd205a7ea2670654654011517df3bc30de853100ff4e446f48bcd253de9 WHIRLPOOL 97a6b6268a03612cee998811a1924093a292a095e8afed4ee993674d19416ad14eb38ee5a2086b461d7dbe2de067fa0120f271b89616139192a063aa7176d2b5
-EBUILD gimp-2.8.6.ebuild 4810 SHA256 98cafeb0b1e0032e532cf18b26d0f444223e337035cfc39be86a43ff78a1c5a1 SHA512 09e8aa5cc1610bfc1393018ed447a58131374449674ac090f29c6764ffdc3fea5dd617d4db8cfab1a6c384d3665364f8ff20d0645a3efeaf8b672e72ba478021 WHIRLPOOL db5a9f6e4fe2ad1aaa78c63ea79f7aecf7b144bb2e2c8270afc4077fafd3990eb9543d370a2540c6b5896f9297613c9032b8815a559397bdc7e5a6d72dcd5495
+EBUILD gimp-2.8.6.ebuild 4866 SHA256 753a86065b1c696945ee6053c8d5604ab2b6b81794afe62562d114312deed6dd SHA512 f668367769a50ef0ddb916b336469edf4d1da99445d04c3ca90b7e03caf9ae161bc2298a82a95128b1b34ef0a5e200d9ef172a2bc5df32844958bb883eb6a27a WHIRLPOOL a6db15817566870752757eedca982482616a41cd2ce564da8319fe3ebf586748bb04b26c63828241b5fe03a1ed201996ae31327caadf933ede1841d1bb61ae0e
 EBUILD gimp-9999.ebuild 4003 SHA256 5186884e7125cfd226009ae2887ef8f68b02b4547373f17bb6f7dd20807eee3e SHA512 ceb5713ef7f3d7ca1f867171669253f5863e5710d928d2a63476655878eaab600915e1a783a85b0f560e844221e41dbabb6ac2b0667491e40b1f6da12b5cf432 WHIRLPOOL 004b5ae142a60d0022bcbc2a44423682662e2cc6759218e96e95b5692b18914b4521f3ce10b5a343ca9cd99830f428f5aca378b8cbdb7a6efb36f53af73dcd08
-MISC ChangeLog 58604 SHA256 f8ba6af530aaf6b8678631400547abd6881935108eb6c9b33afe72aa6798b169 SHA512 a0d06a7c50c6639f7b8de9232a4ebc7cb30b933f8ae08884410e65cab627569b7aaaf24a83cd6df493e49e786733273d0137f97f3458107bea461665abb100ab WHIRLPOOL 15a5d1b2cf40ce128dff11a93eb95b80ce8dac7f99cffb9bb41f6ceb6004bed4c5cd95b535929b84b8757debad0b5439883ddb943bc19305e5341c72315bd82f
+MISC ChangeLog 58792 SHA256 38255f11ac942c4b7a71d610eb11cb9185b0b47da7ff6170349aaaec23be91ed SHA512 f535fd3f4c9f18dc402f1605ef3d26e0180124a3891ff8100a23d68497bee219939fc57918ece5a5ce6ac02626a31104a2cdddcbac14cd315f5684fcee765484 WHIRLPOOL 0a3b5ede5bfa97957d58f05ab1607aefcf0fe84f71b3bf589d37a38d3c121e43a09dc77f94623648d6e43aef6f4a0850dee7ca1431d83c3e7bfae50b8952acc5
 MISC metadata.xml 285 SHA256 77c9767711868abab1e559504dd88eb8aef8cf395629d8ec8c7a5fdb3d29397e SHA512 0b1abe9749d79ed8644c2a34312ab70cff232e08f64c1a914185cbafe8c754e9c6442eac1e3a1c449057e52b076333b70ea8be7418570bfcbee69f69d455079e WHIRLPOOL 9f2199f149dd49efce83f4710f026fc235a9aed38b7c7e0ffbb5480ef6865dee6ac555178bb92a819071d016fb0ead581765697cc3035b829ed96126bc7e6053
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSND/IAAoJELp701BxlEWffG4P/A5mfEopRHiGMvz8D0OieTNY
-187fG5Ni1zHG6FyM9+836VF8TO3lV8s0Z8zPrtAeP0Mt5hAeO/gV3/rNSqeBoQAv
-5XO7d2Y6OdVhzIkQsZVZOWv2L0JVQaoCnMC1/p1cYJHMUqRuW7EL9JPgDDU6Unrk
-BkAZTyaxG47mCwXeGVSFYjcv3bKRfojdzWxAOjKEfRIG4OYbrOTr2HX5yZVtUWYZ
-UIadzZTMDJ4dZNjC96J0/ZZ9rAeI4+bBlPhgly39Jlt+HOnZfeFcXhktaLEJWg7d
-9xMMXarAcvqC0uZrAH6QyXlOXYLOeFzKEngHyqmUEye6r4LDpEzSCA4Ax7320TlN
-5iaS/yI+may3Mp2mizASdp5DifytSf46BZWaFg1AgIaAHYsvtITD3oZs7FvnWrN6
-gxGJQRVBYFfIRdMbLoXewtiEaFhOiI3+5XsEJ1ACKEeXWVdftkpQGo+XxojPb9fy
-zmxfWph9OuEezZtP3Dgzgk+5KVSAZFZ6ZCvWtsTrkv8wDBX1aaPBulHsNqZDIARj
-V5c9o4uM/uGxkqEVJKVGmmQQhHSv/aoRnr95myonr7lLg11evcIN7flTzsG5sGtK
-y91EGauftSW8OEz4eKkIPPWbF+xWLBV4n2V0xZVqZWf/daUmj8RQ13u5NSOVN2qR
-WtNkAaAttY0uE+VCo1hn
-=3twe
+iEYEAREIAAYFAlI2BF0ACgkQsAvGakAaFgDdkACcD4VC/lMfM7MULqtSF86PhHeA
+80MAn3zDLmi2lIjXgeh9EqMTAyd4x9Ld
+=5FLy
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/files/gimp-2.8.6-uclibc.patch b/media-gfx/gimp/files/gimp-2.8.6-uclibc.patch
new file mode 100644
index 000000000000..855e9872f4b4
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.8.6-uclibc.patch
@@ -0,0 +1,45 @@
+From 4fb7a436bca3e11abfda8bc23818af0f09714b9d Mon Sep 17 00:00:00 2001
+From: Michael Natterer <mitch@gimp.org>
+Date: Fri, 02 Aug 2013 14:50:00 +0000
+Subject: Bug 704980 - uclibc - base-utils.c: execinfo.h: No such file or directory
+
+Apply patch from Amadeusz Slawinski that checks for execinfo.h and
+builds the code that needs it conditionally.
+---
+diff --git a/app/base/base-utils.c b/app/base/base-utils.c
+index 757f58d..44a9e89 100644
+--- a/app/base/base-utils.c
++++ b/app/base/base-utils.c
+@@ -29,7 +29,7 @@
+ #include <process.h>
+ #endif
+ 
+-#ifdef G_OS_UNIX
++#if defined(G_OS_UNIX) && defined(HAVE_EXECINFO_H)
+ /* For get_backtrace() */
+ #include <stdlib.h>
+ #include <string.h>
+@@ -112,7 +112,7 @@ get_physical_memory_size (void)
+ char *
+ get_backtrace (void)
+ {
+-#ifdef G_OS_UNIX
++#if defined(G_OS_UNIX) && defined(HAVE_EXECINFO_H)
+   void     *functions[MAX_FUNC];
+   char    **function_names;
+   int       n_functions;
+diff --git a/configure.ac b/configure.ac
+index 0bbcbc7..15c7cc6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -416,7 +416,7 @@ AC_HEADER_STDC
+ AC_HEADER_SYS_WAIT
+ AC_HEADER_TIME
+ 
+-AC_CHECK_HEADERS(sys/param.h sys/time.h sys/times.h sys/wait.h unistd.h)
++AC_CHECK_HEADERS(execinfo.h sys/param.h sys/time.h sys/times.h sys/wait.h unistd.h)
+ 
+ AC_TYPE_PID_T
+ AC_FUNC_VPRINTF
+--
+cgit v0.9.2
diff --git a/media-gfx/gimp/gimp-2.8.6.ebuild b/media-gfx/gimp/gimp-2.8.6.ebuild
index 8b0378fa44c4..23e234b3019c 100644
--- a/media-gfx/gimp/gimp-2.8.6.ebuild
+++ b/media-gfx/gimp/gimp-2.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.6.ebuild,v 1.7 2013/09/14 10:55:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.6.ebuild,v 1.8 2013/09/15 19:02:17 sping Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -112,6 +112,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch  # bug 395695, comment 9 and 16
+	epatch "${FILESDIR}"/${P}-uclibc.patch  # bug 477794
 	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
 
 	echo '#!/bin/sh' > py-compile