Revision
89597
Author
dports@macports.org
Date
2012-02-03 12:25:37 -0800 (Fri, 03 Feb 2012)

Log Message

texlive-bin: relax luatex's runtime zlib version check so it doesn't
complain about (ABI-compatible) zlib revision changes

Modified Paths

Added Paths

Diff

Modified: trunk/dports/tex/texlive-bin/Portfile (89596 => 89597)


--- trunk/dports/tex/texlive-bin/Portfile	2012-02-03 20:02:45 UTC (rev 89596)
+++ trunk/dports/tex/texlive-bin/Portfile	2012-02-03 20:25:37 UTC (rev 89597)
@@ -6,7 +6,7 @@
 
 name            texlive-bin
 version         2011
-revision        3
+revision        4
 
 categories      tex
 maintainers     dports
@@ -70,6 +70,10 @@
 # fix for clang compatibility
 patchfiles-append   patch-texk_ps2pkm_type1.c.diff
 
+# make luatex less sensitive to zlib version changes
+# (cf. http://bugs.debian.org/581818)
+patchfiles-append   patch-texk_web2c_luatexdir_luazlib_lzlib.c.diff
+
 # patches related to changes in install paths
 patchfiles-append   patch-texk_kpathsea_Makefile.in.diff \
                     patch-texk_tetex_Makefile.in.diff \

Added: trunk/dports/tex/texlive-bin/files/patch-texk_web2c_luatexdir_luazlib_lzlib.c.diff (0 => 89597)


--- trunk/dports/tex/texlive-bin/files/patch-texk_web2c_luatexdir_luazlib_lzlib.c.diff	                        (rev 0)
+++ trunk/dports/tex/texlive-bin/files/patch-texk_web2c_luatexdir_luazlib_lzlib.c.diff	2012-02-03 20:25:37 UTC (rev 89597)
@@ -0,0 +1,11 @@
+--- texk/web2c/luatexdir/luazlib/lzlib.c.orig	2012-02-03 14:47:18.000000000 -0500
++++ texk/web2c/luatexdir/luazlib/lzlib.c	2012-02-03 14:49:12.000000000 -0500
+@@ -551,7 +551,7 @@
+ 
+     /* make sure header and library version are consistent */
+     const char* version = zlibVersion();
+-    if (strncmp(version, ZLIB_VERSION, 5))
++    if (strncmp(version, ZLIB_VERSION, 3))
+     {
+         lua_pushfstring(L, "zlib library version does not match - header: %s, library: %s", ZLIB_VERSION, version);
+         lua_error(L);