diff options
author | dholland <dholland@pkgsrc.org> | 2013-11-10 19:21:36 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2013-11-10 19:21:36 +0000 |
commit | 3d9e677acfd3912a6026a97160c637efe3a9e08e (patch) | |
tree | b0dfa97162aa0a9fa045f36ff8a9a82d7b525bc1 | |
parent | 5ef72c3f79b94524284efa4123cbb190d9f9c35c (diff) | |
download | pkgsrc-3d9e677acfd3912a6026a97160c637efe3a9e08e.tar.gz |
Fix build on NetBSD-current. This is more or less a hack; I have a
proper fix that ought to be sent upstream.
-rw-r--r-- | graphics/gimp/distinfo | 4 | ||||
-rw-r--r-- | graphics/gimp/patches/patch-ab | 22 |
2 files changed, 21 insertions, 5 deletions
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo index 39150fdb4dd..5e92253c9bb 100644 --- a/graphics/gimp/distinfo +++ b/graphics/gimp/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.76 2013/11/06 20:32:45 adam Exp $ +$NetBSD: distinfo,v 1.77 2013/11/10 19:21:36 dholland Exp $ SHA1 (gimp-2.8.8.tar.bz2) = a97b93d608a8b0cccd0d97da63bee48d40cc4b35 RMD160 (gimp-2.8.8.tar.bz2) = e8f06db6af449594fcee3ab1249ba59149c8509e Size (gimp-2.8.8.tar.bz2) = 20345808 bytes SHA1 (patch-aa) = bc998a9510458e1f296c44ae26c8ee3900ce49ab -SHA1 (patch-ab) = 4fb20b3f77349fb57eb06a2b67a8f0c045055213 +SHA1 (patch-ab) = f5f20a83fa274e396d76557d33821df14ef759b8 SHA1 (patch-ad) = 7863678d59ccf54e2ce61a4ac4b883fb9eb5fb82 SHA1 (patch-app_Makefile.in) = 1677fa436f76d0b83bf048447fc025584a255e68 SHA1 (patch-app_config_Makefile.in) = c5376f98649255b163cf9af448b5931d7675526c diff --git a/graphics/gimp/patches/patch-ab b/graphics/gimp/patches/patch-ab index f5a1584d732..f7c91ef0871 100644 --- a/graphics/gimp/patches/patch-ab +++ b/graphics/gimp/patches/patch-ab @@ -1,8 +1,24 @@ -$NetBSD: patch-ab,v 1.37 2013/11/06 20:32:45 adam Exp $ +$NetBSD: patch-ab,v 1.38 2013/11/10 19:21:36 dholland Exp $ + +- add -lexecinfo if libexecinfo exists (hack for NetBSD-current) +- ...? --- configure.orig 2013-11-03 17:00:19.000000000 +0000 +++ configure -@@ -19153,13 +19153,13 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>& +@@ -14135,7 +14135,11 @@ if eval test \"x\$"$as_ac_Header"\" = x" + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +- ++if [ $ac_header = execinfo.h ]; then ++ if [ -e /usr/lib/libexecinfo.a -o -e /usr/lib/libexecinfo.so ]; then ++ LIBS="$LIBS -lexecinfo" ++ fi ++fi + fi + + done +@@ -19153,13 +19157,13 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>& gimp_ok=yes fi rm -f conftest* @@ -17,7 +33,7 @@ $NetBSD: patch-ab,v 1.37 2013/11/06 20:32:45 adam Exp $ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gimp_ok" >&5 $as_echo "$gimp_ok" >&6; } if test "x$gimp_ok" = xno; then -@@ -23499,7 +23499,7 @@ fi +@@ -23499,7 +23503,7 @@ fi gimpdatadir="$datadir/$PACKAGE/2.0" gimpplugindir="$libdir/$PACKAGE/2.0" |