1 |
commit: 280476dac64cd07b1db5dda47c9056494c2d156b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 16 20:12:57 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 16 21:44:56 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=280476da |
7 |
|
8 |
app-text/texlive-core: Fix build with poppler-0.73 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/675448 |
11 |
Package-Manager: Portage-2.3.56, Repoman-2.3.12 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
.../files/texlive-core-2017-poppler073.patch | 74 ++++++++++++++++++++++ |
15 |
app-text/texlive-core/texlive-core-2017-r4.ebuild | 2 +- |
16 |
2 files changed, 75 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/app-text/texlive-core/files/texlive-core-2017-poppler073.patch b/app-text/texlive-core/files/texlive-core-2017-poppler073.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..487ecc0129c |
21 |
--- /dev/null |
22 |
+++ b/app-text/texlive-core/files/texlive-core-2017-poppler073.patch |
23 |
@@ -0,0 +1,74 @@ |
24 |
+From b3df00dcf7332ae9b64f019278af8708c1ced284 Mon Sep 17 00:00:00 2001 |
25 |
+From: Andreas Sturmlechner <asturm@g.o> |
26 |
+Date: Wed, 16 Jan 2019 21:10:09 +0100 |
27 |
+Subject: [PATCH] Fix build with poppler-0.73 |
28 |
+ |
29 |
+--- |
30 |
+ texk/web2c/luatexdir/image/pdftoepdf.w | 2 +- |
31 |
+ texk/web2c/luatexdir/lua/lepdflib.cc | 8 ++++---- |
32 |
+ texk/web2c/pdftexdir/pdftosrc.cc | 2 +- |
33 |
+ 3 files changed, 6 insertions(+), 6 deletions(-) |
34 |
+ |
35 |
+diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w |
36 |
+index 2f143068..10ed9879 100644 |
37 |
+--- a/texk/web2c/luatexdir/image/pdftoepdf.w |
38 |
++++ b/texk/web2c/luatexdir/image/pdftoepdf.w |
39 |
+@@ -29,7 +29,7 @@ |
40 |
+ the functions of poppler, which happens to be written in C++. |
41 |
+ */ |
42 |
+ |
43 |
+-extern void md5(Guchar *msg, int msgLen, Guchar *digest); |
44 |
++extern void md5(unsigned char *msg, int msgLen, unsigned char *digest); |
45 |
+ |
46 |
+ static bool isInit = false; |
47 |
+ |
48 |
+diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc |
49 |
+index 6b24a39b..87078fc5 100644 |
50 |
+--- a/texk/web2c/luatexdir/lua/lepdflib.cc |
51 |
++++ b/texk/web2c/luatexdir/lua/lepdflib.cc |
52 |
+@@ -2867,12 +2867,12 @@ m_poppler_get_GUINT(Attribute,getRevision); |
53 |
+ |
54 |
+ static int m_Attribute_setRevision(lua_State * L) |
55 |
+ { |
56 |
+- Guint i; |
57 |
++ unsigned int i; |
58 |
+ udstruct *uin; |
59 |
+ uin = (udstruct *) luaL_checkudata(L, 1, M_Attribute); |
60 |
+ if (uin->pd != NULL && uin->pd->pc != uin->pc) |
61 |
+ pdfdoc_changed_error(L); |
62 |
+- i = (Guint) luaL_checkint(L, 2); |
63 |
++ i = (unsigned int) luaL_checkint(L, 2); |
64 |
+ ((Attribute *) uin->d)->setRevision(i); |
65 |
+ return 0; |
66 |
+ } |
67 |
+@@ -3057,12 +3057,12 @@ static int m_StructElement_getTypeName(lua_State * L) |
68 |
+ |
69 |
+ static int m_StructElement_setRevision(lua_State * L) |
70 |
+ { |
71 |
+- Guint i; |
72 |
++ unsigned int i; |
73 |
+ udstruct *uin; |
74 |
+ uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement); |
75 |
+ if (uin->pd != NULL && uin->pd->pc != uin->pc) |
76 |
+ pdfdoc_changed_error(L); |
77 |
+- i = (Guint) luaL_checkint(L, 2); |
78 |
++ i = (unsigned int) luaL_checkint(L, 2); |
79 |
+ ((StructElement *) uin->d)->setRevision(i); |
80 |
+ return 0; |
81 |
+ } |
82 |
+diff --git a/texk/web2c/pdftexdir/pdftosrc.cc b/texk/web2c/pdftexdir/pdftosrc.cc |
83 |
+index bad1b78f..295c4e66 100644 |
84 |
+--- a/texk/web2c/pdftexdir/pdftosrc.cc |
85 |
++++ b/texk/web2c/pdftexdir/pdftosrc.cc |
86 |
+@@ -156,7 +156,7 @@ int main(int argc, char *argv[]) |
87 |
+ Object objStr, obj1, obj2; |
88 |
+ int nObjects, first, n; |
89 |
+ int localOffset = 0; |
90 |
+- Guint firstOffset; |
91 |
++ unsigned int firstOffset; |
92 |
+ |
93 |
+ objStr = xref->fetch(e->offset, 0); |
94 |
+ assert(objStr.isStream()); |
95 |
+-- |
96 |
+2.20.1 |
97 |
+ |
98 |
|
99 |
diff --git a/app-text/texlive-core/texlive-core-2017-r4.ebuild b/app-text/texlive-core/texlive-core-2017-r4.ebuild |
100 |
index 6c88e065080..e0cf232cbf4 100644 |
101 |
--- a/app-text/texlive-core/texlive-core-2017-r4.ebuild |
102 |
+++ b/app-text/texlive-core/texlive-core-2017-r4.ebuild |
103 |
@@ -167,7 +167,7 @@ src_prepare() { |
104 |
epatch "${FILESDIR}/${P}-poppler064.patch" |
105 |
|
106 |
if has_version ">=app-text/poppler-0.69.0"; then |
107 |
- epatch "${FILESDIR}"/${P}-poppler0{69,71,72}.patch # bug #672854 |
108 |
+ epatch "${FILESDIR}"/${P}-poppler0{69,71,72,73}.patch # bugs #672854, 675448 |
109 |
fi |
110 |
|
111 |
sed -i \ |