pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/gimp Fix build on NetBSD-current. This is mor...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f267661f1217
branches:  trunk
changeset: 626401:f267661f1217
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Sun Nov 10 19:21:36 2013 +0000

description:
Fix build on NetBSD-current. This is more or less a hack; I have a
proper fix that ought to be sent upstream.

diffstat:

 graphics/gimp/distinfo         |   4 ++--
 graphics/gimp/patches/patch-ab |  22 +++++++++++++++++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diffs (55 lines):

diff -r 6305f6ba90de -r f267661f1217 graphics/gimp/distinfo
--- a/graphics/gimp/distinfo    Sun Nov 10 18:31:53 2013 +0000
+++ b/graphics/gimp/distinfo    Sun Nov 10 19:21:36 2013 +0000
@@ -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 -r 6305f6ba90de -r f267661f1217 graphics/gimp/patches/patch-ab
--- a/graphics/gimp/patches/patch-ab    Sun Nov 10 18:31:53 2013 +0000
+++ b/graphics/gimp/patches/patch-ab    Sun Nov 10 19:21:36 2013 +0000
@@ -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 @@
    { $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"



Home | Main Index | Thread Index | Old Index