aboutsummaryrefslogtreecommitdiff
path: root/2019
diff options
context:
space:
mode:
authorMikle Kolyada <zlogene@gentoo.org>2019-12-31 11:34:06 +0300
committerMikle Kolyada <zlogene@gentoo.org>2019-12-31 11:34:06 +0300
commite13ed5af2a56bd24e7dd8d0732095f1f40586da7 (patch)
treed80aaea257f3cf164bb5702ca3c0b5ccd54aa3b7 /2019
parentremove incomplete poppler-0.84 patch (diff)
downloadtex-e13ed5af2a56bd24e7dd8d0732095f1f40586da7.tar.gz
tex-e13ed5af2a56bd24e7dd8d0732095f1f40586da7.tar.bz2
tex-e13ed5af2a56bd24e7dd8d0732095f1f40586da7.zip
redo poppler-0.84 compat patch
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
Diffstat (limited to '2019')
-rw-r--r--2019/patches/texlive-core-2019-poppler084.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/2019/patches/texlive-core-2019-poppler084.patch b/2019/patches/texlive-core-2019-poppler084.patch
new file mode 100644
index 0000000..02dc9e2
--- /dev/null
+++ b/2019/patches/texlive-core-2019-poppler084.patch
@@ -0,0 +1,43 @@
+From cf05aae9685e5c6a46b4313e7bfce49edc6f51f9 Mon Sep 17 00:00:00 2001
+From: Mikle Kolyada <zlogene@gentoo.org>
+Date: Tue, 31 Dec 2019 11:29:30 +0300
+Subject: [PATCH] poppler-0.84 compat
+
+Upstream report: https://tug.org/pipermail/tex-k/2019-December/003096.html
+
+Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
+---
+ texk/web2c/pdftexdir/utils.c | 1 -
+ texk/web2c/xetexdir/XeTeX_ext.c | 3 +++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/texk/web2c/pdftexdir/utils.c b/texk/web2c/pdftexdir/utils.c
+index c93a8781..6f866e76 100644
+--- a/texk/web2c/pdftexdir/utils.c
++++ b/texk/web2c/pdftexdir/utils.c
+@@ -33,7 +33,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
+ #include "ptexlib.h"
+ #include <png.h>
+ #ifdef POPPLER_VERSION
+-#include <poppler-config.h>
+ #define xpdfVersion POPPLER_VERSION
+ #define xpdfString "poppler"
+ #else
+diff --git a/texk/web2c/xetexdir/XeTeX_ext.c b/texk/web2c/xetexdir/XeTeX_ext.c
+index 4968ee41..0aee4ee3 100644
+--- a/texk/web2c/xetexdir/XeTeX_ext.c
++++ b/texk/web2c/xetexdir/XeTeX_ext.c
+@@ -38,7 +38,10 @@ authorization from the copyright holders.
+
+ #include <w2c/config.h>
+
++#ifndef POPPLER_VERSION
+ #include <poppler-config.h>
++#endif
++
+ #include <png.h>
+ #include <zlib.h>
+ #include <graphite2/Font.h>
+--
+2.24.1
+