Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/tex:master commit in: 2019/patches/
Date: Tue, 31 Dec 2019 08:34:56
Message-Id: 1577781246.e13ed5af2a56bd24e7dd8d0732095f1f40586da7.zlogene@gentoo
1 commit: e13ed5af2a56bd24e7dd8d0732095f1f40586da7
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 31 08:34:06 2019 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 31 08:34:06 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/tex.git/commit/?id=e13ed5af
7
8 redo poppler-0.84 compat patch
9
10 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
11
12 2019/patches/texlive-core-2019-poppler084.patch | 43 +++++++++++++++++++++++++
13 1 file changed, 43 insertions(+)
14
15 diff --git a/2019/patches/texlive-core-2019-poppler084.patch b/2019/patches/texlive-core-2019-poppler084.patch
16 new file mode 100644
17 index 0000000..02dc9e2
18 --- /dev/null
19 +++ b/2019/patches/texlive-core-2019-poppler084.patch
20 @@ -0,0 +1,43 @@
21 +From cf05aae9685e5c6a46b4313e7bfce49edc6f51f9 Mon Sep 17 00:00:00 2001
22 +From: Mikle Kolyada <zlogene@g.o>
23 +Date: Tue, 31 Dec 2019 11:29:30 +0300
24 +Subject: [PATCH] poppler-0.84 compat
25 +
26 +Upstream report: https://tug.org/pipermail/tex-k/2019-December/003096.html
27 +
28 +Signed-off-by: Mikle Kolyada <zlogene@g.o>
29 +---
30 + texk/web2c/pdftexdir/utils.c | 1 -
31 + texk/web2c/xetexdir/XeTeX_ext.c | 3 +++
32 + 2 files changed, 3 insertions(+), 1 deletion(-)
33 +
34 +diff --git a/texk/web2c/pdftexdir/utils.c b/texk/web2c/pdftexdir/utils.c
35 +index c93a8781..6f866e76 100644
36 +--- a/texk/web2c/pdftexdir/utils.c
37 ++++ b/texk/web2c/pdftexdir/utils.c
38 +@@ -33,7 +33,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
39 + #include "ptexlib.h"
40 + #include <png.h>
41 + #ifdef POPPLER_VERSION
42 +-#include <poppler-config.h>
43 + #define xpdfVersion POPPLER_VERSION
44 + #define xpdfString "poppler"
45 + #else
46 +diff --git a/texk/web2c/xetexdir/XeTeX_ext.c b/texk/web2c/xetexdir/XeTeX_ext.c
47 +index 4968ee41..0aee4ee3 100644
48 +--- a/texk/web2c/xetexdir/XeTeX_ext.c
49 ++++ b/texk/web2c/xetexdir/XeTeX_ext.c
50 +@@ -38,7 +38,10 @@ authorization from the copyright holders.
51 +
52 + #include <w2c/config.h>
53 +
54 ++#ifndef POPPLER_VERSION
55 + #include <poppler-config.h>
56 ++#endif
57 ++
58 + #include <png.h>
59 + #include <zlib.h>
60 + #include <graphite2/Font.h>
61 +--
62 +2.24.1
63 +