summaryrefslogtreecommitdiff
path: root/graphics/tiff
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2015-08-27 19:16:53 +0000
committeradam <adam@pkgsrc.org>2015-08-27 19:16:53 +0000
commitd921252ce313856863de97d05177bda5e7685544 (patch)
tree2bafe5b5e89ed1a57d012768203136a095d5dbf5 /graphics/tiff
parentc2d87e23d8c9cccc154796e3876abebacde71614 (diff)
downloadpkgsrc-d921252ce313856863de97d05177bda5e7685544.tar.gz
Fix a conflict with Security.framework on OS X
Diffstat (limited to 'graphics/tiff')
-rw-r--r--graphics/tiff/distinfo3
-rw-r--r--graphics/tiff/patches/patch-configure30
2 files changed, 32 insertions, 1 deletions
diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo
index 073bb04c977..1cd1a779e1c 100644
--- a/graphics/tiff/distinfo
+++ b/graphics/tiff/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.64 2015/06/30 10:42:19 ryoon Exp $
+$NetBSD: distinfo,v 1.65 2015/08/27 19:16:53 adam Exp $
SHA1 (tiff-4.0.4.tar.gz) = 185f844babe4ee902b5e4775d9f65915fcbabd11
RMD160 (tiff-4.0.4.tar.gz) = 351a72505dce4a679df023b7f3870c389d7df4c7
Size (tiff-4.0.4.tar.gz) = 2100766 bytes
+SHA1 (patch-configure) = a0032133f06b6ac92bbf52349fabe83f74ea14a6
diff --git a/graphics/tiff/patches/patch-configure b/graphics/tiff/patches/patch-configure
new file mode 100644
index 00000000000..dd12a0ec6d4
--- /dev/null
+++ b/graphics/tiff/patches/patch-configure
@@ -0,0 +1,30 @@
+$NetBSD: patch-configure,v 1.4 2015/08/27 19:16:53 adam Exp $
+
+To avoid conflict with Security.framework on OS X, prefer unsigned long long as 64-bit type.
+
+--- configure.orig 2015-08-24 22:13:55.000000000 +0000
++++ configure
+@@ -17750,11 +17750,7 @@ _ACEOF
+ $as_echo_n "checking for unsigned 64-bit type... " >&6; }
+ UINT64_T='none'
+ UINT64_FORMAT='none'
+-if test $ac_cv_sizeof_unsigned_long -eq 8
+-then
+- UINT64_T='unsigned long'
+- UINT64_FORMAT='"%lu"'
+-elif test $ac_cv_sizeof_unsigned_long_long -eq 8
++if test $ac_cv_sizeof_unsigned_long_long -eq 8
+ then
+ UINT64_T='unsigned long long'
+ case "${host_os}" in
+@@ -17766,6 +17762,10 @@ then
+ UINT64_FORMAT='"%llu"'
+ ;;
+ esac
++elif test $ac_cv_sizeof_unsigned_long -eq 8
++then
++ UINT64_T='unsigned long'
++ UINT64_FORMAT='"%lu"'
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINT64_T" >&5
+ $as_echo "$UINT64_T" >&6; }