Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-tex/luatex/files: poppler020.patch
Date: Mon, 09 Jul 2012 13:15:31
Message-Id: 20120709131520.8343E20065@flycatcher.gentoo.org
1 aballier 12/07/09 13:15:20
2
3 Added: poppler020.patch
4 Log:
5 fix build with poppler 0.20, by Rafał Mużyło, bug #416545
6
7 (Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 dev-tex/luatex/files/poppler020.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tex/luatex/files/poppler020.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tex/luatex/files/poppler020.patch?rev=1.1&content-type=text/plain
14
15 Index: poppler020.patch
16 ===================================================================
17 https://bugs.gentoo.org/show_bug.cgi?id=416545
18 build with poppler-0.20 by Rafał Mużyło
19
20 --- source/texk/web2c/luatexdir/lua/lepdflib.cc 2012-05-18 16:23:53.000000000 +0200
21 +++ source/texk/web2c/luatexdir/lua/lepdflib.cc 2012-05-18 17:43:12.959843483 +0200
22 @@ -151,7 +151,7 @@ static int l_new_Annot(lua_State * L)
23 pdfdoc_changed_error(L);
24 uout = new_Annot_userdata(L);
25 uout->d =
26 - new Annot((XRef *) uxref->d, (Dict *) udict->d, (Catalog *) ucatalog->d,
27 + new Annot(udict->pd->doc, (Dict *) udict->d,
28 (Object *) uref->d);
29 uout->atype = ALLOC_LEPDF;
30 uout->pc = uxref->pc;
31 @@ -173,7 +173,7 @@ static int l_new_Annots(lua_State * L)
32 pdfdoc_changed_error(L);
33 uout = new_Annots_userdata(L);
34 uout->d =
35 - new Annots((XRef *) uxref->d, (Catalog *) ucatalog->d,
36 + new Annots(uannotsobj->pd->doc,
37 (Object *) uannotsobj->d);
38 uout->atype = ALLOC_LEPDF;
39 uout->pc = uxref->pc;
40 @@ -363,7 +363,7 @@ static int m_##type##__tostring(lua_Stat
41 // Annot
42
43 m_poppler_get_BOOL(Annot, isOk);
44 -m_poppler_get_OBJECT(Annot, getAppearance);
45 +m_poppler_get_OBJECT(Annot, getAppearanceResDict);
46 m_poppler_get_poppler(Annot, AnnotBorder, getBorder);
47
48 static int m_Annot_match(lua_State * L)
49 @@ -398,7 +398,7 @@ static int m_Annot__gc(lua_State * L)
50
51 static const struct luaL_Reg Annot_m[] = {
52 {"isOk", m_Annot_isOk},
53 - {"getAppearance", m_Annot_getAppearance},
54 + {"getAppearanceResDict", m_Annot_getAppearanceResDict},
55 {"getBorder", m_Annot_getBorder},
56 {"match", m_Annot_match},
57 {"__tostring", m_Annot__tostring},
58 @@ -1249,7 +1249,7 @@ static int m_Object_getType(lua_State *
59
60 static int m_Object_getTypeName(lua_State * L)
61 {
62 - char *s;
63 + const char *s;
64 udstruct *uin;
65 uin = (udstruct *) luaL_checkudata(L, 1, M_Object);
66 if (uin->pd != NULL && uin->pd->pc != uin->pc)
67 @@ -1936,7 +1936,7 @@ static int m_Page_getLinks(lua_State * L
68 if ((uin->pd != NULL && uin->pd->pc != uin->pc)
69 || (ucat->pd != NULL && ucat->pd->pc != ucat->pd->pc))
70 pdfdoc_changed_error(L);
71 - links = ((Page *) uin->d)->getLinks((Catalog *) ucat->d);
72 + links = ((Page *) uin->d)->getLinks();
73 if (links != NULL) {
74 uout = new_Links_userdata(L);
75 uout->d = links;
76 @@ -2531,7 +2531,6 @@ m_poppler_get_INT(XRef, getNumObjects);
77 m_poppler_get_INT(XRef, getRootNum);
78 m_poppler_get_INT(XRef, getRootGen);
79 // getStreamEnd
80 -m_poppler_get_INT(XRef, getSize);
81 // getEntry
82 m_poppler_get_poppler(XRef, Object, getTrailerDict);
83
84 @@ -2558,7 +2557,6 @@ static const struct luaL_Reg XRef_m[] =
85 {"getRootNum", m_XRef_getRootNum},
86 {"getRootGen", m_XRef_getRootGen},
87 //
88 - {"getSize", m_XRef_getSize},
89 {"getTrailerDict", m_XRef_getTrailerDict},
90 {"__tostring", m_XRef__tostring},
91 {NULL, NULL} // sentinel