[arch-commits] Commit in texlive-bin/trunk (PKGBUILD texlive-poppler-0.64.patch)

[Rémy Oudompheng]

    Date: Monday, April 23, 2018 @ 19:50:21
  Author: remy
Revision: 322861

upgpkg: texlive-bin 2017.44590-14

Rebuild for poppler 0.64
Patch to handle changes (char* -> const char*)

Modified:
  texlive-bin/trunk/PKGBUILD
  texlive-bin/trunk/texlive-poppler-0.64.patch

----------------------------+
 PKGBUILD                   |    2 
 texlive-poppler-0.64.patch |  106 +++++++++++++++++++++++++++++++------------
 2 files changed, 78 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-23 19:25:50 UTC (rev 322860)
+++ PKGBUILD	2018-04-23 19:50:21 UTC (rev 322861)
@@ -21,7 +21,7 @@
             'ee97f3e07e235dee4ad6d0c3e85c2260914c965e94d5ffbf481fa506df5f01ec'
             'a5204f110f261de989fc21f93a4b5485876ea2d28773bcdc4817b548fd865024'
             'c7246156104f8e57e80b6fc3a9c9efec7542cd067a525fb51279a15056de4426'
-            '58146d6f79e51e3e44f84611c63c4a93ab1de9e56cb0d44bbadf031d88c230f3')
+            '02c75172cd25c54acf3d998bf79ef6915e611c9dbb2821638f3289dc87d7479a')
 
 prepare() {
     cd "$srcdir/source"

Modified: texlive-poppler-0.64.patch
===================================================================
--- texlive-poppler-0.64.patch	2018-04-23 19:25:50 UTC (rev 322860)
+++ texlive-poppler-0.64.patch	2018-04-23 19:50:21 UTC (rev 322861)
@@ -1,16 +1,30 @@
---- source/texk/web2c/pdftexdir/pdftosrc.cc.orig	2018-04-23 05:56:51.757082063 +0000
-+++ source/texk/web2c/pdftexdir/pdftosrc.cc	2018-04-23 06:00:05.458749056 +0000
-@@ -68,7 +68,7 @@
-     Stream *s;
-     Object srcStream, srcName, catalogDict;
-     FILE *outfile;
--    char *outname;
-+    const char *outname;
-     int objnum = 0, objgen = 0;
-     bool extract_xref_table = false;
-     int c;
---- source/texk/web2c/luatexdir/lua/lepdflib.cc.orig	2018-04-23 06:02:00.090127690 +0000
-+++ source/texk/web2c/luatexdir/lua/lepdflib.cc	2018-04-23 06:14:14.535401600 +0000
+diff -ur source/texk/web2c/luatexdir/image/pdftoepdf.w source.new/texk/web2c/luatexdir/image/pdftoepdf.w
+--- source/texk/web2c/luatexdir/image/pdftoepdf.w	2018-04-23 08:46:00.031575505 +0200
++++ source.new/texk/web2c/luatexdir/image/pdftoepdf.w	2018-04-23 08:42:06.762986242 +0200
+@@ -357,9 +357,9 @@
+     pdf->cave = true;
+ }
+ 
+-static void copyString(PDF pdf, GooString * string)
++static void copyString(PDF pdf, const GooString * string)
+ {
+-    char *p;
++    const char *p;
+     unsigned char c;
+     size_t i, l;
+     p = string->getCString();
+@@ -389,7 +389,7 @@
+     pdf->cave = true;
+ }
+ 
+-static void copyName(PDF pdf, char *s)
++static void copyName(PDF pdf, const char *s)
+ {
+     pdf_out(pdf, '/');
+     for (; *s != 0; s++) {
+diff -ur source/texk/web2c/luatexdir/lua/lepdflib.cc source.new/texk/web2c/luatexdir/lua/lepdflib.cc
+--- source/texk/web2c/luatexdir/lua/lepdflib.cc	2018-04-23 08:46:00.032575486 +0200
++++ source.new/texk/web2c/luatexdir/lua/lepdflib.cc	2018-04-23 08:42:06.762986242 +0200
 @@ -516,7 +516,7 @@
  #define m_poppler_get_GOOSTRING(in, function)                  \
  static int m_##in##_##function(lua_State * L)                  \
@@ -29,23 +43,57 @@
      udstruct *uin;
      uin = (udstruct *) luaL_checkudata(L, 1, M_Object);
      if (uin->pd != NULL && uin->pd->pc != uin->pc)
---- source/texk/web2c/luatexdir/image/pdftoepdf.w.orig	2018-04-23 06:16:08.003740279 +0000
-+++ source/texk/web2c/luatexdir/image/pdftoepdf.w	2018-04-23 06:25:27.372390750 +0000
-@@ -357,7 +357,7 @@
-     pdf->cave = true;
- }
+diff -ur source/texk/web2c/pdftexdir/pdftoepdf.cc source.new/texk/web2c/pdftexdir/pdftoepdf.cc
+--- source/texk/web2c/pdftexdir/pdftoepdf.cc	2018-04-23 21:27:36.254598208 +0200
++++ source.new/texk/web2c/pdftexdir/pdftoepdf.cc	2018-04-23 21:17:36.475663912 +0200
+@@ -275,7 +275,7 @@
  
--static void copyString(PDF pdf, GooString * string)
-+static void copyString(PDF pdf, const GooString * string)
- {
-     char *p;
-     unsigned char c;
-@@ -389,7 +389,7 @@
-     pdf->cave = true;
- }
+ static void copyObject(Object *);
  
--static void copyName(PDF pdf, char *s)
-+static void copyName(PDF pdf, const char *s)
+-static void copyName(char *s)
++static void copyName(const char *s)
  {
-     pdf_out(pdf, '/');
+     pdf_puts("/");
      for (; *s != 0; s++) {
+@@ -418,7 +418,7 @@
+         && fontdescRef.isRef()
+         && fontdesc.isDict()
+         && embeddableFont(&fontdesc)
+-        && (fontmap = lookup_fontmap(basefont.getName())) != NULL) {
++        && (fontmap = lookup_fontmap((char *)basefont.getName())) != NULL) {
+         // round /StemV value, since the PDF input is a float
+         // (see Font Descriptors in PDF reference), but we only store an
+         // integer, since we don't want to change the struct.
+@@ -427,7 +427,7 @@
+         charset = fontdesc.dictLookup("CharSet");
+         if (!charset.isNull() &&
+             charset.isString() && is_subsetable(fontmap))
+-            epdf_mark_glyphs(fd, charset.getString()->getCString());
++            epdf_mark_glyphs(fd, (char *)charset.getString()->getCString());
+         else
+             embed_whole_font(fd);
+         addFontDesc(fontdescRef.getRef(), fd);
+@@ -554,8 +554,8 @@
+     Object obj1;
+     int i, l, c;
+     Ref ref;
+-    char *p;
+-    GString *s;
++    const char *p;
++    const GString *s;
+     if (obj->isBool()) {
+         pdf_printf("%s", obj->getBool()? "true" : "false");
+     } else if (obj->isInt()) {
+diff -ur source/texk/web2c/pdftexdir/pdftosrc.cc source.new/texk/web2c/pdftexdir/pdftosrc.cc
+--- source/texk/web2c/pdftexdir/pdftosrc.cc	2018-04-23 21:27:36.254598208 +0200
++++ source.new/texk/web2c/pdftexdir/pdftosrc.cc	2018-04-23 08:42:06.762986242 +0200
+@@ -68,7 +68,7 @@
+     Stream *s;
+     Object srcStream, srcName, catalogDict;
+     FILE *outfile;
+-    char *outname;
++    const char *outname;
+     int objnum = 0, objgen = 0;
+     bool extract_xref_table = false;
+     int c;
+