Add patch to fix compilation on Solaris and Darwin 8

Package-Manager: portage-2.2.01.16711-prefix/cvs/SunOS i386

4 files changed, 57 insertions, 15 deletions

diff --git a/media-libs/gegl/ChangeLog b/media-libs/gegl/ChangeLog
index e6143372ae2a..9e78aa7a9ead 100644
--- a/media-libs/gegl/ChangeLog
+++ b/media-libs/gegl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/gegl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.33 2010/08/22 05:36:39 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.34 2010/10/02 18:04:01 grobian Exp $
+
+  02 Oct 2010; Fabian Groffen <grobian@gentoo.org> gegl-0.1.2.ebuild,
+  +files/gegl-0.1.2-backtrace.patch:
+  Add patch to fix compilation on Solaris and Darwin 8
 
   22 Aug 2010; Ryan Hill <dirtyepic@gentoo.org> gegl-0.1.2.ebuild,
   +files/gegl-0.1.2-buffer-overflow.patch:
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 3cc866707375..4d8575aa884b 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gegl-0.0.18-newffmpeg.diff 889 RMD160 506707235c92c0d8c0177b46af534352b246cb89 SHA1 74efdb5af757f94c271bd8fa39d27b8f6a7016c7 SHA256 4456bd53335a382860413b4332ffa8e5b0dc7d8ff2d6ee9aa3b80758998b52d3
 AUX gegl-0.0.22-locale_h.diff 282 RMD160 e3b6efcd91de6da23442c5da5ae9eaec2ee079b5 SHA1 59d008f5b9b971d44b859927dbbe4adedbbe5104 SHA256 7cbd5937ceb20dacd5abd9bf0180422d95ae85bd79e71b6d639d4d5d7f6fa28d
 AUX gegl-0.1.0-GLIB_CFLAGS.patch 1640 RMD160 70db6199c464df0911490e44439dc2a774ff69b8 SHA1 979a612131b86a8bc49447b93af7bd68c1739ad1 SHA256 f53220f772e0ab58ebc18bd02621cfb7ea5c127685b27c371d44e99950b05ffc
+AUX gegl-0.1.2-backtrace.patch 1286 RMD160 bb4ad3406c0d1924fb6f25493bceb837abf5888c SHA1 1f14851dffdb8f4947fc6ffef353441dac77aa8d SHA256 fe76831350261a7480fd5cc947a2e3527aadb76a33bc4a4ecf20f2d9042e39fa
 AUX gegl-0.1.2-buffer-overflow.patch 515 RMD160 b6a7daac33f6f8e72bf6363ae1740eb248a4e8e8 SHA1 7129a6166428c33af82c3c180942143c67b09ed0 SHA256 0514ea14a59cb0068f661848af054d90f22caf9bbd0ed6bb24a62ebb53437ab2
 AUX gegl-18-configure-ac.patch 12354 RMD160 ae12c9c7dab1c6251ac29d53ad141d9416a51579 SHA1 a5de6e8660bbeac0c52e6a002898f1bb5a64df02 SHA256 892f152ecc22a3d306137f498e9a5ef38fe24414573cdae7bb17f3d5d21d1581
 AUX gegl-20-configure-ac.patch 13263 RMD160 df2f13719b23f45f04dcbce5a2e611f0b21636fb SHA1 67416e82775ac6cf30346128ba83af2420aa9280 SHA256 f27a68381a41f50125e1ec20efb5913feac0ea23dbeb565364a7feeeeb77d917
@@ -16,13 +14,6 @@ EBUILD gegl-0.0.20.ebuild 2842 RMD160 f6fb42329104fdd83aa4534831179414cfbb9caa S
 EBUILD gegl-0.0.22.ebuild 2435 RMD160 cde926b8543b4d8e5e7f72283aa9b4ff40488e96 SHA1 ae04a21923004130c83371c2e32e24888845b626 SHA256 54f970c1781fd4ec644350bb737724464cb138fd3d3d87b6cf9be507e7bebc90
 EBUILD gegl-0.1.0-r1.ebuild 1925 RMD160 a1743c47a92b86d9be0dbc41729817503b848a18 SHA1 fc841513aecc4a4d49877833ee47f67d4b9a844c SHA256 12b00cb2d2c3d09df1154a10bf6af52e037e9ac1737b86d69e8de86b3705452e
 EBUILD gegl-0.1.0.ebuild 1763 RMD160 d0c7e0be6fe3967bd5ac9c0b124a13853f75e090 SHA1 3bf87119bf89789f50ff7bebdf048e28134618a6 SHA256 b080500ac4d7bef61b2a3b753703f84b72a2f710b50bb8fac1667f1068bc5034
