diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-12-31 02:09:11 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-12-31 02:09:11 +0800 |
| commit | 0536fe390597f2d682e14373777c2274581d9a21 (patch) | |
| tree | 6e540faebcb5f4dbaca3ec6a56e581d6969121e4 | |
| parent | f29c8aa1144b426378bcc6d9d29942a92e450d23 (diff) | |
| download | marcuscom-ports-0536fe390597f2d682e14373777c2274581d9a21.tar marcuscom-ports-0536fe390597f2d682e14373777c2274581d9a21.tar.gz marcuscom-ports-0536fe390597f2d682e14373777c2274581d9a21.tar.bz2 marcuscom-ports-0536fe390597f2d682e14373777c2274581d9a21.tar.lz marcuscom-ports-0536fe390597f2d682e14373777c2274581d9a21.tar.xz marcuscom-ports-0536fe390597f2d682e14373777c2274581d9a21.tar.zst marcuscom-ports-0536fe390597f2d682e14373777c2274581d9a21.zip | |
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
| -rw-r--r-- | graphics/gimp-app/Makefile | 8 | ||||
| -rw-r--r-- | graphics/gimp-app/files/patch-app_base_base-utils.c | 20 |
2 files changed, 25 insertions, 3 deletions
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; |