diff options
author | drochner <drochner@pkgsrc.org> | 2012-07-04 20:30:22 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2012-07-04 20:30:22 +0000 |
commit | fa276da06a020a2522066450cc62e514d090ea3c (patch) | |
tree | 06528ec39b14b7d16bf286b51bb61fee0bda03c0 /print/luatex | |
parent | 59a1b71f59a6b92b772826bec1534b30c97ce2e8 (diff) | |
download | pkgsrc-fa276da06a020a2522066450cc62e514d090ea3c.tar.gz |
make this build with poppler-0.20, bump PKGREV
Diffstat (limited to 'print/luatex')
-rw-r--r-- | print/luatex/Makefile | 4 | ||||
-rw-r--r-- | print/luatex/distinfo | 3 | ||||
-rw-r--r-- | print/luatex/patches/patch-ad | 168 |
3 files changed, 172 insertions, 3 deletions
diff --git a/print/luatex/Makefile b/print/luatex/Makefile index 53e7b1f122a..732b36c0abf 100644 --- a/print/luatex/Makefile +++ b/print/luatex/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2011/11/01 06:02:25 sbd Exp $ +# $NetBSD: Makefile,v 1.14 2012/07/04 20:31:56 drochner Exp $ DISTNAME= luatex-beta-0.70.1 PKGNAME= ${DISTNAME:S/-beta//:S/-source//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= print MASTER_SITES= http://foundry.supelec.fr/gf/download/frsrelease/392/1730/ EXTRACT_SUFX= .tar.bz2 diff --git a/print/luatex/distinfo b/print/luatex/distinfo index 06ed58ddf12..906446aecdf 100644 --- a/print/luatex/distinfo +++ b/print/luatex/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2011/07/28 04:37:32 minskim Exp $ +$NetBSD: distinfo,v 1.7 2012/07/04 20:31:56 drochner Exp $ SHA1 (luatex-beta-0.70.1.tar.bz2) = 063bd698daab38ac6b04b45c820a15a0423aaab5 RMD160 (luatex-beta-0.70.1.tar.bz2) = dfa3710bb48ba5d73ae5e41746d7c1a3a965f619 @@ -6,3 +6,4 @@ Size (luatex-beta-0.70.1.tar.bz2) = 8181155 bytes SHA1 (patch-aa) = 738c8bd631db36671d2c4eb48a360b7a16186c64 SHA1 (patch-ab) = ee8ad45e980e655702925a164ee0ce6dd1689366 SHA1 (patch-ac) = 23d6c26c4ded11267f05730119c250a831cd53ff +SHA1 (patch-ad) = 6627c3c15de46550d1bb285d10bbaf405a828bc8 diff --git a/print/luatex/patches/patch-ad b/print/luatex/patches/patch-ad new file mode 100644 index 00000000000..b3bd0078685 --- /dev/null +++ b/print/luatex/patches/patch-ad @@ -0,0 +1,168 @@ +$NetBSD: patch-ad,v 1.3 2012/07/04 20:31:56 drochner Exp $ + +--- texk/web2c/luatexdir/lua/lepdflib.cc.orig 2011-05-19 05:38:37.000000000 +0000 ++++ texk/web2c/luatexdir/lua/lepdflib.cc +@@ -89,7 +89,9 @@ new_poppler_userdata(AnnotBorder); + new_poppler_userdata(Annots); + new_poppler_userdata(Array); + new_poppler_userdata(Catalog); ++#if 0 + new_poppler_userdata(EmbFile); ++#endif + new_poppler_userdata(Dict); + //new_poppler_userdata(GooString); + new_poppler_userdata(LinkDest); +@@ -152,7 +154,7 @@ static int l_new_Annot(lua_State * L) + pdfdoc_changed_error(L); + uout = new_Annot_userdata(L); + uout->d = +- new Annot((XRef *) uxref->d, (Dict *) udict->d, (Catalog *) ucatalog->d, ++ new Annot((PDFDoc *) uxref->d, (Dict *) udict->d, + (Object *) uref->d); + uout->atype = ALLOC_LEPDF; + uout->pc = uxref->pc; +@@ -174,7 +176,7 @@ static int l_new_Annots(lua_State * L) + pdfdoc_changed_error(L); + uout = new_Annots_userdata(L); + uout->d = +- new Annots((XRef *) uxref->d, (Catalog *) ucatalog->d, ++ new Annots((PDFDoc *) uxref->d, + (Object *) uannotsobj->d); + uout->atype = ALLOC_LEPDF; + uout->pc = uxref->pc; +@@ -364,7 +366,7 @@ static int m_##type##__tostring(lua_Stat + // Annot + + m_poppler_get_BOOL(Annot, isOk); +-m_poppler_get_OBJECT(Annot, getAppearance); ++m_poppler_get_OBJECT(Annot, getAppearanceResDict); + m_poppler_get_poppler(Annot, AnnotBorder, getBorder); + + static int m_Annot_match(lua_State * L) +@@ -393,13 +395,17 @@ static int m_Annot__gc(lua_State * L) + printf("\n===== Annot GC ===== uin=<%p>\n", uin); + #endif + if (uin->atype == ALLOC_LEPDF) ++#if 0 + delete(Annot *) uin->d; ++#else ++ ((Annot *) uin->d)->decRefCnt(); ++#endif + return 0; + } + + static const struct luaL_Reg Annot_m[] = { + {"isOk", m_Annot_isOk}, +- {"getAppearance", m_Annot_getAppearance}, ++ {"getAppearance", m_Annot_getAppearanceResDict}, + {"getBorder", m_Annot_getBorder}, + {"match", m_Annot_match}, + {"__tostring", m_Annot__tostring}, +@@ -410,6 +416,8 @@ static const struct luaL_Reg Annot_m[] = + //********************************************************************** + // AnnotBorderStyle + ++#if 0 ++ + m_poppler_get_DOUBLE(AnnotBorderStyle, getWidth); + + m_poppler__tostring(AnnotBorderStyle); +@@ -435,6 +443,8 @@ static const struct luaL_Reg AnnotBorder + {NULL, NULL} // sentinel + }; + ++#endif ++ + //********************************************************************** + // Annots + +@@ -684,6 +694,7 @@ static int m_Catalog_findDest(lua_State + m_poppler_get_poppler(Catalog, Object, getDests); + m_poppler_get_INT(Catalog, numEmbeddedFiles); + ++#if 0 + static int m_Catalog_embeddedFile(lua_State * L) + { + EmbFile *ef; +@@ -707,6 +718,7 @@ static int m_Catalog_embeddedFile(lua_St + lua_pushnil(L); + return 1; + } ++#endif + + m_poppler_get_INT(Catalog, numJS); + +@@ -749,7 +761,9 @@ static const struct luaL_Reg Catalog_m[] + {"findDest", m_Catalog_findDest}, + {"getDests", m_Catalog_getDests}, + {"numEmbeddedFiles", m_Catalog_numEmbeddedFiles}, ++#if 0 + {"embeddedFile", m_Catalog_embeddedFile}, ++#endif + {"numJS", m_Catalog_numJS}, + {"getJS", m_Catalog_getJS}, + {"getOutline", m_Catalog_getOutline}, +@@ -761,6 +775,8 @@ static const struct luaL_Reg Catalog_m[] + //********************************************************************** + // EmbFile + ++#if 0 ++ + m_poppler_get_GOOSTRING(EmbFile, name); + m_poppler_get_GOOSTRING(EmbFile, description); + m_poppler_get_INT(EmbFile, size); +@@ -801,6 +817,8 @@ static const struct luaL_Reg EmbFile_m[] + {NULL, NULL} // sentinel + }; + ++#endif ++ + //********************************************************************** + // Dict + +@@ -1347,7 +1365,7 @@ static int m_Object_getType(lua_State * + + static int m_Object_getTypeName(lua_State * L) + { +- char *s; ++ const char *s; + udstruct *uin; + uin = (udstruct *) luaL_checkudata(L, 1, M_Object); + if (uin->pd != NULL && uin->pd->pc != uin->pc) +@@ -2034,7 +2052,7 @@ static int m_Page_getLinks(lua_State * L + if ((uin->pd != NULL && uin->pd->pc != uin->pc) + || (ucat->pd != NULL && ucat->pd->pc != ucat->pd->pc)) + pdfdoc_changed_error(L); +- links = ((Page *) uin->d)->getLinks((Catalog *) ucat->d); ++ links = ((Page *) uin->d)->getLinks(); + if (links != NULL) { + uout = new_Links_userdata(L); + uout->d = links; +@@ -2629,7 +2647,10 @@ m_poppler_get_INT(XRef, getNumObjects); + m_poppler_get_INT(XRef, getRootNum); + m_poppler_get_INT(XRef, getRootGen); + // getStreamEnd +-m_poppler_get_INT(XRef, getSize); ++static int m_XRef_getSize(lua_State * L) ++{ ++ return m_XRef_getNumObjects(L); ++} + // getEntry + m_poppler_get_poppler(XRef, Object, getTrailerDict); + +@@ -2683,11 +2704,15 @@ int luaopen_epdf(lua_State * L) + { + register_meta(Annot); + // TODO register_meta(AnnotBorder); ++#if 0 + register_meta(AnnotBorderStyle); ++#endif + register_meta(Annots); + register_meta(Array); + register_meta(Catalog); ++#if 0 + register_meta(EmbFile); ++#endif + register_meta(Dict); + register_meta(GooString); + register_meta(LinkDest); |