summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2017-02-08 17:20:54 +0000
committerAlexis Ballier <aballier@gentoo.org>2017-02-08 17:20:54 +0000
commit7be2845c142b8d9b7fddfc3bd995be58128193d8 (patch)
treeb46034d0c59694378f24df6739aa22dea3835e75
parentsys-devel/gcc-5.4.0: Readd 71_all_gcc-5-march-native-pr67310.patch to 1.3 (diff)
downloadgentoo-7be2845c142b8d9b7fddfc3bd995be58128193d8.tar.gz
gentoo-7be2845c142b8d9b7fddfc3bd995be58128193d8.tar.bz2
gentoo-7be2845c142b8d9b7fddfc3bd995be58128193d8.zip
Add patch for bug #605766
-rw-r--r--src/patchsets/texlive/2016/texlive-core/050_all_latex2man_predictable_tmp.patch2
-rw-r--r--src/patchsets/texlive/2016/texlive-core/060_all_luatex_zlib.patch22
-rw-r--r--src/patchsets/texlive/2016/texlive-core/series1
3 files changed, 24 insertions, 1 deletions
diff --git a/src/patchsets/texlive/2016/texlive-core/050_all_latex2man_predictable_tmp.patch b/src/patchsets/texlive/2016/texlive-core/050_all_latex2man_predictable_tmp.patch
index b7c9f9622e..3ada500e2d 100644
--- a/src/patchsets/texlive/2016/texlive-core/050_all_latex2man_predictable_tmp.patch
+++ b/src/patchsets/texlive/2016/texlive-core/050_all_latex2man_predictable_tmp.patch
@@ -8,7 +8,7 @@ Index: texlive-20160523-source/texmf-dist/scripts/latex2man/latex2man
+++ texlive-20160523-source/texmf-dist/scripts/latex2man/latex2man
@@ -29,8 +29,6 @@ sub date2str;
$VERSION = "1.24";
- $DATE = date2str ('$Date: 2017/01/20 13:36:23 $' =~ m|(\d+/\d+/\d+)|);
+ $DATE = date2str ('$Date: 2017/02/08 17:20:54 $' =~ m|(\d+/\d+/\d+)|);
-$tmp = "/tmp/$CMD.$$";
-
diff --git a/src/patchsets/texlive/2016/texlive-core/060_all_luatex_zlib.patch b/src/patchsets/texlive/2016/texlive-core/060_all_luatex_zlib.patch
new file mode 100644
index 0000000000..d8c488dc0c
--- /dev/null
+++ b/src/patchsets/texlive/2016/texlive-core/060_all_luatex_zlib.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/show_bug.cgi?id=310487
+https://bugs.gentoo.org/show_bug.cgi?id=605766
+
+Index: texlive-20160523-source/texk/web2c/luatexdir/luazlib/lzlib.c
+===================================================================
+--- texlive-20160523-source.orig/texk/web2c/luatexdir/luazlib/lzlib.c
++++ texlive-20160523-source/texk/web2c/luatexdir/luazlib/lzlib.c
+@@ -549,14 +549,6 @@ LUALIB_API int luaopen_zlib(lua_State *L
+
+ /* ====================================================================== */
+
+- /* make sure header and library version are consistent */
+- const char* version = zlibVersion();
+- if (strncmp(version, ZLIB_VERSION, 4))
+- {
+- lua_pushfstring(L, "zlib library version does not match - header: %s, library: %s", ZLIB_VERSION, version);
+- lua_error(L);
+- }
+-
+ /* create new metatable for zlib compression structures */
+ luaL_newmetatable(L, ZSTREAMMETA);
+ lua_pushliteral(L, "__index");
diff --git a/src/patchsets/texlive/2016/texlive-core/series b/src/patchsets/texlive/2016/texlive-core/series
index b5acfefe79..7d9ce22744 100644
--- a/src/patchsets/texlive/2016/texlive-core/series
+++ b/src/patchsets/texlive/2016/texlive-core/series
@@ -3,3 +3,4 @@
030_all_updmap_normalize.patch
040_all_remove_define_abs.patch
050_all_latex2man_predictable_tmp.patch
+060_all_luatex_zlib.patch