From 82f96732ce28db2a2a657e52acfdaa80a034d648 Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Sun, 4 Nov 2018 01:00:56 -0500
Subject: texlive-bin-2018.47465-5.par1: poppler 0.71.0 rebuild

---
 libre/texlive-bin/PKGBUILD                   | 11 ++++++++---
 libre/texlive-bin/texlive-poppler-0.71.patch | 12 ++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 libre/texlive-bin/texlive-poppler-0.71.patch

(limited to 'libre/texlive-bin')

diff --git a/libre/texlive-bin/PKGBUILD b/libre/texlive-bin/PKGBUILD
index ecbcbc6e3..f10a19822 100644
--- a/libre/texlive-bin/PKGBUILD
+++ b/libre/texlive-bin/PKGBUILD
@@ -12,7 +12,7 @@
 
 pkgname=('texlive-bin')
 pkgver=2018.47465
-pkgrel=4
+pkgrel=5
 pkgrel+=.par1
 license=('GPL')
 arch=('x86_64')
@@ -21,16 +21,18 @@ makedepends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler'
          'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2'
          'icu' 'harfbuzz' 'harfbuzz-icu' 'gmp' 'mpfr' 'potrace' 'libpaper'
          'perl' 'clisp' 'ffcall')
-makedepends+=('poppler=0.70.1' 'icu>=63' 'icu<64')
+makedepends+=('poppler=0.71.0' 'icu>=63' 'icu<64')
 url='http://tug.org/texlive/'
 source=("https://sources.archlinux.org/other/texlive/texlive-bin-source-${pkgver}.tar.xz"
         "poppler-compat-fixes-up-to-0.70.patch"
         "luatex-poppler-0.70-const-fixes.patch"
+        "texlive-poppler-0.71.patch"
         "freetype-pkgconfig.patch"
         "synctex-missing-header.patch")
 sha256sums=('06d7a1c939cf7d6035850cefca1d01898ae51a879e20db684a202fd507a0cae5'
             '1a76b4be5544e431b60dace28169870a8b275e6d80323f9ef7f49b7da8df0b29'
             'f1d8b23f3072001fae5f2147aa4a50520d89fbc5b683c0da10b1417e52173c7a'
+            'd8d2fde2f0978238a923b95d063adb7c84e8abde9ac808166bcfa0e3fc8a9c98'
             'bed44f4ccda369410e90eac527cf44b8c1afda7d987ae521b4fd5edb425eef3e'
             'b6c81eb091b5910226e0359768edd178680debee56b63ab0a3753c3429c28ab0')
 
@@ -52,6 +54,9 @@ prepare() {
 
     # upstream compat fixes for latest poppler
     patch -Np1 -i "${srcdir}/poppler-compat-fixes-up-to-0.70.patch"
+    # fix build with poppler 0.71
+    find texk/web2c/{lua,pdf}texdir -type f | xargs sed -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' -i
+    patch -p1 -i "${srcdir}/texlive-poppler-0.71.patch"
     cp -pv texk/web2c/pdftexdir/pdftoepdf{-poppler0.70.0,}.cc
     cp -pv texk/web2c/pdftexdir/pdftosrc{-newpoppler,}.cc
 
@@ -133,7 +138,7 @@ package_texlive-bin() {
             'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2'
             'icu' 'harfbuzz' 'harfbuzz-icu' 'gmp' 'mpfr' 'potrace' 'libpaper'
             'libsynctex')
-   depends+=('icu>=63' 'icu<64' 'poppler=0.70.1')
+   depends+=('icu>=63' 'icu<64' 'poppler=0.71.0')
    provides=('lcdf-typetools' 'kpathsea' 'xindy')
    optdepends=('ed: for texconfig'
                'biber: for bibliography processing')
diff --git a/libre/texlive-bin/texlive-poppler-0.71.patch b/libre/texlive-bin/texlive-poppler-0.71.patch
new file mode 100644
index 000000000..e0e171829
--- /dev/null
+++ b/libre/texlive-bin/texlive-poppler-0.71.patch
@@ -0,0 +1,12 @@
+--- source/texk/web2c/luatexdir/lua/lepdflib.cc.orig    2018-11-01 22:46:43.868534355 +0000
++++ source/texk/web2c/luatexdir/lua/lepdflib.cc 2018-11-01 22:48:17.358815525 +0000
+@@ -240,7 +240,7 @@
+        if (uobj->pd != NULL && uobj->pd->pc != uobj->pc)
+           pdfdoc_changed_error(L);
+        uout = new_Attribute_userdata(L);
+-       uout->d = new Attribute(n, nlen, (Object *)uobj->d);
++       uout->d = new Attribute((GooString)n, (Object *)uobj->d);
+        uout->atype = ALLOC_LEPDF;
+        uout->pc = uobj->pc;
+        uout->pd = uobj->pd;
+
-- 
cgit v1.2.3