1 |
commit: a790d0f672d6f7f2e2afc0ec6c0f69fe77b86644 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 8 22:45:17 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 8 22:56:15 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a790d0f6 |
7 |
|
8 |
app-text/texlive-core: Fix build w/ poppler-0.75 and poppler-0.76 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/681338 |
11 |
Closes: https://bugs.gentoo.org/685284 |
12 |
Thanks-to: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail.com> |
13 |
Package-Manager: Portage-2.3.66, Repoman-2.3.12 |
14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
15 |
|
16 |
app-text/texlive-core/Manifest | 1 + |
17 |
.../files/texlive-core-2017-poppler064.patch | 118 --------- |
18 |
.../files/texlive-core-2017-poppler069.patch | 216 ---------------- |
19 |
.../files/texlive-core-2017-poppler071.patch | 281 --------------------- |
20 |
.../files/texlive-core-2017-poppler072.patch | 157 ------------ |
21 |
.../files/texlive-core-2017-poppler073.patch | 74 ------ |
22 |
app-text/texlive-core/texlive-core-2017-r4.ebuild | 11 +- |
23 |
7 files changed, 10 insertions(+), 848 deletions(-) |
24 |
|
25 |
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest |
26 |
index 47e26302447..5e327cf3ac1 100644 |
27 |
--- a/app-text/texlive-core/Manifest |
28 |
+++ b/app-text/texlive-core/Manifest |
29 |
@@ -1,5 +1,6 @@ |
30 |
DIST texlive-20170524-source-freetype.patch.xz 625056 BLAKE2B 70bcd15da1edfe5422f6dc0e736bc842f93787d45a81f823c8ddc5a420eff65f176ccce20cb17ac1dbc3b4eef3081de7dfbe34eb390f1baaa925e17f3d55c6c1 SHA512 daa0ff9306b39e6d5058c53572fdc741adad17cec9a874785005aacd0e57b75ce59f21d0d12260f4178d47b7b0e6509e49c44e2ab524613fe962ac1199a9120b |
31 |
DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa |
32 |
+DIST texlive-core-2017-poppler076.tar.xz 9232 BLAKE2B 945e4f8e6f3230b78dc43560c664fbe4989fb32759b41c0ef83d656b43b008030cebdbf668718c4f22831d01c3fe1466f686f7f6b76183d3d1bb5e760f17140d SHA512 63fb2b426921be5f6d310b31e7fea6fc0edc0900f4790445fcaface9c931ca6c3e8f98b81a3bccfd1c877750e854c9410a59ff9a124aa2826d7b4187d54ed8ab |
33 |
DIST texlive-core-patches-70.tar.xz 13068 BLAKE2B 011cf51af10d28ac9df7c9b9d7aea2cac3e562d393dcf09d57b3c2832fe6816cf926458417577f7c9d9414639a291c09240444145bdbb3d132170f51a8a16980 SHA512 fd26b92a03cd0446007728d0c16a8c7301e254515b997e6a0bd9b325db162bf3f2a2e96be0cb185f042038205c4b4dacf1785a216c8326328682f1c42da9079e |
34 |
DIST texlive-module-a2ping-2017.tar.xz 31136 BLAKE2B cc0d99992cb780711a2a423fa26135845fa1f2cbbac76485d64a0b3184e338e7a60cdcfeaca129e6251f72110b0069c32164f9c4904d7f7c9c2edc6306f50411 SHA512 4711f184222fd95498a6d3ee94db19209c7836e6b775303926766d97921f2e8324b0aa2252a958fb619dbeca50729d2be4851a2add5503e7e8f4e713fc993e41 |
35 |
DIST texlive-module-a2ping.doc-2017.tar.xz 17524 BLAKE2B dea1db9fb3650c56161190823e4015d3e6399be3612f7e54702264a5187e72c7be987abb2cf8465d82711c9894d604fa03d79dc770bbf93b3404f18a633fbfa0 SHA512 8cfcc3b2a5dc462895a2bbd82f3a21537ae5d3fe81217b0b664b2008d6d18259f18de10e6eb3e3ac2655f96067b0f9bc6e30f69d068d9335598eb0b075eb4cea |
36 |
|
37 |
diff --git a/app-text/texlive-core/files/texlive-core-2017-poppler064.patch b/app-text/texlive-core/files/texlive-core-2017-poppler064.patch |
38 |
deleted file mode 100644 |
39 |
index 9e4c7044975..00000000000 |
40 |
--- a/app-text/texlive-core/files/texlive-core-2017-poppler064.patch |
41 |
+++ /dev/null |
42 |
@@ -1,118 +0,0 @@ |
43 |
-Source: https://github.com/TeX-Live/texlive-source/commit/ea9e7b25c6566505fe6d994aa5263bd736593be1 |
44 |
-Backport: dilfridge@g.o |
45 |
- |
46 |
-diff -ruN texlive-20170524-source.orig/texk/web2c/luatexdir/image/pdftoepdf.w texlive-20170524-source/texk/web2c/luatexdir/image/pdftoepdf.w |
47 |
---- texlive-20170524-source.orig/texk/web2c/luatexdir/image/pdftoepdf.w 2018-05-20 22:11:35.787633516 +0200 |
48 |
-+++ texlive-20170524-source/texk/web2c/luatexdir/image/pdftoepdf.w 2018-05-20 22:12:26.607265149 +0200 |
49 |
-@@ -472,10 +472,10 @@ |
50 |
- break; |
51 |
- */ |
52 |
- case objString: |
53 |
-- copyString(pdf, obj->getString()); |
54 |
-+ copyString(pdf, (GooString *)obj->getString()); |
55 |
- break; |
56 |
- case objName: |
57 |
-- copyName(pdf, obj->getName()); |
58 |
-+ copyName(pdf, (char *)obj->getName()); |
59 |
- break; |
60 |
- case objNull: |
61 |
- pdf_add_null(pdf); |
62 |
-diff -ruN texlive-20170524-source.orig/texk/web2c/luatexdir/lua/lepdflib.cc texlive-20170524-source/texk/web2c/luatexdir/lua/lepdflib.cc |
63 |
---- texlive-20170524-source.orig/texk/web2c/luatexdir/lua/lepdflib.cc 2018-05-20 22:11:35.788633528 +0200 |
64 |
-+++ texlive-20170524-source/texk/web2c/luatexdir/lua/lepdflib.cc 2018-05-20 22:12:26.608265161 +0200 |
65 |
-@@ -521,7 +521,7 @@ |
66 |
- uin = (udstruct *) luaL_checkudata(L, 1, M_##in); \ |
67 |
- if (uin->pd != NULL && uin->pd->pc != uin->pc) \ |
68 |
- pdfdoc_changed_error(L); \ |
69 |
-- gs = ((in *) uin->d)->function(); \ |
70 |
-+ gs = (GooString *)((in *) uin->d)->function(); \ |
71 |
- if (gs != NULL) \ |
72 |
- lua_pushlstring(L, gs->getCString(), gs->getLength()); \ |
73 |
- else \ |
74 |
-@@ -1656,7 +1656,7 @@ |
75 |
- if (uin->pd != NULL && uin->pd->pc != uin->pc) |
76 |
- pdfdoc_changed_error(L); |
77 |
- if (((Object *) uin->d)->isString()) { |
78 |
-- gs = ((Object *) uin->d)->getString(); |
79 |
-+ gs = (GooString *)((Object *) uin->d)->getString(); |
80 |
- lua_pushlstring(L, gs->getCString(), gs->getLength()); |
81 |
- } else |
82 |
- lua_pushnil(L); |
83 |
-diff -ruN texlive-20170524-source.orig/texk/web2c/pdftexdir/pdftoepdf.cc texlive-20170524-source/texk/web2c/pdftexdir/pdftoepdf.cc |
84 |
---- texlive-20170524-source.orig/texk/web2c/pdftexdir/pdftoepdf.cc 2018-05-20 22:11:35.788633528 +0200 |
85 |
-+++ texlive-20170524-source/texk/web2c/pdftexdir/pdftoepdf.cc 2018-05-20 22:12:34.398361984 +0200 |
86 |
-@@ -284,7 +284,7 @@ |
87 |
- static void copyDictEntry(Object * obj, int i) |
88 |
- { |
89 |
- Object obj1; |
90 |
-- copyName(obj->dictGetKey(i)); |
91 |
-+ copyName((char *)obj->dictGetKey(i)); |
92 |
- pdf_puts(" "); |
93 |
- obj1 = obj->dictGetValNF(i); |
94 |
- copyObject(&obj1); |
95 |
-@@ -349,7 +349,7 @@ |
96 |
- if (!procset.isName()) |
97 |
- pdftex_fail("PDF inclusion: invalid ProcSet entry type <%s>", |
98 |
- procset.getTypeName()); |
99 |
-- copyName(procset.getName()); |
100 |
-+ copyName((char *)procset.getName()); |
101 |
- pdf_puts(" "); |
102 |
- } |
103 |
- pdf_puts("]\n"); |
104 |
-@@ -412,7 +412,7 @@ |
105 |
- && fontdescRef.isRef() |
106 |
- && fontdesc.isDict() |
107 |
- && embeddableFont(&fontdesc) |
108 |
-- && (fontmap = lookup_fontmap(basefont.getName())) != NULL) { |
109 |
-+ && (fontmap = lookup_fontmap((char *)basefont.getName())) != NULL) { |
110 |
- // round /StemV value, since the PDF input is a float |
111 |
- // (see Font Descriptors in PDF reference), but we only store an |
112 |
- // integer, since we don't want to change the struct. |
113 |
-@@ -421,7 +421,7 @@ |
114 |
- charset = fontdesc.dictLookup("CharSet"); |
115 |
- if (!charset.isNull() && |
116 |
- charset.isString() && is_subsetable(fontmap)) |
117 |
-- epdf_mark_glyphs(fd, charset.getString()->getCString()); |
118 |
-+ epdf_mark_glyphs(fd, (char *)charset.getString()->getCString()); |
119 |
- else |
120 |
- embed_whole_font(fd); |
121 |
- addFontDesc(fontdescRef.getRef(), fd); |
122 |
-@@ -450,7 +450,7 @@ |
123 |
- if (fontRef.isRef()) |
124 |
- copyFont(obj->dictGetKey(i), &fontRef); |
125 |
- else if (fontRef.isDict()) { // some programs generate pdf with embedded font object |
126 |
-- copyName(obj->dictGetKey(i)); |
127 |
-+ copyName((char *)obj->dictGetKey(i)); |
128 |
- pdf_puts(" "); |
129 |
- copyObject(&fontRef); |
130 |
- } |
131 |
-@@ -559,7 +559,7 @@ |
132 |
- } else if (obj->isNum()) { |
133 |
- pdf_printf("%s", convertNumToPDF(obj->getNum())); |
134 |
- } else if (obj->isString()) { |
135 |
-- s = obj->getString(); |
136 |
-+ s = (GooString *)obj->getString(); |
137 |
- p = s->getCString(); |
138 |
- l = s->getLength(); |
139 |
- if (strlen(p) == (unsigned int) l) { |
140 |
-@@ -583,7 +583,7 @@ |
141 |
- pdf_puts(">"); |
142 |
- } |
143 |
- } else if (obj->isName()) { |
144 |
-- copyName(obj->getName()); |
145 |
-+ copyName((char *)obj->getName()); |
146 |
- } else if (obj->isNull()) { |
147 |
- pdf_puts("null"); |
148 |
- } else if (obj->isArray()) { |
149 |
-diff -ruN texlive-20170524-source.orig/texk/web2c/pdftexdir/pdftosrc.cc texlive-20170524-source/texk/web2c/pdftexdir/pdftosrc.cc |
150 |
---- texlive-20170524-source.orig/texk/web2c/pdftexdir/pdftosrc.cc 2018-05-20 22:11:35.788633528 +0200 |
151 |
-+++ texlive-20170524-source/texk/web2c/pdftexdir/pdftosrc.cc 2018-05-20 22:12:31.369324336 +0200 |
152 |
-@@ -104,7 +104,7 @@ |
153 |
- fprintf(stderr, "No SourceName found\n"); |
154 |
- exit(1); |
155 |
- } |
156 |
-- outname = srcName.getString()->getCString(); |
157 |
-+ outname = (char *)srcName.getString()->getCString(); |
158 |
- // We cannot free srcName, as objname shares its string. |
159 |
- // srcName.free(); |
160 |
- } else if (objnum > 0) { |
161 |
|
162 |
diff --git a/app-text/texlive-core/files/texlive-core-2017-poppler069.patch b/app-text/texlive-core/files/texlive-core-2017-poppler069.patch |
163 |
deleted file mode 100644 |
164 |
index 30934170500..00000000000 |
165 |
--- a/app-text/texlive-core/files/texlive-core-2017-poppler069.patch |
166 |
+++ /dev/null |
167 |
@@ -1,216 +0,0 @@ |
168 |
-From 29f2412e10523158f5e601f32482d3d233a934fc Mon Sep 17 00:00:00 2001 |
169 |
-From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
170 |
-Date: Sat, 12 Jan 2019 21:42:09 +0100 |
171 |
-Subject: [PATCH 1/2] Fix build with poppler-0.69.0 |
172 |
- |
173 |
---- |
174 |
- texk/web2c/luatexdir/image/epdf.h | 1 + |
175 |
- texk/web2c/luatexdir/image/pdftoepdf.w | 14 +++++++------- |
176 |
- texk/web2c/luatexdir/lua/lepdflib.cc | 18 +++++++++--------- |
177 |
- texk/web2c/luatexdir/lua/lpdfscannerlib.cc | 1 + |
178 |
- texk/web2c/pdftexdir/pdftoepdf.cc | 7 ++++--- |
179 |
- texk/web2c/pdftexdir/pdftosrc.cc | 5 +++-- |
180 |
- 6 files changed, 25 insertions(+), 21 deletions(-) |
181 |
- |
182 |
-diff --git a/texk/web2c/luatexdir/image/epdf.h b/texk/web2c/luatexdir/image/epdf.h |
183 |
-index 57bb2e39..ebc83bdb 100644 |
184 |
---- a/texk/web2c/luatexdir/image/epdf.h |
185 |
-+++ b/texk/web2c/luatexdir/image/epdf.h |
186 |
-@@ -39,6 +39,7 @@ extern "C" { |
187 |
- # include <goo/GooString.h> |
188 |
- # include <goo/gmem.h> |
189 |
- # include <goo/gfile.h> |
190 |
-+# include <goo/gdir.h> |
191 |
- # include <Object.h> |
192 |
- # include <Stream.h> |
193 |
- # include <Gfx.h> |
194 |
-diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w |
195 |
-index 3aebf009..0a23b201 100644 |
196 |
---- a/texk/web2c/luatexdir/image/pdftoepdf.w |
197 |
-+++ b/texk/web2c/luatexdir/image/pdftoepdf.w |
198 |
-@@ -31,7 +31,7 @@ |
199 |
- |
200 |
- extern void md5(Guchar *msg, int msgLen, Guchar *digest); |
201 |
- |
202 |
--static GBool isInit = gFalse; |
203 |
-+static bool isInit = false; |
204 |
- |
205 |
- /* Maintain AVL tree of all PDF files for embedding */ |
206 |
- |
207 |
-@@ -468,7 +468,7 @@ static void copyObject(PDF pdf, PdfDocument * pdf_doc, Object * obj) |
208 |
- break; |
209 |
- /* |
210 |
- case objNum: |
211 |
-- GBool isNum() { return type == objInt || type == objReal; } |
212 |
-+ bool isNum() { return type == objInt || type == objReal; } |
213 |
- break; |
214 |
- */ |
215 |
- case objString: |
216 |
-@@ -587,11 +587,11 @@ void read_pdf_info(image_dict * idict) |
217 |
- PDFRectangle *pagebox; |
218 |
- int pdf_major_version_found, pdf_minor_version_found; |
219 |
- float xsize, ysize, xorig, yorig; |
220 |
-- if (isInit == gFalse) { |
221 |
-+ if (isInit == false) { |
222 |
- if (!(globalParams)) |
223 |
- globalParams = new GlobalParams(); |
224 |
-- globalParams->setErrQuiet(gFalse); |
225 |
-- isInit = gTrue; |
226 |
-+ globalParams->setErrQuiet(false); |
227 |
-+ isInit = true; |
228 |
- } |
229 |
- if (img_type(idict) == IMG_TYPE_PDF) |
230 |
- pdf_doc = refPdfDocument(img_filepath(idict), FE_FAIL); |
231 |
-@@ -960,7 +960,7 @@ void epdf_free() |
232 |
- if (PdfDocumentTree != NULL) |
233 |
- avl_destroy(PdfDocumentTree, destroyPdfDocument); |
234 |
- PdfDocumentTree = NULL; |
235 |
-- if (isInit == gTrue) |
236 |
-+ if (isInit == true) |
237 |
- delete globalParams; |
238 |
-- isInit = gFalse; |
239 |
-+ isInit = false; |
240 |
- } |
241 |
-diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc |
242 |
-index 14558510..d47ec941 100644 |
243 |
---- a/texk/web2c/luatexdir/lua/lepdflib.cc |
244 |
-+++ b/texk/web2c/luatexdir/lua/lepdflib.cc |
245 |
-@@ -1374,9 +1374,9 @@ static int m_Object_initBool(lua_State * L) |
246 |
- pdfdoc_changed_error(L); |
247 |
- luaL_checktype(L, 2, LUA_TBOOLEAN); |
248 |
- if (lua_toboolean(L, 2) != 0) |
249 |
-- *((Object *) uin->d) = Object(gTrue); |
250 |
-+ *((Object *) uin->d) = Object(true); |
251 |
- else |
252 |
-- *((Object *) uin->d) = Object(gFalse); |
253 |
-+ *((Object *) uin->d) = Object(false); |
254 |
- return 0; |
255 |
- } |
256 |
- |
257 |
-@@ -2881,12 +2881,12 @@ m_poppler_get_BOOL(Attribute, isHidden); |
258 |
- |
259 |
- static int m_Attribute_setHidden(lua_State * L) |
260 |
- { |
261 |
-- GBool i; |
262 |
-+ bool i; |
263 |
- udstruct *uin; |
264 |
- uin = (udstruct *) luaL_checkudata(L, 1, M_Attribute); |
265 |
- if (uin->pd != NULL && uin->pd->pc != uin->pc) |
266 |
- pdfdoc_changed_error(L); |
267 |
-- i = (GBool) lua_toboolean(L, 2); |
268 |
-+ i = (bool) lua_toboolean(L, 2); |
269 |
- ((Attribute *) uin->d)->setHidden(i); |
270 |
- return 0; |
271 |
- } |
272 |
-@@ -3023,7 +3023,7 @@ static int m_StructElement_getParentRef(lua_State * L) |
273 |
- // Ref is false if the C++ functione return false |
274 |
- static int m_StructElement_getPageRef(lua_State * L) |
275 |
- { |
276 |
-- GBool b; |
277 |
-+ bool b; |
278 |
- Ref *r; |
279 |
- udstruct *uin, *uout; |
280 |
- uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement); |
281 |
-@@ -3069,13 +3069,13 @@ static int m_StructElement_setRevision(lua_State * L) |
282 |
- |
283 |
- static int m_StructElement_getText(lua_State * L) |
284 |
- { |
285 |
-- GBool i; |
286 |
-+ bool i; |
287 |
- GooString *gs; |
288 |
- udstruct *uin; |
289 |
- uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement); |
290 |
- if (uin->pd != NULL && uin->pd->pc != uin->pc) |
291 |
- pdfdoc_changed_error(L); |
292 |
-- i = (GBool) lua_toboolean(L, 2); |
293 |
-+ i = (bool) lua_toboolean(L, 2); |
294 |
- gs = ((StructElement *) uin->d)->getText(i); |
295 |
- if (gs != NULL) |
296 |
- lua_pushlstring(L, gs->getCString(), gs->getLength()); |
297 |
-@@ -3164,7 +3164,7 @@ static int m_StructElement_findAttribute(lua_State * L) |
298 |
- { |
299 |
- Attribute::Type t; |
300 |
- Attribute::Owner o; |
301 |
-- GBool g; |
302 |
-+ bool g; |
303 |
- udstruct *uin, *uout; |
304 |
- const Attribute *a; |
305 |
- uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement); |
306 |
-@@ -3172,7 +3172,7 @@ static int m_StructElement_findAttribute(lua_State * L) |
307 |
- pdfdoc_changed_error(L); |
308 |
- t = (Attribute::Type) luaL_checkint(L,1); |
309 |
- o = (Attribute::Owner) luaL_checkint(L,2); |
310 |
-- g = (GBool) lua_toboolean(L, 3); |
311 |
-+ g = (bool) lua_toboolean(L, 3); |
312 |
- a = ((StructElement *) uin->d)->findAttribute(t,g,o); |
313 |
- |
314 |
- if (a!=NULL){ |
315 |
-diff --git a/texk/web2c/luatexdir/lua/lpdfscannerlib.cc b/texk/web2c/luatexdir/lua/lpdfscannerlib.cc |
316 |
-index eb881b63..a2d39b83 100644 |
317 |
---- a/texk/web2c/luatexdir/lua/lpdfscannerlib.cc |
318 |
-+++ b/texk/web2c/luatexdir/lua/lpdfscannerlib.cc |
319 |
-@@ -34,6 +34,7 @@ extern "C" { |
320 |
- # include <goo/GooString.h> |
321 |
- # include <goo/gmem.h> |
322 |
- # include <goo/gfile.h> |
323 |
-+# include <goo/gdir.h> |
324 |
- # include <Object.h> |
325 |
- # include <Stream.h> |
326 |
- # include <Gfx.h> |
327 |
-diff --git a/texk/web2c/pdftexdir/pdftoepdf.cc b/texk/web2c/pdftexdir/pdftoepdf.cc |
328 |
-index 0ffc3e19..af12c74e 100644 |
329 |
---- a/texk/web2c/pdftexdir/pdftoepdf.cc |
330 |
-+++ b/texk/web2c/pdftexdir/pdftoepdf.cc |
331 |
-@@ -37,6 +37,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. |
332 |
- #include <goo/GooString.h> |
333 |
- #include <goo/gmem.h> |
334 |
- #include <goo/gfile.h> |
335 |
-+#include <goo/gdir.h> |
336 |
- #define GString GooString |
337 |
- #else |
338 |
- #include <aconf.h> |
339 |
-@@ -114,7 +115,7 @@ struct UsedEncoding { |
340 |
- |
341 |
- static InObj *inObjList; |
342 |
- static UsedEncoding *encodingList; |
343 |
--static GBool isInit = gFalse; |
344 |
-+static bool isInit = false; |
345 |
- |
346 |
- // -------------------------------------------------------------------- |
347 |
- // Maintain list of open embedded PDF files |
348 |
-@@ -718,8 +719,8 @@ read_pdf_info(char *image_name, char *page_name, int page_num, |
349 |
- // initialize |
350 |
- if (!isInit) { |
351 |
- globalParams = new GlobalParams(); |
352 |
-- globalParams->setErrQuiet(gFalse); |
353 |
-- isInit = gTrue; |
354 |
-+ globalParams->setErrQuiet(false); |
355 |
-+ isInit = true; |
356 |
- } |
357 |
- // open PDF file |
358 |
- pdf_doc = find_add_document(image_name); |
359 |
-diff --git a/texk/web2c/pdftexdir/pdftosrc.cc b/texk/web2c/pdftexdir/pdftosrc.cc |
360 |
-index ead9f209..22ab6bdc 100644 |
361 |
---- a/texk/web2c/pdftexdir/pdftosrc.cc |
362 |
-+++ b/texk/web2c/pdftexdir/pdftosrc.cc |
363 |
-@@ -31,6 +31,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. |
364 |
- #include <goo/GooString.h> |
365 |
- #include <goo/gmem.h> |
366 |
- #include <goo/gfile.h> |
367 |
-+#include <goo/gdir.h> |
368 |
- #else |
369 |
- #include <aconf.h> |
370 |
- #include <GString.h> |
371 |
-@@ -167,8 +168,8 @@ int main(int argc, char *argv[]) |
372 |
- |
373 |
- // parse the header: object numbers and offsets |
374 |
- objStr.streamReset(); |
375 |
-- str = new EmbedStream(objStr.getStream(), Object(objNull), gTrue, first); |
376 |
-- parser = new Parser(xref, new Lexer(xref, str), gFalse); |
377 |
-+ str = new EmbedStream(objStr.getStream(), Object(objNull), true, first); |
378 |
-+ parser = new Parser(xref, new Lexer(xref, str), false); |
379 |
- for (n = 0; n < nObjects; ++n) { |
380 |
- obj1 = parser->getObj(); |
381 |
- obj2 = parser->getObj(); |
382 |
--- |
383 |
-2.20.1 |
384 |
|
385 |
diff --git a/app-text/texlive-core/files/texlive-core-2017-poppler071.patch b/app-text/texlive-core/files/texlive-core-2017-poppler071.patch |
386 |
deleted file mode 100644 |
387 |
index 6238002c2e5..00000000000 |
388 |
--- a/app-text/texlive-core/files/texlive-core-2017-poppler071.patch |
389 |
+++ /dev/null |
390 |
@@ -1,281 +0,0 @@ |
391 |
-From 2f77decfd2340c9a241dc508ae984a93dfef2643 Mon Sep 17 00:00:00 2001 |
392 |
-From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
393 |
-Date: Sat, 12 Jan 2019 21:43:29 +0100 |
394 |
-Subject: [PATCH 2/2] Fix build with poppler-0.71.0 |
395 |
- |
396 |
-Thanks-to: maurerpe <junk4me46806@×××××.com> |
397 |
---- |
398 |
- texk/web2c/luatexdir/image/pdftoepdf.w | 10 +++++----- |
399 |
- texk/web2c/luatexdir/lua/lepdflib.cc | 18 +++++++++--------- |
400 |
- texk/web2c/pdftexdir/pdftex-common.h | 2 +- |
401 |
- texk/web2c/pdftexdir/pdftoepdf.cc | 20 ++++++++++---------- |
402 |
- texk/web2c/pdftexdir/writeenc.c | 2 +- |
403 |
- texk/web2c/xetexdir/pdfimage.cpp | 2 +- |
404 |
- 6 files changed, 27 insertions(+), 27 deletions(-) |
405 |
- |
406 |
-diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w |
407 |
-index 0a23b201..aa1d7f25 100644 |
408 |
---- a/texk/web2c/luatexdir/image/pdftoepdf.w |
409 |
-+++ b/texk/web2c/luatexdir/image/pdftoepdf.w |
410 |
-@@ -363,7 +363,7 @@ void copyReal(PDF pdf, double d) |
411 |
- |
412 |
- static void copyString(PDF pdf, GooString * string) |
413 |
- { |
414 |
-- char *p; |
415 |
-+ const char *p; |
416 |
- unsigned char c; |
417 |
- size_t i, l; |
418 |
- p = string->getCString(); |
419 |
-@@ -393,7 +393,7 @@ static void copyString(PDF pdf, GooString * string) |
420 |
- pdf->cave = true; |
421 |
- } |
422 |
- |
423 |
--static void copyName(PDF pdf, char *s) |
424 |
-+static void copyName(PDF pdf, const char *s) |
425 |
- { |
426 |
- pdf_out(pdf, '/'); |
427 |
- for (; *s != 0; s++) { |
428 |
-@@ -527,7 +527,7 @@ static void writeRefs(PDF pdf, PdfDocument * pdf_doc) |
429 |
- |
430 |
- /* get the pagebox coordinates according to the pagebox_spec */ |
431 |
- |
432 |
--static PDFRectangle *get_pagebox(Page * page, int pagebox_spec) |
433 |
-+static const PDFRectangle *get_pagebox(Page * page, int pagebox_spec) |
434 |
- { |
435 |
- switch (pagebox_spec) { |
436 |
- case PDF_BOX_SPEC_MEDIA: |
437 |
-@@ -584,7 +584,7 @@ void read_pdf_info(image_dict * idict) |
438 |
- Catalog *catalog; |
439 |
- Page *page; |
440 |
- int rotate; |
441 |
-- PDFRectangle *pagebox; |
442 |
-+ const PDFRectangle *pagebox; |
443 |
- int pdf_major_version_found, pdf_minor_version_found; |
444 |
- float xsize, ysize, xorig, yorig; |
445 |
- if (isInit == false) { |
446 |
-@@ -721,7 +721,7 @@ void write_epdf(PDF pdf, image_dict * idict, int suppress_optional_info) |
447 |
- Ref *pageref; |
448 |
- Dict *pageDict; |
449 |
- Object obj1, contents, pageobj, pagesobj1, pagesobj2, *op1, *op2, *optmp; |
450 |
-- PDFRectangle *pagebox; |
451 |
-+ const PDFRectangle *pagebox; |
452 |
- int i, l; |
453 |
- double bbox[4]; |
454 |
- /* char s[256]; */ |
455 |
-diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc |
456 |
-index d47ec941..01f9415c 100644 |
457 |
---- a/texk/web2c/luatexdir/lua/lepdflib.cc |
458 |
-+++ b/texk/web2c/luatexdir/lua/lepdflib.cc |
459 |
-@@ -238,7 +238,7 @@ static int l_new_Attribute(lua_State * L) |
460 |
- if (uobj->pd != NULL && uobj->pd->pc != uobj->pc) |
461 |
- pdfdoc_changed_error(L); |
462 |
- uout = new_Attribute_userdata(L); |
463 |
-- uout->d = new Attribute(n, nlen, (Object *)uobj->d); |
464 |
-+ uout->d = new Attribute(GooString(n, nlen), (Object *)uobj->d); |
465 |
- uout->atype = ALLOC_LEPDF; |
466 |
- uout->pc = uobj->pc; |
467 |
- uout->pd = uobj->pd; |
468 |
-@@ -443,7 +443,7 @@ static int m_##in##_##function(lua_State * L) \ |
469 |
- uin = (udstruct *) luaL_checkudata(L, 1, M_##in); \ |
470 |
- if (uin->pd != NULL && uin->pd->pc != uin->pc) \ |
471 |
- pdfdoc_changed_error(L); \ |
472 |
-- o = ((in *) uin->d)->function(); \ |
473 |
-+ o = (out *) ((in *) uin->d)->function(); \ |
474 |
- if (o != NULL) { \ |
475 |
- uout = new_##out##_userdata(L); \ |
476 |
- uout->d = o; \ |
477 |
-@@ -972,12 +972,12 @@ m_poppler_get_INT(Dict, getLength); |
478 |
- |
479 |
- static int m_Dict_add(lua_State * L) |
480 |
- { |
481 |
-- char *s; |
482 |
-+ const char *s; |
483 |
- udstruct *uin, *uobj; |
484 |
- uin = (udstruct *) luaL_checkudata(L, 1, M_Dict); |
485 |
- if (uin->pd != NULL && uin->pd->pc != uin->pc) |
486 |
- pdfdoc_changed_error(L); |
487 |
-- s = copyString(luaL_checkstring(L, 2)); |
488 |
-+ s = luaL_checkstring(L, 2); |
489 |
- uobj = (udstruct *) luaL_checkudata(L, 3, M_Object); |
490 |
- ((Dict *) uin->d)->add(s, std::move(*((Object *) uobj->d))); |
491 |
- return 0; |
492 |
-@@ -1894,7 +1894,7 @@ static int m_Object_dictAdd(lua_State * L) |
493 |
- pdfdoc_changed_error(L); |
494 |
- if (!((Object *) uin->d)->isDict()) |
495 |
- luaL_error(L, "Object is not a Dict"); |
496 |
-- ((Object *) uin->d)->dictAdd(copyString(s), std::move(*((Object *) uobj->d))); |
497 |
-+ ((Object *) uin->d)->dictAdd(s, std::move(*((Object *) uobj->d))); |
498 |
- return 0; |
499 |
- } |
500 |
- |
501 |
-@@ -2308,7 +2308,7 @@ m_PDFDoc_INT(getErrorCode); |
502 |
- |
503 |
- static int m_PDFDoc_getFileName(lua_State * L) |
504 |
- { |
505 |
-- GooString *gs; |
506 |
-+ const GooString *gs; |
507 |
- udstruct *uin; |
508 |
- uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc); |
509 |
- if (uin->pd != NULL && uin->pd->pc != uin->pc) |
510 |
-@@ -2396,7 +2396,7 @@ m_PDFDoc_INT(getNumPages); |
511 |
- |
512 |
- static int m_PDFDoc_readMetadata(lua_State * L) |
513 |
- { |
514 |
-- GooString *gs; |
515 |
-+ const GooString *gs; |
516 |
- udstruct *uin; |
517 |
- uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc); |
518 |
- if (uin->pd != NULL && uin->pd->pc != uin->pc) |
519 |
-@@ -2414,7 +2414,7 @@ static int m_PDFDoc_readMetadata(lua_State * L) |
520 |
- |
521 |
- static int m_PDFDoc_getStructTreeRoot(lua_State * L) |
522 |
- { |
523 |
-- StructTreeRoot *obj; |
524 |
-+ const StructTreeRoot *obj; |
525 |
- udstruct *uin, *uout; |
526 |
- uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc); |
527 |
- if (uin->pd != NULL && uin->pd->pc != uin->pc) |
528 |
-@@ -2422,7 +2422,7 @@ static int m_PDFDoc_getStructTreeRoot(lua_State * L) |
529 |
- if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) { |
530 |
- obj = ((PdfDocument *) uin->d)->doc->getStructTreeRoot(); |
531 |
- uout = new_StructTreeRoot_userdata(L); |
532 |
-- uout->d = obj; |
533 |
-+ uout->d = (StructTreeRoot *) obj; |
534 |
- uout->pc = uin->pc; |
535 |
- uout->pd = uin->pd; |
536 |
- } else |
537 |
-diff --git a/texk/web2c/pdftexdir/pdftex-common.h b/texk/web2c/pdftexdir/pdftex-common.h |
538 |
-index 307ba64a..09741707 100644 |
539 |
---- a/texk/web2c/pdftexdir/pdftex-common.h |
540 |
-+++ b/texk/web2c/pdftexdir/pdftex-common.h |
541 |
-@@ -101,7 +101,7 @@ extern void tex_printf(const char *, ...); |
542 |
- extern void write_epdf(void); |
543 |
- |
544 |
- /* writeenc.c */ |
545 |
--extern void epdf_write_enc(char **, int); |
546 |
-+extern void epdf_write_enc(const char **, int); |
547 |
- |
548 |
- /* writeimg.c */ |
549 |
- extern float epdf_width; |
550 |
-diff --git a/texk/web2c/pdftexdir/pdftoepdf.cc b/texk/web2c/pdftexdir/pdftoepdf.cc |
551 |
-index af12c74e..e353b652 100644 |
552 |
---- a/texk/web2c/pdftexdir/pdftoepdf.cc |
553 |
-+++ b/texk/web2c/pdftexdir/pdftoepdf.cc |
554 |
-@@ -270,7 +270,7 @@ static int getNewObjectNumber(Ref ref) |
555 |
- |
556 |
- static void copyObject(Object *); |
557 |
- |
558 |
--static void copyName(char *s) |
559 |
-+static void copyName(const char *s) |
560 |
- { |
561 |
- pdf_puts("/"); |
562 |
- for (; *s != 0; s++) { |
563 |
-@@ -305,7 +305,7 @@ static void copyDict(Object * obj) |
564 |
- static void copyFontDict(Object * obj, InObj * r) |
565 |
- { |
566 |
- int i, l; |
567 |
-- char *key; |
568 |
-+ const char *key; |
569 |
- if (!obj->isDict()) |
570 |
- pdftex_fail("PDF inclusion: invalid dict type <%s>", |
571 |
- obj->getTypeName()); |
572 |
-@@ -377,7 +377,7 @@ static bool embeddableFont(Object * fontdesc) |
573 |
- return false; |
574 |
- } |
575 |
- |
576 |
--static void copyFont(char *tag, Object * fontRef) |
577 |
-+static void copyFont(const char *tag, Object * fontRef) |
578 |
- { |
579 |
- Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset, |
580 |
- stemV; |
581 |
-@@ -462,7 +462,7 @@ static void copyFontResources(Object * obj) |
582 |
- pdf_puts(">>\n"); |
583 |
- } |
584 |
- |
585 |
--static void copyOtherResources(Object * obj, char *key) |
586 |
-+static void copyOtherResources(Object * obj, const char *key) |
587 |
- { |
588 |
- // copies all other resources (write_epdf handles Fonts and ProcSets), |
589 |
- |
590 |
-@@ -549,7 +549,7 @@ static void copyObject(Object * obj) |
591 |
- Object obj1; |
592 |
- int i, l, c; |
593 |
- Ref ref; |
594 |
-- char *p; |
595 |
-+ const char *p; |
596 |
- GString *s; |
597 |
- if (obj->isBool()) { |
598 |
- pdf_printf("%s", obj->getBool()? "true" : "false"); |
599 |
-@@ -650,7 +650,7 @@ static void writeRefs() |
600 |
- static void writeEncodings() |
601 |
- { |
602 |
- UsedEncoding *r, *n; |
603 |
-- char *glyphNames[256], *s; |
604 |
-+ const char *glyphNames[256], *s; |
605 |
- int i; |
606 |
- for (r = encodingList; r != 0; r = r->next) { |
607 |
- for (i = 0; i < 256; i++) { |
608 |
-@@ -678,7 +678,7 @@ static void writeEncodings() |
609 |
- } |
610 |
- |
611 |
- // get the pagebox according to the pagebox_spec |
612 |
--static PDFRectangle *get_pagebox(Page * page, int pagebox_spec) |
613 |
-+static const PDFRectangle *get_pagebox(Page * page, int pagebox_spec) |
614 |
- { |
615 |
- if (pagebox_spec == pdfboxspecmedia) |
616 |
- return page->getMediaBox(); |
617 |
-@@ -710,7 +710,7 @@ read_pdf_info(char *image_name, char *page_name, int page_num, |
618 |
- { |
619 |
- PdfDocument *pdf_doc; |
620 |
- Page *page; |
621 |
-- PDFRectangle *pagebox; |
622 |
-+ const PDFRectangle *pagebox; |
623 |
- #ifdef POPPLER_VERSION |
624 |
- int pdf_major_version_found, pdf_minor_version_found; |
625 |
- #else |
626 |
-@@ -829,7 +829,7 @@ void write_epdf(void) |
627 |
- Object groupDict; |
628 |
- bool writeSepGroup = false; |
629 |
- Object info; |
630 |
-- char *key; |
631 |
-+ const char *key; |
632 |
- char s[256]; |
633 |
- int i, l; |
634 |
- int rotate; |
635 |
-@@ -856,7 +856,7 @@ void write_epdf(void) |
636 |
- pageObj = xref->fetch(pageRef->num, pageRef->gen); |
637 |
- pageDict = pageObj.getDict(); |
638 |
- rotate = page->getRotate(); |
639 |
-- PDFRectangle *pagebox; |
640 |
-+ const PDFRectangle *pagebox; |
641 |
- // write the Page header |
642 |
- pdf_puts("/Type /XObject\n"); |
643 |
- pdf_puts("/Subtype /Form\n"); |
644 |
-diff --git a/texk/web2c/pdftexdir/writeenc.c b/texk/web2c/pdftexdir/writeenc.c |
645 |
-index bd55103f..08f44633 100644 |
646 |
---- a/texk/web2c/pdftexdir/writeenc.c |
647 |
-+++ b/texk/web2c/pdftexdir/writeenc.c |
648 |
-@@ -83,7 +83,7 @@ fe_entry *get_fe_entry(char *s) |
649 |
- |
650 |
- /**********************************************************************/ |
651 |
- |
652 |
--void epdf_write_enc(char **glyph_names, int fe_objnum) |
653 |
-+void epdf_write_enc(const char **glyph_names, int fe_objnum) |
654 |
- { |
655 |
- int i, i_old; |
656 |
- assert(glyph_names != NULL); |
657 |
-diff --git a/texk/web2c/xetexdir/pdfimage.cpp b/texk/web2c/xetexdir/pdfimage.cpp |
658 |
-index 85389136..ce46cae1 100644 |
659 |
---- a/texk/web2c/xetexdir/pdfimage.cpp |
660 |
-+++ b/texk/web2c/xetexdir/pdfimage.cpp |
661 |
-@@ -78,7 +78,7 @@ pdf_get_rect(char* filename, int page_num, int pdf_box, realrect* box) |
662 |
- |
663 |
- Page* page = doc->getCatalog()->getPage(page_num); |
664 |
- |
665 |
-- PDFRectangle* r; |
666 |
-+ const PDFRectangle* r; |
667 |
- switch (pdf_box) { |
668 |
- default: |
669 |
- case pdfbox_crop: |
670 |
--- |
671 |
-2.20.1 |
672 |
|
673 |
diff --git a/app-text/texlive-core/files/texlive-core-2017-poppler072.patch b/app-text/texlive-core/files/texlive-core-2017-poppler072.patch |
674 |
deleted file mode 100644 |
675 |
index 489ff25fa00..00000000000 |
676 |
--- a/app-text/texlive-core/files/texlive-core-2017-poppler072.patch |
677 |
+++ /dev/null |
678 |
@@ -1,157 +0,0 @@ |
679 |
-From 19462cf1b5628d7251cde91031a0635e636d890a Mon Sep 17 00:00:00 2001 |
680 |
-From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
681 |
-Date: Sat, 12 Jan 2019 21:59:07 +0100 |
682 |
-Subject: [PATCH] Fix build with poppler-0.72 |
683 |
- |
684 |
---- |
685 |
- texk/web2c/luatexdir/image/pdftoepdf.w | 2 +- |
686 |
- texk/web2c/luatexdir/lua/lepdflib.cc | 16 ++++++++-------- |
687 |
- texk/web2c/pdftexdir/pdftoepdf.cc | 4 ++-- |
688 |
- texk/web2c/pdftexdir/pdftosrc.cc | 6 +++--- |
689 |
- 4 files changed, 14 insertions(+), 14 deletions(-) |
690 |
- |
691 |
-diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w |
692 |
-index aa1d7f25..2f143068 100644 |
693 |
---- a/texk/web2c/luatexdir/image/pdftoepdf.w |
694 |
-+++ b/texk/web2c/luatexdir/image/pdftoepdf.w |
695 |
-@@ -366,7 +366,7 @@ static void copyString(PDF pdf, GooString * string) |
696 |
- const char *p; |
697 |
- unsigned char c; |
698 |
- size_t i, l; |
699 |
-- p = string->getCString(); |
700 |
-+ p = string->c_str(); |
701 |
- l = (size_t) string->getLength(); |
702 |
- if (pdf->cave) |
703 |
- pdf_out(pdf, ' '); |
704 |
-diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc |
705 |
-index 01f9415c..6b24a39b 100644 |
706 |
---- a/texk/web2c/luatexdir/lua/lepdflib.cc |
707 |
-+++ b/texk/web2c/luatexdir/lua/lepdflib.cc |
708 |
-@@ -523,7 +523,7 @@ static int m_##in##_##function(lua_State * L) \ |
709 |
- pdfdoc_changed_error(L); \ |
710 |
- gs = (GooString *)((in *) uin->d)->function(); \ |
711 |
- if (gs != NULL) \ |
712 |
-- lua_pushlstring(L, gs->getCString(), gs->getLength()); \ |
713 |
-+ lua_pushlstring(L, gs->c_str(), gs->getLength()); \ |
714 |
- else \ |
715 |
- lua_pushnil(L); \ |
716 |
- return 1; \ |
717 |
-@@ -758,7 +758,7 @@ static int m_Array_getString(lua_State * L) |
718 |
- if (i > 0 && i <= len) { |
719 |
- gs = new GooString(); |
720 |
- if (((Array *) uin->d)->getString(i - 1, gs)) |
721 |
-- lua_pushlstring(L, gs->getCString(), gs->getLength()); |
722 |
-+ lua_pushlstring(L, gs->c_str(), gs->getLength()); |
723 |
- else |
724 |
- lua_pushnil(L); |
725 |
- delete gs; |
726 |
-@@ -910,7 +910,7 @@ static int m_Catalog_getJS(lua_State * L) |
727 |
- if (i > 0 && i <= len) { |
728 |
- gs = ((Catalog *) uin->d)->getJS(i - 1); |
729 |
- if (gs != NULL) |
730 |
-- lua_pushlstring(L, gs->getCString(), gs->getLength()); |
731 |
-+ lua_pushlstring(L, gs->c_str(), gs->getLength()); |
732 |
- else |
733 |
- lua_pushnil(L); |
734 |
- delete gs; |
735 |
-@@ -1225,7 +1225,7 @@ static int m_GooString__tostring(lua_State * L) |
736 |
- uin = (udstruct *) luaL_checkudata(L, 1, M_GooString); |
737 |
- if (uin->pd != NULL && uin->pd->pc != uin->pc) |
738 |
- pdfdoc_changed_error(L); |
739 |
-- lua_pushlstring(L, ((GooString *) uin->d)->getCString(), |
740 |
-+ lua_pushlstring(L, ((GooString *) uin->d)->c_str(), |
741 |
- ((GooString *) uin->d)->getLength()); |
742 |
- return 1; |
743 |
- } |
744 |
-@@ -1657,7 +1657,7 @@ static int m_Object_getString(lua_State * L) |
745 |
- pdfdoc_changed_error(L); |
746 |
- if (((Object *) uin->d)->isString()) { |
747 |
- gs = (GooString *)((Object *) uin->d)->getString(); |
748 |
-- lua_pushlstring(L, gs->getCString(), gs->getLength()); |
749 |
-+ lua_pushlstring(L, gs->c_str(), gs->getLength()); |
750 |
- } else |
751 |
- lua_pushnil(L); |
752 |
- return 1; |
753 |
-@@ -2315,7 +2315,7 @@ static int m_PDFDoc_getFileName(lua_State * L) |
754 |
- pdfdoc_changed_error(L); |
755 |
- gs = ((PdfDocument *) uin->d)->doc->getFileName(); |
756 |
- if (gs != NULL) |
757 |
-- lua_pushlstring(L, gs->getCString(), gs->getLength()); |
758 |
-+ lua_pushlstring(L, gs->c_str(), gs->getLength()); |
759 |
- else |
760 |
- lua_pushnil(L); |
761 |
- return 1; |
762 |
-@@ -2404,7 +2404,7 @@ static int m_PDFDoc_readMetadata(lua_State * L) |
763 |
- if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) { |
764 |
- gs = ((PdfDocument *) uin->d)->doc->readMetadata(); |
765 |
- if (gs != NULL) |
766 |
-- lua_pushlstring(L, gs->getCString(), gs->getLength()); |
767 |
-+ lua_pushlstring(L, gs->c_str(), gs->getLength()); |
768 |
- else |
769 |
- lua_pushnil(L); |
770 |
- } else |
771 |
-@@ -3078,7 +3078,7 @@ static int m_StructElement_getText(lua_State * L) |
772 |
- i = (bool) lua_toboolean(L, 2); |
773 |
- gs = ((StructElement *) uin->d)->getText(i); |
774 |
- if (gs != NULL) |
775 |
-- lua_pushlstring(L, gs->getCString(), gs->getLength()); |
776 |
-+ lua_pushlstring(L, gs->c_str(), gs->getLength()); |
777 |
- else |
778 |
- lua_pushnil(L); |
779 |
- return 1; |
780 |
-diff --git a/texk/web2c/pdftexdir/pdftoepdf.cc b/texk/web2c/pdftexdir/pdftoepdf.cc |
781 |
-index e353b652..84e9f7ce 100644 |
782 |
---- a/texk/web2c/pdftexdir/pdftoepdf.cc |
783 |
-+++ b/texk/web2c/pdftexdir/pdftoepdf.cc |
784 |
-@@ -422,7 +422,7 @@ static void copyFont(const char *tag, Object * fontRef) |
785 |
- charset = fontdesc.dictLookup("CharSet"); |
786 |
- if (!charset.isNull() && |
787 |
- charset.isString() && is_subsetable(fontmap)) |
788 |
-- epdf_mark_glyphs(fd, (char *)charset.getString()->getCString()); |
789 |
-+ epdf_mark_glyphs(fd, (char *)charset.getString()->c_str()); |
790 |
- else |
791 |
- embed_whole_font(fd); |
792 |
- addFontDesc(fontdescRef.getRef(), fd); |
793 |
-@@ -561,7 +561,7 @@ static void copyObject(Object * obj) |
794 |
- pdf_printf("%s", convertNumToPDF(obj->getNum())); |
795 |
- } else if (obj->isString()) { |
796 |
- s = (GooString *)obj->getString(); |
797 |
-- p = s->getCString(); |
798 |
-+ p = s->c_str(); |
799 |
- l = s->getLength(); |
800 |
- if (strlen(p) == (unsigned int) l) { |
801 |
- pdf_puts("("); |
802 |
-diff --git a/texk/web2c/pdftexdir/pdftosrc.cc b/texk/web2c/pdftexdir/pdftosrc.cc |
803 |
-index 22ab6bdc..bad1b78f 100644 |
804 |
---- a/texk/web2c/pdftexdir/pdftosrc.cc |
805 |
-+++ b/texk/web2c/pdftexdir/pdftosrc.cc |
806 |
-@@ -105,7 +105,7 @@ int main(int argc, char *argv[]) |
807 |
- fprintf(stderr, "No SourceName found\n"); |
808 |
- exit(1); |
809 |
- } |
810 |
-- outname = (char *)srcName.getString()->getCString(); |
811 |
-+ outname = (char *)srcName.getString()->c_str(); |
812 |
- // We cannot free srcName, as objname shares its string. |
813 |
- // srcName.free(); |
814 |
- } else if (objnum > 0) { |
815 |
-@@ -114,7 +114,7 @@ int main(int argc, char *argv[]) |
816 |
- fprintf(stderr, "Not a Stream object\n"); |
817 |
- exit(1); |
818 |
- } |
819 |
-- sprintf(buf, "%s", fileName->getCString()); |
820 |
-+ sprintf(buf, "%s", fileName->c_str()); |
821 |
- if ((p = strrchr(buf, '.')) == 0) |
822 |
- p = strchr(buf, 0); |
823 |
- if (objgen == 0) |
824 |
-@@ -124,7 +124,7 @@ int main(int argc, char *argv[]) |
825 |
- outname = buf; |
826 |
- } else { // objnum < 0 means we are extracting the XRef table |
827 |
- extract_xref_table = true; |
828 |
-- sprintf(buf, "%s", fileName->getCString()); |
829 |
-+ sprintf(buf, "%s", fileName->c_str()); |
830 |
- if ((p = strrchr(buf, '.')) == 0) |
831 |
- p = strchr(buf, 0); |
832 |
- sprintf(p, ".xref"); |
833 |
--- |
834 |
-2.20.1 |
835 |
- |
836 |
|
837 |
diff --git a/app-text/texlive-core/files/texlive-core-2017-poppler073.patch b/app-text/texlive-core/files/texlive-core-2017-poppler073.patch |
838 |
deleted file mode 100644 |
839 |
index 487ecc0129c..00000000000 |
840 |
--- a/app-text/texlive-core/files/texlive-core-2017-poppler073.patch |
841 |
+++ /dev/null |
842 |
@@ -1,74 +0,0 @@ |
843 |
-From b3df00dcf7332ae9b64f019278af8708c1ced284 Mon Sep 17 00:00:00 2001 |
844 |
-From: Andreas Sturmlechner <asturm@g.o> |
845 |
-Date: Wed, 16 Jan 2019 21:10:09 +0100 |
846 |
-Subject: [PATCH] Fix build with poppler-0.73 |
847 |
- |
848 |
---- |
849 |
- texk/web2c/luatexdir/image/pdftoepdf.w | 2 +- |
850 |
- texk/web2c/luatexdir/lua/lepdflib.cc | 8 ++++---- |
851 |
- texk/web2c/pdftexdir/pdftosrc.cc | 2 +- |
852 |
- 3 files changed, 6 insertions(+), 6 deletions(-) |
853 |
- |
854 |
-diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w |
855 |
-index 2f143068..10ed9879 100644 |
856 |
---- a/texk/web2c/luatexdir/image/pdftoepdf.w |
857 |
-+++ b/texk/web2c/luatexdir/image/pdftoepdf.w |
858 |
-@@ -29,7 +29,7 @@ |
859 |
- the functions of poppler, which happens to be written in C++. |
860 |
- */ |
861 |
- |
862 |
--extern void md5(Guchar *msg, int msgLen, Guchar *digest); |
863 |
-+extern void md5(unsigned char *msg, int msgLen, unsigned char *digest); |
864 |
- |
865 |
- static bool isInit = false; |
866 |
- |
867 |
-diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc |
868 |
-index 6b24a39b..87078fc5 100644 |
869 |
---- a/texk/web2c/luatexdir/lua/lepdflib.cc |
870 |
-+++ b/texk/web2c/luatexdir/lua/lepdflib.cc |
871 |
-@@ -2867,12 +2867,12 @@ m_poppler_get_GUINT(Attribute,getRevision); |
872 |
- |
873 |
- static int m_Attribute_setRevision(lua_State * L) |
874 |
- { |
875 |
-- Guint i; |
876 |
-+ unsigned int i; |
877 |
- udstruct *uin; |
878 |
- uin = (udstruct *) luaL_checkudata(L, 1, M_Attribute); |
879 |
- if (uin->pd != NULL && uin->pd->pc != uin->pc) |
880 |
- pdfdoc_changed_error(L); |
881 |
-- i = (Guint) luaL_checkint(L, 2); |
882 |
-+ i = (unsigned int) luaL_checkint(L, 2); |
883 |
- ((Attribute *) uin->d)->setRevision(i); |
884 |
- return 0; |
885 |
- } |
886 |
-@@ -3057,12 +3057,12 @@ static int m_StructElement_getTypeName(lua_State * L) |
887 |
- |
888 |
- static int m_StructElement_setRevision(lua_State * L) |
889 |
- { |
890 |
-- Guint i; |
891 |
-+ unsigned int i; |
892 |
- udstruct *uin; |
893 |
- uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement); |
894 |
- if (uin->pd != NULL && uin->pd->pc != uin->pc) |
895 |
- pdfdoc_changed_error(L); |
896 |
-- i = (Guint) luaL_checkint(L, 2); |
897 |
-+ i = (unsigned int) luaL_checkint(L, 2); |
898 |
- ((StructElement *) uin->d)->setRevision(i); |
899 |
- return 0; |
900 |
- } |
901 |
-diff --git a/texk/web2c/pdftexdir/pdftosrc.cc b/texk/web2c/pdftexdir/pdftosrc.cc |
902 |
-index bad1b78f..295c4e66 100644 |
903 |
---- a/texk/web2c/pdftexdir/pdftosrc.cc |
904 |
-+++ b/texk/web2c/pdftexdir/pdftosrc.cc |
905 |
-@@ -156,7 +156,7 @@ int main(int argc, char *argv[]) |
906 |
- Object objStr, obj1, obj2; |
907 |
- int nObjects, first, n; |
908 |
- int localOffset = 0; |
909 |
-- Guint firstOffset; |
910 |
-+ unsigned int firstOffset; |
911 |
- |
912 |
- objStr = xref->fetch(e->offset, 0); |
913 |
- assert(objStr.isStream()); |
914 |
--- |
915 |
-2.20.1 |
916 |
- |
917 |
|
918 |
diff --git a/app-text/texlive-core/texlive-core-2017-r4.ebuild b/app-text/texlive-core/texlive-core-2017-r4.ebuild |
919 |
index e0cf232cbf4..890dbd17149 100644 |
920 |
--- a/app-text/texlive-core/texlive-core-2017-r4.ebuild |
921 |
+++ b/app-text/texlive-core/texlive-core-2017-r4.ebuild |
922 |
@@ -19,8 +19,10 @@ LICENSE="GPL-2 LPPL-1.3c TeX" |
923 |
SRC_URI="mirror://gentoo/${MY_PV}.tar.xz" |
924 |
|
925 |
# Fetch patches |
926 |
+POPPLERPATCHES="${P}-poppler076" |
927 |
SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz |
928 |
https://dev.gentoo.org/~dilfridge/distfiles/${PN%-core}-${TL_SOURCE_VERSION}-source-freetype.patch.xz |
929 |
+ https://dev.gentoo.org/~asturm/distfiles/${POPPLERPATCHES}.tar.xz |
930 |
" |
931 |
# mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz" |
932 |
|
933 |
@@ -164,10 +166,15 @@ src_prepare() { |
934 |
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" |
935 |
|
936 |
# bug ? |
937 |
- epatch "${FILESDIR}/${P}-poppler064.patch" |
938 |
+ epatch "${WORKDIR}/${POPPLERPATCHES}/${P}-poppler064.patch" |
939 |
|
940 |
if has_version ">=app-text/poppler-0.69.0"; then |
941 |
- epatch "${FILESDIR}"/${P}-poppler0{69,71,72,73}.patch # bugs #672854, 675448 |
942 |
+ epatch "${WORKDIR}"/${POPPLERPATCHES}/${P}-poppler0{69,71,72,73}.patch # bugs #672854, 675448 |
943 |
+ fi |
944 |
+ |
945 |
+ if has_version ">=app-text/poppler-0.75.0"; then |
946 |
+ epatch "${WORKDIR}"/${POPPLERPATCHES}/${P}-pdftexdir-poppler0{75,76}.patch # bugs #681338, 685284 |
947 |
+ epatch "${WORKDIR}"/${POPPLERPATCHES}/${P}-luatexdir-poppler0{75,76}.patch # bugs #681338, 685284 |
948 |
fi |
949 |
|
950 |
sed -i \ |