From 0536fe390597f2d682e14373777c2274581d9a21 Mon Sep 17 00:00:00 2001
From: mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Sun, 30 Dec 2012 18:09:11 +0000
Subject: get_backtrace() is unused within gimp. While I am here, sync with
 FreeBSD ports tree.

PR:		ports/169650
Submitted by:	Jan Beich <jbeich@tormail.org>


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17182 df743ca5-7f9a-e211-a948-0013205c9059
---
 graphics/gimp-app/Makefile                          |  8 +++++---
 graphics/gimp-app/files/patch-app_base_base-utils.c | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 graphics/gimp-app/files/patch-app_base_base-utils.c

diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 17bd1ed23..1b351483c 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,7 +3,7 @@
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/gimp-app/Makefile,v 1.63 2012/09/03 16:30:19 mezz Exp $
+#   $MCom: ports/graphics/gimp-app/Makefile,v 1.64 2012/11/26 13:31:16 kwm Exp $
 #
 
 PORTNAME=	gimp-app
@@ -33,7 +33,7 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		tiff:${PORTSDIR}/graphics/tiff \
 		lcms:${PORTSDIR}/graphics/lcms \
 		gegl-0.2:${PORTSDIR}/graphics/gegl \
-		babl-0:${PORTSDIR}/x11/babl
+		babl-0.1:${PORTSDIR}/x11/babl
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 
 USE_BZIP2=	yes
@@ -199,7 +199,9 @@ post-patch:
 		s|%%GIMP_THUMB_LIBS%%|${GIMP_THUMB_LIBS}|; \
 		s|%%GIMP_UI_LIBS%%|${GIMP_UI_LIBS}|' \
 			${WRKSRC}/plug-ins/pygimp/Makefile.in
-	@${REINPLACE_CMD} -e 's|"libpng"|"libpng14"|' \
+	@${REINPLACE_CMD} -e 's/-u /-Wl,-u,/' \
+		${WRKSRC}/app/Makefile.in
+	@${REINPLACE_CMD} -e 's|"libpng"|"libpng15"|' \
 	    	-e 's|x86_64|amd64|g' \
 		${WRKSRC}/configure
 
diff --git a/graphics/gimp-app/files/patch-app_base_base-utils.c b/graphics/gimp-app/files/patch-app_base_base-utils.c
new file mode 100644
index 000000000..7cf17b3d7
--- /dev/null
+++ b/graphics/gimp-app/files/patch-app_base_base-utils.c
@@ -0,0 +1,20 @@
+--- app/base/base-utils.c~
++++ app/base/base-utils.c
+@@ -29,7 +29,7 @@
+ #include <process.h>
+ #endif
+ 
+-#ifdef G_OS_UNIX
++#ifdef __GLIBC__
+ /* 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
++#ifdef __GLIBC__
+   void     *functions[MAX_FUNC];
+   char    **function_names;
+   int       n_functions;
-- 
cgit v1.2.3