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

[Rémy Oudompheng]

    Date: Monday, April 23, 2018 @ 06:34:53
  Author: remy
Revision: 322786

Patch for poppler-0.64 compatibility

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

----------------------------+
 PKGBUILD                   |   11 ++++++---
 texlive-poppler-0.64.patch |   51 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-22 18:16:42 UTC (rev 322785)
+++ PKGBUILD	2018-04-23 06:34:53 UTC (rev 322786)
@@ -4,7 +4,7 @@
 
 pkgname=('texlive-bin' 'libsynctex')
 pkgver=2017.44590
-pkgrel=13
+pkgrel=14
 license=('GPL')
 arch=('x86_64')
 makedepends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler'
@@ -15,11 +15,13 @@
 source=("https://sources.archlinux.org/other/texlive/texlive-bin-source-${pkgver}.tar.xz"
         "luatex-gcc7.patch"
         "texlive-poppler-0.59.patch"
-        "pdftex-poppler-0.59.patch")
+        "pdftex-poppler-0.59.patch"
+        "texlive-poppler-0.64.patch")
 sha256sums=('4645b4d55fc500ba9be7156a6a330afb44fbf7fda40dfd73fe9cb16d207f2038'
             'ee97f3e07e235dee4ad6d0c3e85c2260914c965e94d5ffbf481fa506df5f01ec'
             'a5204f110f261de989fc21f93a4b5485876ea2d28773bcdc4817b548fd865024'
-            'c7246156104f8e57e80b6fc3a9c9efec7542cd067a525fb51279a15056de4426')
+            'c7246156104f8e57e80b6fc3a9c9efec7542cd067a525fb51279a15056de4426'
+            '58146d6f79e51e3e44f84611c63c4a93ab1de9e56cb0d44bbadf031d88c230f3')
 
 prepare() {
     cd "$srcdir/source"
@@ -37,6 +39,9 @@
     # management.
     patch -Np1 -i "${srcdir}/texlive-poppler-0.59.patch"
     patch -Np1 -i "${srcdir}/pdftex-poppler-0.59.patch"
+
+    # Poppler 0.64 now returns const char* in getCString()
+    patch -Np1 -i "${srcdir}/texlive-poppler-0.64.patch"
 }
 
 build() {

Added: texlive-poppler-0.64.patch
===================================================================
--- texlive-poppler-0.64.patch	                        (rev 0)
+++ texlive-poppler-0.64.patch	2018-04-23 06:34:53 UTC (rev 322786)
@@ -0,0 +1,51 @@
+--- 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
+@@ -516,7 +516,7 @@
+ #define m_poppler_get_GOOSTRING(in, function)                  \
+ static int m_##in##_##function(lua_State * L)                  \
+ {                                                              \
+-    GooString *gs;                                             \
++    const GooString *gs;                                             \
+     udstruct *uin;                                             \
+     uin = (udstruct *) luaL_checkudata(L, 1, M_##in);          \
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)             \
+@@ -1650,7 +1650,7 @@
+ 
+ static int m_Object_getString(lua_State * L)
+ {
+-    GooString *gs;
++    const GooString *gs;
+     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;
+ }
+ 
+-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 copyName(PDF pdf, char *s)
++static void copyName(PDF pdf, const char *s)
+ {
+     pdf_out(pdf, '/');
+     for (; *s != 0; s++) {