-EBUILD gegl-0.1.2.ebuild 1921 RMD160 48d9307ab8d7df34790351706adc7727442c6ce7 SHA1 16b4a1d3edaf706cdf9a7cc910bf511e641ca28d SHA256 ed46e1743749223ecf974c8483150c6210ae25f9f8c2b55fb73399663561b31c
-MISC ChangeLog 4404 RMD160 2877820b2966df3aa3e6b2752ea15f61f24b71e6 SHA1 4178d3b6693252cb17ea06ebcb180c155a1a1d8e SHA256 abb53d51e7f2572cf277c24197671aaf02f8c43fb54bceff269914731e3a91b6
+EBUILD gegl-0.1.2.ebuild 2083 RMD160 15f97b035781c4c78a8bfe0603704de296d088c8 SHA1 d78bd72d25a2d6754e6b9fdfd431b89b3a7269a1 SHA256 eafa472d8f074165b0f88174eb96c5a914ff9c6fdad1a8934255dfbe1b3d251d
+MISC ChangeLog 4565 RMD160 1bba8e93a5590457c37c338dc80226f28c06ebaa SHA1 9e12a8fc97a39678dbb2bdb588ad45c3fd72b3ef SHA256 91a68542eebe40efb1b0e2047dfd453645c2031b420749fb7d05fa8c8cb19f4f
 MISC metadata.xml 220 RMD160 a49072631c03f8ac3685b12169abeef3b34ad3d6 SHA1 9614887db749b0a3c17016da5b3ec0e42b908ad3 SHA256 c893488c84e6da8039f2b473982f03e934ec12f8fe2c1ace770f9e34969db081
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkxwuGQACgkQiqiDRvmkBmKSRwCgn0ktVm8KEjvT46aSa41BBbZa
-KWwAmwc0SRXHdXxjcwFiIJemOGXR5lXv
-=4a12
------END PGP SIGNATURE-----
diff --git a/media-libs/gegl/files/gegl-0.1.2-backtrace.patch b/media-libs/gegl/files/gegl-0.1.2-backtrace.patch
new file mode 100644
index 000000000000..2bf041fd111b
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.1.2-backtrace.patch
@@ -0,0 +1,43 @@
+Not all platforms have backtrace() facility, such as Darwin <=10.4 and
+Solaris.
+
+See also
+https://trac.macports.org/browser/trunk/dports/graphics/gegl/files/patch-gegl-buffer-gegl-buffer.c.diff?rev=71233
+
+This patch uses a configure check to disable it based on existance of
+execinfo.h instead of hardcoded knowledge about the target platforms.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=631183
+
+--- gegl-0.1.2/configure.ac
++++ gegl-0.1.2/configure.ac
+@@ -986,6 +986,7 @@
+ 
+ AM_CONDITIONAL(ENABLE_WORKSHOP, test "x$enable_workshop" = "xyes")
+ 
++AC_CHECK_HEADERS([execinfo.h])
+ 
+ dnl bin/node-editors/Makefile
+ AC_OUTPUT([
+--- gegl-0.1.2/gegl/buffer/gegl-buffer.c
++++ gegl-0.1.2/gegl/buffer/gegl-buffer.c
+@@ -80,7 +80,7 @@
+ /* #define GEGL_BUFFER_DEBUG_ALLOCATIONS to print allocation stack
+  * traces for leaked GeglBuffers using GNU C libs backtrace_symbols()
+  */
+-#ifndef G_OS_WIN32
++#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
+ #endif
+ 
+@@ -876,8 +876,8 @@
+ gegl_buffer_get_alloc_stack (void)
+ {
+   char  *result         = NULL;
+-#ifdef G_OS_WIN32
+-  result = g_strdup ("backtrack not available on win32\n");
++#ifndef HAVE_EXECINFO_H
++  result = g_strdup ("backtrack not available for this platform\n");
+ #else
+   void  *functions[MAX_N_FUNCTIONS];
+   int    n_functions    = 0;
diff --git a/media-libs/gegl/gegl-0.1.2.ebuild b/media-libs/gegl/gegl-0.1.2.ebuild
index 7238f5cd0561..c84606a4024f 100644
--- a/media-libs/gegl/gegl-0.1.2.ebuild
+++ b/media-libs/gegl/gegl-0.1.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.1.2.ebuild,v 1.4 2010/08/22 05:36:39 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.1.2.ebuild,v 1.5 2010/10/02 18:04:01 grobian Exp $
 
 EAPI="2"
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="A graph based image processing framework"
 HOMEPAGE="http://www.gegl.org/"
@@ -38,6 +38,10 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-buffer-overflow.patch
+	epatch "${FILESDIR}"/${P}-backtrace.patch
+	# fix OSX loadable module filename extension
+	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
+	eautoreconf
 }
 
 src_configure() {