From e6d0dc20797c913033ff8142bb2d5169d38989b5 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 19 Jan 2019 16:00:09 +0000
Subject: [PATCH] extra/texlive-bin to 2018.48691-5

---
 extra/texlive-bin/PKGBUILD                 | 13 ++++++++++---
 extra/texlive-bin/pdftex-poppler0.72.patch |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/extra/texlive-bin/PKGBUILD b/extra/texlive-bin/PKGBUILD
index ba47f5fda..b83b584ba 100644
--- a/extra/texlive-bin/PKGBUILD
+++ b/extra/texlive-bin/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgname=('texlive-bin' 'libsynctex')
 pkgver=2018.48691
-pkgrel=4
+pkgrel=5
 license=('GPL')
 arch=('x86_64')
 makedepends=('git' 'cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler'
@@ -25,7 +25,7 @@ source=("git+https://github.com/Tex-Live/texlive-source.git#commit=${_commit}"
         "freetype-pkgconfig.patch"
         "synctex-missing-header.patch")
 sha256sums=('SKIP'
-            '34a2b36db5994c3c9f4cc0ac3e277c72b11b15b59f2515d59672119532c94c4d'
+            'c70f1cf5bee5cba17b40855d584c7f1e8f67c2bf1ce4633a1c5abcdebb59865c'
             'ea2abcaf57cfb99c22560a1d98daa7468dafd4713425ef01a6fda29803bf39bc'
             '7deb8bd50640b0f4ff9b4c11985fe6153906384b62cb9b5a3c4b52397fb941ca'
             'bed44f4ccda369410e90eac527cf44b8c1afda7d987ae521b4fd5edb425eef3e'
@@ -48,7 +48,14 @@ prepare() {
     # luatex switched from poppler to pplib in newer versions so
     # upstream fixes aren't available; hopefully this is correct
     patch -Np1 -i "${srcdir}/luatex-poppler-fixes.patch"
-    find texk/web2c/luatexdir -type f | xargs sed -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' -e 's|getCString|c_str|g' -i
+    find texk/web2c/luatexdir -type f -exec sed -i \
+      -e 's|gTrue|true|g' \
+      -e 's|gFalse|false|g' \
+      -e 's|GBool|bool|g' \
+      -e 's|getCString|c_str|g' \
+      -e 's|Guint|unsigned int|g' \
+      -e 's|Guchar|unsigned char|g' \
+      {} +
     # xetex poppler compatibility
     patch -Np1 -i "${srcdir}/xetex-poppler-fixes.patch"
     # pdftex poppler compatibility (upstream patches)
diff --git a/extra/texlive-bin/pdftex-poppler0.72.patch b/extra/texlive-bin/pdftex-poppler0.72.patch
index a20141714..629fe980d 100644
--- a/extra/texlive-bin/pdftex-poppler0.72.patch
+++ b/extra/texlive-bin/pdftex-poppler0.72.patch
@@ -1295,7 +1295,7 @@ index 000000000..6089e68d9
 +                Object objStr, obj1, obj2;
 +                int nObjects, first, n;
 +                int localOffset = 0;
-+                Guint firstOffset;
++                unsigned int firstOffset;
 +
 +                objStr = xref->fetch(e->offset, 0);
 +                assert(objStr.isStream());