[113360] trunk/dports/graphics/tiff

[mojca at macports.org]

Revision: 113360
          https://trac.macports.org/changeset/113360
Author:   mojca at macports.org
Date:     2013-11-14 06:28:06 -0800 (Thu, 14 Nov 2013)
Log Message:
-----------
tiff: replace 'unsigned long' with 'uint64_t' for 64-bit integers to avoid compilation problems (#41280)

Modified Paths:
--------------
    trunk/dports/graphics/tiff/Portfile

Added Paths:
-----------
    trunk/dports/graphics/tiff/files/
    trunk/dports/graphics/tiff/files/patch-int64.diff

Modified: trunk/dports/graphics/tiff/Portfile
===================================================================
--- trunk/dports/graphics/tiff/Portfile	2013-11-14 14:20:01 UTC (rev 113359)
+++ trunk/dports/graphics/tiff/Portfile	2013-11-14 14:28:06 UTC (rev 113360)
@@ -7,7 +7,7 @@
 
 name                tiff
 version             4.0.3
-revision            1
+revision            2
 categories          graphics
 platforms           darwin
 license             BSD
@@ -48,6 +48,8 @@
 use_autoreconf      yes
 autoreconf.args     -fvi
 
+patchfiles          patch-int64.diff
+
 configure.args      --disable-jbig \
                     --with-docdir=${prefix}/share/doc/${name} \
                     --with-jpeg-include-dir=${prefix}/include \

Added: trunk/dports/graphics/tiff/files/patch-int64.diff
===================================================================
--- trunk/dports/graphics/tiff/files/patch-int64.diff	                        (rev 0)
+++ trunk/dports/graphics/tiff/files/patch-int64.diff	2013-11-14 14:28:06 UTC (rev 113360)
@@ -0,0 +1,67 @@
+http://trac.macports.org/ticket/41280
+http://bugzilla.maptools.org/show_bug.cgi?id=2464
+
+This is patch that tries to fix the most urgest problem of incompatible 64-bit integer types with minimal possible changes.
+Ideally the problem should be fixed upstream in a proper way with more radical changes.
+
+--- configure.orig
++++ configure
+@@ -17042,7 +17042,7 @@ fi
+ $as_echo "$INT64_T" >&6; }
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define TIFF_INT64_T $INT64_T
++#define TIFF_INT64_T int64_t
+ _ACEOF
+ 
+ 
+@@ -17076,7 +17076,7 @@ fi
+ $as_echo "$UINT64_T" >&6; }
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define TIFF_UINT64_T $UINT64_T
++#define TIFF_UINT64_T uint64_t
+ _ACEOF
+ 
+ 
+--- configure.ac.orig
++++ configure.ac
+@@ -290,7 +290,7 @@ fi
+ 
+ 
+ AC_MSG_RESULT($INT64_T)
+-AC_DEFINE_UNQUOTED(TIFF_INT64_T,$INT64_T,[Signed 64-bit type])
++AC_DEFINE_UNQUOTED(TIFF_INT64_T,[int64_t],[Signed 64-bit type])
+ AC_DEFINE_UNQUOTED(TIFF_INT64_FORMAT,$INT64_FORMAT,[Signed 64-bit type formatter])
+ 
+ AC_MSG_CHECKING(for unsigned 64-bit type)
+@@ -314,7 +314,7 @@ then
+   esac
+ fi
+ AC_MSG_RESULT($UINT64_T)
+-AC_DEFINE_UNQUOTED(TIFF_UINT64_T,$UINT64_T,[Unsigned 64-bit type])
++AC_DEFINE_UNQUOTED(TIFF_UINT64_T,[uint64_t],[Unsigned 64-bit type])
+ AC_DEFINE_UNQUOTED(TIFF_UINT64_FORMAT,$UINT64_FORMAT,[Unsigned 64-bit type formatter])
+ 
+ # Determine TIFF equivalent of ssize_t
+--- libtiff/tif_config.h.in.orig
++++ libtiff/tif_config.h.in
+@@ -1,5 +1,7 @@
+ /* libtiff/tif_config.h.in.  Generated from configure.ac by autoheader.  */
+ 
++#include <stdint.h>
++
+ /* Define if building universal (internal helper macro) */
+ #undef AC_APPLE_UNIVERSAL_BUILD
+ 
+--- libtiff/tiffconf.h.in.orig
++++ libtiff/tiffconf.h.in
+@@ -7,6 +7,8 @@
+ #ifndef _TIFFCONF_
+ #define _TIFFCONF_
+ 
++#include <stdint.h>
++
+ /* Signed 16-bit type */
+ #undef TIFF_INT16_T
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131114/1b29db41/attachment-0001.html>