[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#651169: marked as done (luatex: Patch for porting to poppler 0.18)



Your message dated Wed, 21 Mar 2012 14:53:40 +0000
with message-id <E1SAMuy-0007ZE-6a@franck.debian.org>
and subject line Bug#651169: fixed in luatex 0.70.1-2
has caused the Debian Bug report #651169,
regarding luatex: Patch for porting to poppler 0.18
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
651169: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=651169
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: luatex
Version: 0.70.1-1
Severity: normal
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Dear Maintainer,

In http://bugs.debian.org/644447 there is some discussion about
updating poppler to 0.18 in Debian. This will cause some FTBFS. We are
doing the transition in Ubuntu now and want to forward patches so that
they are readily available in Ubuntu once 0.18 lands there.

This patch updates luatex to remove the aspects of the poppler API that
are not present in 0.18 and was taken from Gentoo -see 
https://bugs.gentoo.org/384875 for more details.

Thanks for considering the patch.


- -- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-2-generic (SMP w/8 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJO3g7iAAoJEL/srsug59jDqHQQAJt+xCOXhz6ZgItQ/5r8eMPt
CMLIlqd0yHvnpWxOIw0hhDoeg1aRXHvI1WbzxA+vAPQFxBfVKYThn6XpbKF/E6zR
Nuv8Es2XuLOufYqjxugLI+S3Y4BEKoglUNou8nrTIbm+UhR/wB2jOzXknojis/VM
e8VvfcMU5d7RJVsSkM5+rx5HAMZywGDmeESC/IE6BTviYvWJXgf4L3YV36bk+yVa
3wk5TbWO1IpaMsm9v0rpaD14u+hlucL7iyu8nJ6xH53CbTpcHHLW1uZY3d6vQ9sv
G6H8u2MDJeaI4S4ireJ4Tahq/D1bmo7Gjuie/+8xyDucU1uRZeTQgr21c51vvlDF
KfEzVIx/NOH9U3g0dSbOfWUDbxHWMW9u9bnsNf1VHW4N39hmm1DJNy8tK/W7DjEP
mlqFIzYEhl6GiEihRfdXSb5azwshZHG5Ypf+4G7fnBcSyNU2gQTGpAd4zjsKqFri
0mYacuNcAZCugMmKJxsFM3prvgDp9yrx4DNS9bEH92nGFMsyJV9OAT6rSHUFF4V7
eiHbXy4b39t9VxHRMrdGopR91FUIPGRdze0gJ/dc7rS6MGxq8jzoHfW0t2WYA5Vp
0VxqdoP7VPKZklt1iUdOhhAt1f4Nrq0LqcWEMGR/eNzzy8eQvQxPClGyxViIKj59
2Ne4Y5c+/gt+fvmHQgDQ
=71zL
-----END PGP SIGNATURE-----
diff -Nru luatex-0.70.1/debian/patches/poppler-0.18.patch luatex-0.70.1/debian/patches/poppler-0.18.patch
--- luatex-0.70.1/debian/patches/poppler-0.18.patch	1970-01-01 01:00:00.000000000 +0100
+++ luatex-0.70.1/debian/patches/poppler-0.18.patch	2011-12-06 12:32:29.000000000 +0000
@@ -0,0 +1,164 @@
+Description:Make luatex compile against poppler 0.18.0 (only).
+ API which has been removed from poppler will be removed from the LUA
+ bindings as well.  Replacement API isn't added by this patch.
+Author: Martin von Gagern
+Origin: https://bugs.gentoo.org/384875
+
+Index: luatex-0.70.1/source/texk/web2c/luatexdir/lua/lepdflib.cc
+===================================================================
+--- luatex-0.70.1.orig/source/texk/web2c/luatexdir/lua/lepdflib.cc	2011-12-06 12:28:06.645042508 +0000
++++ luatex-0.70.1/source/texk/web2c/luatexdir/lua/lepdflib.cc	2011-12-06 12:31:48.281621143 +0000
+@@ -89,7 +89,6 @@
+ new_poppler_userdata(Annots);
+ new_poppler_userdata(Array);
+ new_poppler_userdata(Catalog);
+-new_poppler_userdata(EmbFile);
+ new_poppler_userdata(Dict);
+ //new_poppler_userdata(GooString);
+ new_poppler_userdata(LinkDest);
+@@ -393,7 +392,7 @@
+     printf("\n===== Annot GC ===== uin=<%p>\n", uin);
+ #endif
+     if (uin->atype == ALLOC_LEPDF)
+-        delete(Annot *) uin->d;
++        ((Annot *) uin->d)->decRefCnt();
+     return 0;
+ }
+ 
+@@ -408,34 +407,6 @@
+ };
+ 
+ //**********************************************************************
+-// AnnotBorderStyle
+-
+-m_poppler_get_DOUBLE(AnnotBorderStyle, getWidth);
+-
+-m_poppler__tostring(AnnotBorderStyle);
+-
+-static int m_Annots__gc(lua_State * L)
+-{
+-    udstruct *uin;
+-    uin = (udstruct *) luaL_checkudata(L, 1, M_Annots);
+-    if (uin->pd != NULL && uin->pd->pc != uin->pc)
+-        pdfdoc_changed_error(L);
+-#ifdef DEBUG
+-    printf("\n===== Annots GC ===== uin=<%p>\n", uin);
+-#endif
+-    if (uin->atype == ALLOC_LEPDF)
+-        delete(Annots *) uin->d;
+-    return 0;
+-}
+-
+-static const struct luaL_Reg AnnotBorderStyle_m[] = {
+-    {"getWidth", m_AnnotBorderStyle_getWidth},
+-    {"__tostring", m_AnnotBorderStyle__tostring},
+-    {"__gc", m_Annots__gc},
+-    {NULL, NULL}                // sentinel
+-};
+-
+-//**********************************************************************
+ // Annots
+ 
+ m_poppler_get_INT(Annots, getNumAnnots);
+@@ -683,31 +654,6 @@
+ 
+ m_poppler_get_poppler(Catalog, Object, getDests);
+ m_poppler_get_INT(Catalog, numEmbeddedFiles);
+-
+-static int m_Catalog_embeddedFile(lua_State * L)
+-{
+-    EmbFile *ef;
+-    int i, len;
+-    udstruct *uin, *uout;
+-    uin = (udstruct *) luaL_checkudata(L, 1, M_Catalog);
+-    if (uin->pd != NULL && uin->pd->pc != uin->pc)
+-        pdfdoc_changed_error(L);
+-    i = luaL_checkint(L, 2);
+-    len = ((Catalog *) uin->d)->numEmbeddedFiles();
+-    if (i > 0 && i <= len) {
+-        ef = ((Catalog *) uin->d)->embeddedFile(i - 1);
+-        if (ef != NULL) {
+-            uout = new_EmbFile_userdata(L);
+-            uout->d = ef;
+-            uout->pc = uin->pc;
+-            uout->pd = uin->pd;
+-        } else
+-            lua_pushnil(L);
+-    } else
+-        lua_pushnil(L);
+-    return 1;
+-}
+-
+ m_poppler_get_INT(Catalog, numJS);
+ 
+ static int m_Catalog_getJS(lua_State * L)
+@@ -749,7 +695,6 @@
+     {"findDest", m_Catalog_findDest},
+     {"getDests", m_Catalog_getDests},
+     {"numEmbeddedFiles", m_Catalog_numEmbeddedFiles},
+-    {"embeddedFile", m_Catalog_embeddedFile},
+     {"numJS", m_Catalog_numJS},
+     {"getJS", m_Catalog_getJS},
+     {"getOutline", m_Catalog_getOutline},
+@@ -759,49 +704,6 @@
+ };
+ 
+ //**********************************************************************
+-// EmbFile
+-
+-m_poppler_get_GOOSTRING(EmbFile, name);
+-m_poppler_get_GOOSTRING(EmbFile, description);
+-m_poppler_get_INT(EmbFile, size);
+-m_poppler_get_GOOSTRING(EmbFile, modDate);
+-m_poppler_get_GOOSTRING(EmbFile, createDate);
+-m_poppler_get_GOOSTRING(EmbFile, checksum);
+-m_poppler_get_GOOSTRING(EmbFile, mimeType);
+-
+-static int m_EmbFile_streamObject(lua_State * L)
+-{
+-    udstruct *uin, *uout;
+-    uin = (udstruct *) luaL_checkudata(L, 1, M_EmbFile);
+-    if (uin->pd != NULL && uin->pd->pc != uin->pc)
+-        pdfdoc_changed_error(L);
+-    uout = new_Object_userdata(L);
+-    uout->d = new Object();     // automatic init to type "none"
+-    ((EmbFile *) uin->d)->streamObject().copy((Object *) uout->d);
+-    uout->pc = uin->pc;
+-    uout->pd = uin->pd;
+-    return 1;
+-}
+-
+-m_poppler_get_BOOL(EmbFile, isOk);
+-
+-m_poppler__tostring(EmbFile);
+-
+-static const struct luaL_Reg EmbFile_m[] = {
+-    {"name", m_EmbFile_name},
+-    {"description", m_EmbFile_description},
+-    {"size", m_EmbFile_size},
+-    {"modDate", m_EmbFile_modDate},
+-    {"createDate", m_EmbFile_createDate},
+-    {"checksum", m_EmbFile_checksum},
+-    {"mimeType", m_EmbFile_mimeType},
+-    {"streamObject", m_EmbFile_streamObject},
+-    {"isOk", m_EmbFile_isOk},
+-    {"__tostring", m_EmbFile__tostring},
+-    {NULL, NULL}                // sentinel
+-};
+-
+-//**********************************************************************
+ // Dict
+ 
+ static int m_Dict_incRef(lua_State * L)
+@@ -2683,11 +2585,9 @@
+ {
+     register_meta(Annot);
+     // TODO register_meta(AnnotBorder);
+-    register_meta(AnnotBorderStyle);
+     register_meta(Annots);
+     register_meta(Array);
+     register_meta(Catalog);
+-    register_meta(EmbFile);
+     register_meta(Dict);
+     register_meta(GooString);
+     register_meta(LinkDest);
diff -Nru luatex-0.70.1/debian/patches/series luatex-0.70.1/debian/patches/series
--- luatex-0.70.1/debian/patches/series	2011-05-20 01:40:33.000000000 +0100
+++ luatex-0.70.1/debian/patches/series	2011-12-06 12:27:45.000000000 +0000
@@ -23,3 +23,4 @@
 no_static_link.patch
 # included upstream
 #fix-luatex-build-with-old-libpng
+poppler-0.18.patch

--- End Message ---
--- Begin Message ---
Source: luatex
Source-Version: 0.70.1-2

We believe that the bug you reported is fixed in the latest version of
luatex, which is due to be installed in the Debian FTP archive:

luatex_0.70.1-2.debian.tar.gz
  to main/l/luatex/luatex_0.70.1-2.debian.tar.gz
luatex_0.70.1-2.dsc
  to main/l/luatex/luatex_0.70.1-2.dsc
luatex_0.70.1-2_amd64.deb
  to main/l/luatex/luatex_0.70.1-2_amd64.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 651169@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Norbert Preining <preining@debian.org> (supplier of updated luatex package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Wed, 21 Mar 2012 20:27:29 +0900
Source: luatex
Binary: luatex
Architecture: source amd64
Version: 0.70.1-2
Distribution: unstable
Urgency: low
Maintainer: Debian TeX Maintainers <debian-tex-maint@lists.debian.org>
Changed-By: Norbert Preining <preining@debian.org>
Description: 
 luatex     - next generation TeX engine
Closes: 651169 660104 661077
Changes: 
 luatex (0.70.1-2) unstable; urgency=low
 .
   [ Hilmar Preuße ]
   * add patch libpoppler-0.18 to enable build with poppler 0.18
     (see rev 4346 in upstream), Closes: #651169
   * change B-D from libpoppler-dev to libpoppler-private-dev
     as requested by poppler maintainer. (Closes: #660104)
   * declare a B-D from libfontconfig1-dev, the new
     libpoppler-private-dev won't depend on it (Closes: #661077)
   * change B-D from libpng12-dev to libpng-dev to make
     libpng15-transition possible (Cloese: #662423)
 .
   [ Norbert Preining ]
   * bump standards version to 3.9.3, no changes necessary
   * add build-arch and build-indep targets to debian/rules
Checksums-Sha1: 
 c5540ac49a6ca8a1eea8c22d04b9ed6ff9586fb5 1645 luatex_0.70.1-2.dsc
 6acf2dfa6b2aef57b2e6bc01a0e181639192d9c2 68419 luatex_0.70.1-2.debian.tar.gz
 16a07f3e5288691676eeae19bb12ebdf4e14458a 2468338 luatex_0.70.1-2_amd64.deb
Checksums-Sha256: 
 1ced6b78def76dc007996c4298f833335ecf0f8f0404f0a8e684fa9d1af2e91e 1645 luatex_0.70.1-2.dsc
 7cdff766b25d5b40594ca8ebb2eb16029aa5294f0be224731a02e52f7f66c47e 68419 luatex_0.70.1-2.debian.tar.gz
 98d919703ef7eb78b42d779b50455df13c2e865c7ffa83061e6f5996138971ba 2468338 luatex_0.70.1-2_amd64.deb
Files: 
 fae665a797c63a86b3b56f6f38056961 1645 tex optional luatex_0.70.1-2.dsc
 e477e287e857490c3ee54d00b4571e8b 68419 tex optional luatex_0.70.1-2.debian.tar.gz
 77d4f376029edad5efa39daf3aaf4647 2468338 tex optional luatex_0.70.1-2_amd64.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iD8DBQFPadmt0r9KownFsJQRAqq0AJ9v2+GVaGqR2pYS8188/t++uVSCZQCeLar/
Wr9Bvz3oBdKsAYmHL/757Ns=
=34zC
-----END PGP SIGNATURE-----



--- End Message ---

Reply to: