texlive-bin-2018.48691-9.par1: poppler 0.76.0 rebuild

3 files changed, 47 insertions, 13 deletions

diff --git a/libre/texlive-bin/PKGBUILD b/libre/texlive-bin/PKGBUILD
index 386105f50..21dccc170 100644
--- a/libre/texlive-bin/PKGBUILD
+++ b/libre/texlive-bin/PKGBUILD
@@ -13,7 +13,7 @@
 
 pkgname=('texlive-bin' 'libsynctex')
 pkgver=2018.48691
-pkgrel=8
+pkgrel=9
 pkgrel+=.par1
 license=('GPL')
 arch=('x86_64')
@@ -26,14 +26,14 @@ makedepends_i686=('pkgconf')
 url='http://tug.org/texlive/'
 _commit=f68b0992e13a2e155d71beb3e016ea4139023224  # texlive-2018.2
 source=("git+https://github.com/Tex-Live/texlive-source.git#commit=${_commit}"
-        "pdftex-poppler0.75.patch"
+        "pdftex-poppler0.76.patch"
         "luatex-poppler-fixes.patch"
         "xetex-poppler-fixes.patch"
         "freetype-pkgconfig.patch"
         "synctex-missing-header.patch")
 sha256sums=('SKIP'
-            'e3f9efc7303cdd0a90f01b02f32ff749eec745afec2ec9c7f5dde300cf6517b3'
-            '72f0deec8687feeaad7b4ca5565f0a2ddec0ec7d03b5ae4c1d8ede56a1bc9a5d'
+            '0b4070f489edef771f308687d9e99cb54e8a442f0229767c6fda5515045cd797'
+            '6daa9fb9991f34406a0620a7f9185776ce1ac601a9c66a537c4b90ce97c1ffc6'
             '7deb8bd50640b0f4ff9b4c11985fe6153906384b62cb9b5a3c4b52397fb941ca'
             'bed44f4ccda369410e90eac527cf44b8c1afda7d987ae521b4fd5edb425eef3e'
             'b6c81eb091b5910226e0359768edd178680debee56b63ab0a3753c3429c28ab0')
