| 1 |
commit: 64fd416a0b3452d063025f7f65063eef17d8120c |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Mar 8 10:10:18 2020 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 8 10:10:18 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/tex.git/commit/?id=64fd416a |
| 7 |
|
| 8 |
fix poppler-0.86 compat with XeTeX |
| 9 |
|
| 10 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 11 |
|
| 12 |
2019/patches/texlive-core-2019-poppler086.patch | 40 +++++++++++++++++-------- |
| 13 |
1 file changed, 28 insertions(+), 12 deletions(-) |
| 14 |
|
| 15 |
diff --git a/2019/patches/texlive-core-2019-poppler086.patch b/2019/patches/texlive-core-2019-poppler086.patch |
| 16 |
index 4ab4f95..8109222 100644 |
| 17 |
--- a/2019/patches/texlive-core-2019-poppler086.patch |
| 18 |
+++ b/2019/patches/texlive-core-2019-poppler086.patch |
| 19 |
@@ -1,17 +1,18 @@ |
| 20 |
-From 1203f6d9d51d6bedf11e36509f3a56638b1c816e Mon Sep 17 00:00:00 2001 |
| 21 |
+From 15e3bef2a1ec72007706705a31d9bd4c8eae53b1 Mon Sep 17 00:00:00 2001 |
| 22 |
From: Mikle Kolyada <zlogene@g.o> |
| 23 |
-Date: Fri, 6 Mar 2020 13:31:24 +0000 |
| 24 |
+Date: Sun, 8 Mar 2020 10:05:15 +0000 |
| 25 |
Subject: [PATCH] poppler-0.86 compat |
| 26 |
|
| 27 |
Signed-off-by: Mikle Kolyada <zlogene@g.o> |
| 28 |
--- |
| 29 |
- pdftoepdf.cc | 308 ++++++++++++++++++++++++++------------------------- |
| 30 |
- pdftosrc.cc | 76 ++++++------- |
| 31 |
- utils.c | 1 - |
| 32 |
- 3 files changed, 192 insertions(+), 193 deletions(-) |
| 33 |
+ texk/web2c/pdftexdir/pdftoepdf.cc | 308 +++++++++++++++--------------- |
| 34 |
+ texk/web2c/pdftexdir/pdftosrc.cc | 76 ++++---- |
| 35 |
+ texk/web2c/pdftexdir/utils.c | 1 - |
| 36 |
+ texk/web2c/xetexdir/XeTeX_ext.c | 3 + |
| 37 |
+ 4 files changed, 195 insertions(+), 193 deletions(-) |
| 38 |
|
| 39 |
-diff --git a/pdftoepdf.cc b/pdftoepdf.cc |
| 40 |
-index 4db0c90..d13293e 100644 |
| 41 |
+diff --git a/texk/web2c/pdftexdir/pdftoepdf.cc b/texk/web2c/pdftexdir/pdftoepdf.cc |
| 42 |
+index 4db0c90a..d13293e9 100644 |
| 43 |
--- a/texk/web2c/pdftexdir/pdftoepdf.cc |
| 44 |
+++ b/texk/web2c/pdftexdir/pdftoepdf.cc |
| 45 |
@@ -1,5 +1,5 @@ |
| 46 |
@@ -629,8 +630,8 @@ index 4db0c90..d13293e 100644 |
| 47 |
- delete globalParams; |
| 48 |
} |
| 49 |
} |
| 50 |
-diff --git a/pdftosrc.cc b/pdftosrc.cc |
| 51 |
-index 67be229..b6700fd 100644 |
| 52 |
+diff --git a/texk/web2c/pdftexdir/pdftosrc.cc b/texk/web2c/pdftexdir/pdftosrc.cc |
| 53 |
+index 67be229e..b6700fd6 100644 |
| 54 |
--- a/texk/web2c/pdftexdir/pdftosrc.cc |
| 55 |
+++ b/texk/web2c/pdftexdir/pdftosrc.cc |
| 56 |
@@ -16,6 +16,14 @@ GNU General Public License for more details. |
| 57 |
@@ -803,8 +804,8 @@ index 67be229..b6700fd 100644 |
| 58 |
delete doc; |
| 59 |
- delete globalParams; |
| 60 |
} |
| 61 |
-diff --git a/utils.c b/utils.c |
| 62 |
-index c93a878..6f866e7 100644 |
| 63 |
+diff --git a/texk/web2c/pdftexdir/utils.c b/texk/web2c/pdftexdir/utils.c |
| 64 |
+index c93a8781..6f866e76 100644 |
| 65 |
--- a/texk/web2c/pdftexdir/utils.c |
| 66 |
+++ b/texk/web2c/pdftexdir/utils.c |
| 67 |
@@ -33,7 +33,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>. |
| 68 |
@@ -815,6 +816,21 @@ index c93a878..6f866e7 100644 |
| 69 |
#define xpdfVersion POPPLER_VERSION |
| 70 |
#define xpdfString "poppler" |
| 71 |
#else |
| 72 |
+diff --git a/texk/web2c/xetexdir/XeTeX_ext.c b/texk/web2c/xetexdir/XeTeX_ext.c |
| 73 |
+index 4968ee41..0aee4ee3 100644 |
| 74 |
+--- a/texk/web2c/xetexdir/XeTeX_ext.c |
| 75 |
++++ b/texk/web2c/xetexdir/XeTeX_ext.c |
| 76 |
+@@ -38,7 +38,10 @@ authorization from the copyright holders. |
| 77 |
+ |
| 78 |
+ #include <w2c/config.h> |
| 79 |
+ |
| 80 |
++#ifndef POPPLER_VERSION |
| 81 |
+ #include <poppler-config.h> |
| 82 |
++#endif |
| 83 |
++ |
| 84 |
+ #include <png.h> |
| 85 |
+ #include <zlib.h> |
| 86 |
+ #include <graphite2/Font.h> |
| 87 |
-- |
| 88 |
2.24.1 |
Archives