diff options
author | minskim <minskim> | 2013-11-17 17:02:09 +0000 |
---|---|---|
committer | minskim <minskim> | 2013-11-17 17:02:09 +0000 |
commit | bec400baa0ea079dd08f0bcfcb52f6af951c7c4e (patch) | |
tree | 24d23a7d961d981690cf56d264c0d0ff37aa8dd6 | |
parent | e6573e78fb9e741ef8f043f9ee4e706f389f664a (diff) | |
download | pkgsrc-bec400baa0ea079dd08f0bcfcb52f6af951c7c4e.tar.gz |
Update luatex to 0.76.0.
Changes since 0.70.1:
* Metapost 1.801.
* Small patches from TeXLive 2013, as well as an update to the
latest libraries (libpng, poppler, etc.)
* Speed up printing (of TeX strings) to the terminal and log.
* New lua function node.end_of_math().
* Fixed a memory leak in the lua function pdfscanner.scan().
* New expandable primitive \Uchar.
* New version of lnodelib.c with speedups by Hans and Luigi.
Also added some extra sanity checks to the Lua node field
setting functions.
* Support 'umath' in tex.extraprimitives(), so that formats can
make the \Umath* primitives unprefixed, now that they will be
provided by XeTeX as well.
* Removed a bunch of deprecated primitives
* \AlephVersion, \Alephrevision, \Alephversion, \Alephminorversion
* \OmegaVersion, \Omegarevision, \Omegaversion, \Omegaminorversion
* \omathcode, \odelcode, \omathchardef, \omathchar, \omathaccent,
\odelimiter, \oradical
* \Umathbotaccent, \Umathaccents
* Fix large file support.
* Fix Lua's loadfile().
* Removed the cidmap callbacks again (let that be done by user lua
code after the fact).
* Removed the fatal error on fonts where num_glyphs is too high,
as that problem is actually harmless.
* Some compilation issues under Win32 and Solaris resolved.
* Allow math extender objects to be zero width.
* The 'epdf' library has been extended to deal with finding and
saving embedded files (catalog:numEmbeddedFiles() and catalog:
embeddedFile, new EmbFile object).
* lua 5.2
There are no patches to the core Lua files; a future version
of luatex will switch to loading the regular lua 5.2 dynamic
library instead of depending on a statically compiled
one.
* A bleeding-edge version of luasocket is included, as there
is no 5.2-compatible official release yet.
* A new lua extension is the two-argument version of
string.dump from Luajit.
* Two new callbacks: find_cidmap_file and load_cidmap_file
* update various used libraries.
* new 'pdfscanner' lua library.
* various OpenType math fixes, including \Umathcharnumdef.
* improved placement of bottom accents.
* various other small fixes.
-rw-r--r-- | print/luatex/Makefile | 30 | ||||
-rw-r--r-- | print/luatex/distinfo | 15 | ||||
-rw-r--r-- | print/luatex/patches/patch-aa | 13 | ||||
-rw-r--r-- | print/luatex/patches/patch-ab | 8 | ||||
-rw-r--r-- | print/luatex/patches/patch-ac | 34 | ||||
-rw-r--r-- | print/luatex/patches/patch-ad | 170 | ||||
-rw-r--r-- | print/luatex/patches/patch-texk_web2c_luatexdir_luatex.c | 12 |
7 files changed, 41 insertions, 241 deletions
diff --git a/print/luatex/Makefile b/print/luatex/Makefile index be795a74133..61696ea3234 100644 --- a/print/luatex/Makefile +++ b/print/luatex/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.25 2013/08/22 09:21:58 prlw1 Exp $ +# $NetBSD: Makefile,v 1.26 2013/11/17 17:02:09 minskim Exp $ -DISTNAME= luatex-beta-0.70.1 +DISTNAME= luatex-beta-0.76.0-source PKGNAME= ${DISTNAME:S/-beta//:S/-source//} -PKGREVISION= 11 CATEGORIES= print -MASTER_SITES= http://foundry.supelec.fr/gf/download/frsrelease/392/1730/ +MASTER_SITES= https://foundry.supelec.fr/frs/download.php/file/15745/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= minskim@NetBSD.org @@ -23,7 +22,8 @@ USE_LIBTOOL= yes USE_TOOLS+= gmake pkg-config WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//}/source -CONFIGURE_ARGS+=--enable-cxx-runtime-hack \ +CONFIGURE_ARGS+=--enable-build-in-source-tree \ + --enable-cxx-runtime-hack \ --disable-afm2pl \ --disable-aleph \ --disable-bibtex \ @@ -86,21 +86,17 @@ CONFIGURE_ARGS+=--enable-cxx-runtime-hack \ --disable-native-texlive-build \ --disable-shared \ --disable-largefile +CONFIGURE_ARGS+=--with-system-cairo CONFIGURE_ARGS+=--with-system-kpathsea \ --with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \ --with-kpathsea-libdir=${BUILDLINK_PREFIX.kpathsea}/lib -CONFIGURE_ARGS+=--with-system-libpng \ - --with-libpng-include=${BUILDLINK_PREFIX.png}/include \ - --with-libpng-libdir=${BUILDLINK_PREFIX.png}/lib +CONFIGURE_ARGS+=--with-system-libpng +CONFIGURE_ARGS+=--with-system-pixman +CONFIGURE_ARGS+=--with-system-poppler CONFIGURE_ARGS+=--with-system-zlib \ --with-zlib-include=${BUILDLINK_PREFIX.zlib}/include \ --with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib -CONFIGURE_ARGS+=--with-system-zziplib \ - --with-zziplib-include=${BUILDLINK_PREFIX.zziplib}/include \ - --with-zziplib-libdir=${BUILDLINK_PREFIX.zziplib}/lib -CONFIGURE_ARGS+=--with-system-poppler \ - --with-poppler-include=${BUILDLINK_PREFIX.poppler}/include \ - --with-poppler-libdir=${BUILDLINK_PREFIX.poppler}/lib +CONFIGURE_ARGS+=--with-system-zziplib CONFIGURE_DIRS+=. texk/web2c MAKE_FLAGS+= LIBTOOL=${LIBTOOL:Q} @@ -113,15 +109,17 @@ INSTALLATION_DIRS+= bin .include "../../archivers/zziplib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../print/kpathsea/buildlink3.mk" .include "../../print/poppler-includes/buildlink3.mk" .include "../../print/poppler/buildlink3.mk" -.include "../../graphics/freetype2/buildlink3.mk" +.include "../../x11/pixman/buildlink3.mk" post-extract: + ${RM} -rf ${WRKSRC}/libs/zziplib ${RM} -rf ${WRKSRC}/texk/kpathsea - ${ECHO} '#define luatex_svn_revision 4279' \ + ${ECHO} '#define luatex_svn_revision 4630' \ > ${WRKSRC}/texk/web2c/luatexdir/luatex_svnversion.h do-install: diff --git a/print/luatex/distinfo b/print/luatex/distinfo index a98b36a3f69..abc5e0f6fd4 100644 --- a/print/luatex/distinfo +++ b/print/luatex/distinfo @@ -1,10 +1,7 @@ -$NetBSD: distinfo,v 1.11 2013/03/24 17:00:29 spz Exp $ +$NetBSD: distinfo,v 1.12 2013/11/17 17:02:09 minskim Exp $ -SHA1 (luatex-beta-0.70.1.tar.bz2) = 063bd698daab38ac6b04b45c820a15a0423aaab5 -RMD160 (luatex-beta-0.70.1.tar.bz2) = dfa3710bb48ba5d73ae5e41746d7c1a3a965f619 -Size (luatex-beta-0.70.1.tar.bz2) = 8181155 bytes -SHA1 (patch-aa) = 738c8bd631db36671d2c4eb48a360b7a16186c64 -SHA1 (patch-ab) = ee8ad45e980e655702925a164ee0ce6dd1689366 -SHA1 (patch-ac) = 52211165bd6d05e4f8ce4d6280f5091280623d75 -SHA1 (patch-ad) = 8342a32d0196e0b9287aee269a4bbe00d04edb8a -SHA1 (patch-texk_web2c_luatexdir_luatex.c) = 2b5e37e3c0fa1d42fc5782eec562bbc0040d1404 +SHA1 (luatex-beta-0.76.0-source.tar.bz2) = f139e728a16ae332ce323e28e19940169540e549 +RMD160 (luatex-beta-0.76.0-source.tar.bz2) = 7eec8c90ea21b4db70a0b6b6e874e96732822fd1 +Size (luatex-beta-0.76.0-source.tar.bz2) = 11748576 bytes +SHA1 (patch-ab) = e3ba0d662c1e7a4b716f63661328c5ba5d4701ca +SHA1 (patch-ac) = 00415c239481faf0477a2e92a0f5180a38a5d9b7 diff --git a/print/luatex/patches/patch-aa b/print/luatex/patches/patch-aa deleted file mode 100644 index d40f761a707..00000000000 --- a/print/luatex/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2009/08/11 20:25:22 minskim Exp $ - ---- texk/web2c/luatexdir/luasocket/src/usocket.c.orig 2009-06-03 13:07:38.000000000 +0000 -+++ texk/web2c/luatexdir/luasocket/src/usocket.c -@@ -13,7 +13,7 @@ - - #include "socket.h" - --#if defined(__sun__) -+#if defined(__sun__) || defined(__sun) - #define HSTRERROR(A) "unknown host error" - #else - #define HSTRERROR(A) hstrerror(A) diff --git a/print/luatex/patches/patch-ab b/print/luatex/patches/patch-ab index ee5267811d4..60cf9211ed5 100644 --- a/print/luatex/patches/patch-ab +++ b/print/luatex/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2011/07/28 04:37:32 minskim Exp $ +$NetBSD: patch-ab,v 1.3 2013/11/17 17:02:09 minskim Exp $ ---- texk/web2c/Makefile.in.orig 2011-05-19 05:39:16.000000000 +0000 +--- texk/web2c/Makefile.in.orig 2013-04-05 10:58:38.000000000 +0000 +++ texk/web2c/Makefile.in -@@ -37,7 +37,7 @@ host_triplet = @host@ +@@ -53,7 +53,7 @@ host_triplet = @host@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEEXT) \ mf-nowin$(EXEEXT) mpost$(EXEEXT) luatex$(EXEEXT) \ txt2zlib$(EXEEXT) @@ -10,4 +10,4 @@ $NetBSD: patch-ab,v 1.2 2011/07/28 04:37:32 minskim Exp $ +bin_PROGRAMS = $(am__EXEEXT_2) \ ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_3) \ $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \ - $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \ + $(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) diff --git a/print/luatex/patches/patch-ac b/print/luatex/patches/patch-ac index 5e3b9ef12d0..abf9c046de6 100644 --- a/print/luatex/patches/patch-ac +++ b/print/luatex/patches/patch-ac @@ -1,22 +1,22 @@ -$NetBSD: patch-ac,v 1.2 2012/08/14 11:36:25 obache Exp $ +$NetBSD: patch-ac,v 1.3 2013/11/17 17:02:09 minskim Exp $ ---- texk/web2c/luatexdir/lua51/luaconf.h.orig 2011-05-19 05:38:38.000000000 +0000 -+++ texk/web2c/luatexdir/lua51/luaconf.h -@@ -100,7 +100,7 @@ - ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" +--- texk/web2c/luatexdir/lua52/luaconf.h.orig 2013-04-05 10:58:37.000000000 +0000 ++++ texk/web2c/luatexdir/lua52/luaconf.h +@@ -102,7 +102,7 @@ + #else /* }{ */ - #else + #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/" -#define LUA_ROOT "/usr/local/" -+#define LUA_ROOT "@PREFIX@/" - #define LUA_LDIR LUA_ROOT "share/lua/5.1/" - #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" ++#define LUA_ROOT "@PREFIX@" + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR #define LUA_PATH_DEFAULT \ -@@ -189,7 +189,7 @@ - #define LUAI_DATA /* empty */ - - #elif defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \ -- defined(__ELF__) -+ defined(__ELF__) && !defined(__sun__) +@@ -177,7 +177,7 @@ + ** default definition. + */ + #if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \ +- defined(__ELF__) /* { */ ++ defined(__ELF__) && !defined(__sun__) /* { */ #define LUAI_FUNC __attribute__((visibility("hidden"))) extern - #define LUAI_DATA LUAI_FUNC - + #define LUAI_DDEC LUAI_FUNC + #define LUAI_DDEF /* empty */ diff --git a/print/luatex/patches/patch-ad b/print/luatex/patches/patch-ad deleted file mode 100644 index 6f10b2d4d54..00000000000 --- a/print/luatex/patches/patch-ad +++ /dev/null @@ -1,170 +0,0 @@ -$NetBSD: patch-ad,v 1.5 2013/03/24 17:00:30 spz Exp $ - -Fix build with poppler-0.22 - ---- 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, (int) 0, - (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); diff --git a/print/luatex/patches/patch-texk_web2c_luatexdir_luatex.c b/print/luatex/patches/patch-texk_web2c_luatexdir_luatex.c deleted file mode 100644 index 3bfe5f69792..00000000000 --- a/print/luatex/patches/patch-texk_web2c_luatexdir_luatex.c +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-texk_web2c_luatexdir_luatex.c,v 1.1 2012/07/10 22:35:10 minskim Exp $ - ---- texk/web2c/luatexdir/luatex.c.orig 2011-05-19 05:39:15.000000000 +0000 -+++ texk/web2c/luatexdir/luatex.c -@@ -32,7 +32,6 @@ const char *engine_name = "luatex"; - #include <kpathsea/readable.h> - #include <kpathsea/variable.h> - #include <kpathsea/absolute.h> --#include <kpathsea/recorder.h> - #ifdef WIN32 - #include <kpathsea/concatn.h> - #endif |