@@ -66,9 +66,9 @@ prepare() {
     # xetex poppler compatibility
     patch -Np1 -i "${srcdir}/xetex-poppler-fixes.patch"
     # pdftex poppler compatibility (upstream patches)
-    patch -Np1 -i "${srcdir}/pdftex-poppler0.75.patch"
-    cp -pv texk/web2c/pdftexdir/pdftoepdf{-poppler0.75.0,}.cc
-    cp -pv texk/web2c/pdftexdir/pdftosrc{-poppler0.75.0,}.cc
+    patch -Np1 -i "${srcdir}/pdftex-poppler0.76.patch"
+    cp -pv texk/web2c/pdftexdir/pdftoepdf{-poppler0.76.0,}.cc
+    cp -pv texk/web2c/pdftexdir/pdftosrc{-poppler0.76.0,}.cc
 }
 
 build() {
diff --git a/libre/texlive-bin/luatex-poppler-fixes.patch b/libre/texlive-bin/luatex-poppler-fixes.patch
index 757ba3a9e..c45917ae7 100644
--- a/libre/texlive-bin/luatex-poppler-fixes.patch
+++ b/libre/texlive-bin/luatex-poppler-fixes.patch
@@ -316,3 +316,37 @@ Luatex fixes for poppler 0.71
              if (!obj1.isNull()) {
                  pdf_add_name(pdf, "Resources");
                  copyObject(pdf, pdf_doc, &obj1);
+--- texlive-source/texk/web2c/luatexdir/lua/lepdflib.cc.orig    2019-04-24 09:41:05.090522664 +0000
++++ texlive-source/texk/web2c/luatexdir/lua/lepdflib.cc 2019-04-24 09:43:37.119184926 +0000
+@@ -994,7 +994,8 @@
+         pdfdoc_changed_error(L);
+     num = luaL_checkint(L, 2);
+     gen = luaL_checkint(L, 3);
+-    i = ((Catalog *) uin->d)->findPage(num, gen);
++    Ref numgen = {num, gen};
++    i = ((Catalog *) uin->d)->findPage(numgen);
+     if (i > 0)
+         lua_pushinteger(L, i);
+     else
+@@ -2596,8 +2597,9 @@
+         pdfdoc_changed_error(L);
+     num = luaL_checkint(L, 2);
+     gen = luaL_checkint(L, 3);
++    Ref numgen = {num, gen};
+     if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
+-        i = ((PdfDocument *) uin->d)->doc->findPage(num, gen);
++        i = ((PdfDocument *) uin->d)->doc->findPage(numgen);
+         if (i > 0)
+             lua_pushinteger(L, i);
+         else
+--- texlive-source/texk/web2c/luatexdir/image/pdftoepdf.w.orig  2019-04-24 09:56:38.406498975 +0000
++++ texlive-source/texk/web2c/luatexdir/image/pdftoepdf.w       2019-04-24 09:56:57.020081327 +0000
+@@ -630,7 +630,7 @@
+         if (link == NULL || !link->isOk())
+             formatted_error("pdf inclusion","invalid destination '%s'",img_pagename(idict));
+         Ref ref = link->getPageRef();
+-        img_pagenum(idict) = catalog->findPage(ref.num, ref.gen);
++        img_pagenum(idict) = catalog->findPage(ref);
+         if (img_pagenum(idict) == 0)
+             formatted_error("pdf inclusion","destination is not a page '%s'",img_pagename(idict));
+         delete link;
diff --git a/libre/texlive-bin/pdftex-poppler0.75.patch b/libre/texlive-bin/pdftex-poppler0.76.patch
index 81a32ff6e..3997cd5c2 100644
--- a/libre/texlive-bin/pdftex-poppler0.75.patch
+++ b/libre/texlive-bin/pdftex-poppler0.76.patch
@@ -7,11 +7,11 @@ Date:   Thu Dec 6 23:31:33 2018 +0000
     git-svn-id: svn://tug.org/texlive/trunk/Build/source@49336 c570f23f-e606-0410-a88d-b1316a301751
 
 
-diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
+diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc
 new file mode 100644
 index 000000000..630d3366d
 --- /dev/null
-+++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
++++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc
 @@ -0,0 +1,1113 @@
 +/*
 +Copyright 1996-2017 Han The Thanh, <thanh@pdftex.org>
@@ -776,7 +776,7 @@ index 000000000..630d3366d
 +        if (link == 0 || !link->isOk())
 +            pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
 +        Ref ref = link->getPageRef();
-+        page_num = pdf_doc->doc->getCatalog()->findPage(ref.num, ref.gen);
++        page_num = pdf_doc->doc->getCatalog()->findPage(ref);
 +        if (page_num == 0)
 +            pdftex_fail("PDF inclusion: destination is not a page <%s>",
 +                        page_name);
@@ -1126,11 +1126,11 @@ index 000000000..630d3366d
 +        delete globalParams;
 +    }
 +}
-diff --git a/texk/web2c/pdftexdir/pdftosrc-poppler0.75.0.cc b/texk/web2c/pdftexdir/pdftosrc-poppler0.75.0.cc
+diff --git a/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc b/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc
 new file mode 100644
 index 000000000..6089e68d9
 --- /dev/null
-+++ b/texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc
++++ b/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc
 @@ -0,0 +1,207 @@
 +/*
 +Copyright 1996-2017 Han The Thanh, <thanh@pdftex.org>
@@ -1309,7 +1309,7 @@ index 000000000..6089e68d9
 +                objStr.streamReset();
 +                str = new EmbedStream(objStr.getStream(), Object(objNull), true, first);
 +                lexer = new Lexer(xref, str);
-+                parser = new Parser(xref, lexer, false);
++                parser = new Parser(xref, str, false);
 +                for (n = 0; n < nObjects; ++n) {
 +                    obj1 = parser->getObj();
 +                    obj2 = parser->getObj();