libre/texlive-bin: updated to 2019.51075

2 files changed, 104 insertions, 56 deletions

diff --git a/libre/texlive-bin/PKGBUILD b/libre/texlive-bin/PKGBUILD
index 8af76c73f..0044860d3 100644
--- a/libre/texlive-bin/PKGBUILD
+++ b/libre/texlive-bin/PKGBUILD
@@ -12,61 +12,33 @@
 #  - diable xindy on armv7h
 
 pkgname=('texlive-bin' 'libsynctex')
-pkgver=2018.48691
-pkgrel=10
-pkgrel+=.par2
+pkgver=2019.51075
+pkgrel=1
+pkgrel+=.par1
 license=('GPL')
 arch=('x86_64')
 arch+=('i686' 'armv7h')
 makedepends=('git' 'cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler'
          'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2'
          'icu' 'harfbuzz' 'harfbuzz-icu' 'gmp' 'mpfr' 'potrace' 'libpaper'
-         'perl' 'clisp' 'ffcall')
-makedepends_i686=('pkgconf')
+         'perl')
+makedepends_x86_64=('clisp' 'ffcall')
+makedepends_i686=('clisp' 'ffcall')
 url='http://tug.org/texlive/'
-_commit=f68b0992e13a2e155d71beb3e016ea4139023224  # texlive-2018.2
+_commit=74c2495978a4a84ffae10252c0fd244f1140228e  # texlive-2019.2 r51075
 source=("git+https://github.com/Tex-Live/texlive-source.git#commit=${_commit}"
-        "pdftex-poppler0.76.patch"
-        "luatex-poppler-fixes.patch"
-        "xetex-poppler-fixes.patch"
-        "freetype-pkgconfig.patch"
-        "synctex-missing-header.patch")
+        "pdftex-poppler0.76.patch")
 sha256sums=('SKIP'
-            '0b4070f489edef771f308687d9e99cb54e8a442f0229767c6fda5515045cd797'
-            '6daa9fb9991f34406a0620a7f9185776ce1ac601a9c66a537c4b90ce97c1ffc6'
-            '7deb8bd50640b0f4ff9b4c11985fe6153906384b62cb9b5a3c4b52397fb941ca'
-            'bed44f4ccda369410e90eac527cf44b8c1afda7d987ae521b4fd5edb425eef3e'
-            'b6c81eb091b5910226e0359768edd178680debee56b63ab0a3753c3429c28ab0')
+            '5da9f5356ca14d950c222108b431baaf5c27667460ffab9597b29ef11b426c0f')
 
 prepare() {
     cd "$srcdir/texlive-source"
 
-    # Synctex "make install" misses synctex_version.h
-    patch -Np1 -i "${srcdir}/synctex-missing-header.patch"
-
-    # Freetype2 2.9.1 package no longer has freetype-config
-    patch -Np1 -i "${srcdir}/freetype-pkgconfig.patch"
-
-    ./reautoconf
-
     # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251)
     sed -i s/SELFAUTOPARENT/TEXMFROOT/ texk/tex4htk/t4ht.c
 
-    # 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 -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)
-    patch -Np1 -i "${srcdir}/pdftex-poppler0.76.patch"
+    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
 }
@@ -74,11 +46,11 @@ prepare() {
 build() {
    cd "$srcdir/texlive-source"
 
-   if [ "${CARCH}" = "armv7h" ]; then
-     local config_xindy="--disable-xindy"
-   else
-     local config_xindy="--enable-xindy"
-   fi
+   local config_extra=()
+   case "$CARCH" in
+     x86_64|i686) config_extra+=(--enable-xindy) ;;
+     armv7h) config_extra+=(--disable-xindy --disable-cxx-runtime-hack) ;;
+   esac
 
    #############################################################
    ### configure
@@ -127,7 +99,8 @@ build() {
      --disable-aleph \
      --enable-luatex \
      --with-clisp-runtime=default \
-     $config_xindy --disable-xindy-rules --disable-xindy-docs
+     --disable-xindy-rules --disable-xindy-docs \
+     ${config_extra}
    #############################################################
    ### make
    echo "-------------------------------------------------------"
@@ -240,8 +213,10 @@ checkcites
 checklistings
 chkweb
 cjk-gs-integrate
+cluttex
 context
 contextjit
+ctanbib
 ctanify
 ctanupload
 ctan-o-mat
@@ -322,6 +297,7 @@ pdfjoin
 pdflatexpicscale
 pdfnup
 pdfpun
+pdftex-quiet
 pdfxup
 pfarrei
 pkfix
@@ -367,6 +343,7 @@ updmap-user
 vpl2ovp
 vpl2vpl
 xhlatex
+xindex
 xindy
 "
    if [ "$CARCH" = "armv7h" ]; then
@@ -397,6 +374,7 @@ ps4pdf
 splitindex
 svn-multi
 vpe
+webquiz
 wordcount
 yplan"
    _music_scripts="lily-glyph-commands lily-image-commands lily-rebuild-pdfs
diff --git a/libre/texlive-bin/pdftex-poppler0.76.patch b/libre/texlive-bin/pdftex-poppler0.76.patch
index 3997cd5c2..784fe0c93 100644
--- a/libre/texlive-bin/pdftex-poppler0.76.patch
+++ b/libre/texlive-bin/pdftex-poppler0.76.patch
@@ -1,15 +1,74 @@
-commit 67290f70d8143b18f24ffd6a1827def9bdc21108
+commit 473d82b2e33621d51f5c961baf8b42cdb4c955eb
 Author: Akira Kakuto <kakuto@fuk.kindai.ac.jp>
-Date:   Thu Dec 6 23:31:33 2018 +0000
+Date:   Fri May 3 04:05:07 2019 +0000
 
-    support system poppler 0.72.0
+    support system poppler 0.76.[01]
     
-    git-svn-id: svn://tug.org/texlive/trunk/Build/source@49336 c570f23f-e606-0410-a88d-b1316a301751
-
+    git-svn-id: svn://tug.org/texlive/trunk/Build/source@50960 c570f23f-e606-0410-a88d-b1316a301751
 
+diff --git a/texk/web2c/pdftexdir/ChangeLog b/texk/web2c/pdftexdir/ChangeLog
+index 8af394342..0a43b927c 100644
+--- a/texk/web2c/pdftexdir/ChangeLog
++++ b/texk/web2c/pdftexdir/ChangeLog
+@@ -1,3 +1,8 @@
++2019-05-03  Akira Kakuto  <kakuto@w32tex.org>
++
++	* pdftosrc-poppler0.76.0.cc, pdftoepdf-poppler0.76.0.cc:
++	Added to support system poppler 0.76.[01].
++
+ 2019-04-07  Karl Berry  <karl@freefriends.org>
+ 
+ 	* TeX Live 2019.
+diff --git a/texk/web2c/pdftexdir/NEWS b/texk/web2c/pdftexdir/NEWS
+index c21898395..ddc933be4 100644
+--- a/texk/web2c/pdftexdir/NEWS
++++ b/texk/web2c/pdftexdir/NEWS
+@@ -28,13 +28,15 @@ pdfTeX 3.14159265-2.6-1.40.19 (TeX Live 2018)  (April 14, 2018)
+   Provide new files:
+   pdftosrc-newpoppler.cc for poppler-0.59.0 upto poppler-0.70.1.
+   pdftosrc-poppler0.71.0 for poppler-0.71.0.
+-  pdftosrc-poppler0.72.0 for poppler-0.72.0 and newer.
++  pdftosrc-poppler0.72.0 for poppler-0.72.0 upto poppler-0.75.0.
++  pdftosrc-poppler0.76.0 for poppler-0.76.0 and newer. 
+   pdftoepdf-poppler0.68.0.cc for poppler-0.59.0 upto poppler-0.68.0.
+   pdftoepdf-poppler0.69.0.cc for poppler-0.69.0.
+   pdftoepdf-poppler0.70.0.cc for poppler-0.70.0 and poppler-0.70.1.
+   pdftoepdf-poppler0.71.0.cc for poppler-0.71.0.
+   pdftoepdf-poppler0.72.0.cc for poppler-0.72.0 upto poppler-0.74.0.
+-  pdftoepdf-poppler0.75.0.cc for poppler-0.75.0 and newer.
++  pdftoepdf-poppler0.75.0.cc for poppler-0.75.0.
++  pdftoepdf-poppler0.76.0.cc for poppler-0.76.0 and newer.
+   Note that pdftosrc-*.cc and pdftoepdf-*.cc should be
+   renamed as pdftosrc.cc, and pdftoepdf.cc, respectively, before
+   compilation.
+diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc
+index 630d3366d..6617cfe8b 100644
+--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc
++++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc
+@@ -23,6 +23,7 @@ https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk
+ by Arch Linux. A little modifications are made to avoid a crash for
+ some kind of pdf images, such as figure_missing.pdf in gnuplot.
+ The poppler should be 0.72.0 or newer versions.
++It is tested upto the poppler 0.74.0.
+ POPPLER_VERSION should be defined.
+ */
+ 
+diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
+index 13c3bd5ef..30f8fed58 100644
+--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
++++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
+@@ -22,7 +22,7 @@ This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at
+ https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk
+ by Arch Linux. A little modifications are made to avoid a crash for
+ some kind of pdf images, such as figure_missing.pdf in gnuplot.
+-The poppler should be 0.75.0 or newer versions.
++The poppler should be 0.75.0.
+ POPPLER_VERSION should be defined.
+ */
+ 
 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
+index 000000000..e7614aa5c
 --- /dev/null
 +++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.76.0.cc
 @@ -0,0 +1,1113 @@
@@ -37,7 +96,7 @@ index 000000000..630d3366d
 +https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk
 +by Arch Linux. A little modifications are made to avoid a crash for
 +some kind of pdf images, such as figure_missing.pdf in gnuplot.
-+The poppler should be 0.72.0 or newer versions.
++The poppler should be 0.76.0 or newer versions.
 +POPPLER_VERSION should be defined.
 +*/
 +
@@ -880,7 +939,7 @@ index 000000000..630d3366d
 +        pdf_printf("/%s.PageNumber %i\n", pdfkeyprefix, (int) epdf_selected_page);
 +    }
 +    if ((suppress_ptex_info & MASK_SUPPRESS_PTEX_INFODICT) == 0) {
-+        info = pdf_doc->doc->getDocInfoNF();
++        info = pdf_doc->doc->getDocInfoNF().copy();
 +        if (info.isRef()) {
 +            // the info dict must be indirect (PDF Ref p. 61)
 +            pdf_printf("/%s.InfoDict ", pdfkeyprefix);
@@ -1126,12 +1185,24 @@ index 000000000..630d3366d
 +        delete globalParams;
 +    }
 +}
+diff --git a/texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc b/texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc
+index d4e247ef6..34bad9ccf 100644
+--- a/texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc
++++ b/texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc
+@@ -21,6 +21,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
+ This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at
+ https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk
+ by Arch Linux. The poppler should be 0.72.0 or newer versions.
++It is tested upto the poppler 0.75.0.
+ POPPLER_VERSION should be defined.
+ */
+ 
 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
+index 000000000..3599b5318
 --- /dev/null
 +++ b/texk/web2c/pdftexdir/pdftosrc-poppler0.76.0.cc
-@@ -0,0 +1,207 @@
+@@ -0,0 +1,206 @@
 +/*
 +Copyright 1996-2017 Han The Thanh, <thanh@pdftex.org>
 +
@@ -1154,7 +1225,7 @@ index 000000000..6089e68d9
 +/*
 +This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at
 +https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk
-+by Arch Linux. The poppler should be 0.72.0 or newer versions.
++by Arch Linux. The poppler should be 0.76.0 or newer versions.
 +POPPLER_VERSION should be defined.
 +*/
 +
@@ -1308,7 +1379,6 @@ index 000000000..6089e68d9
 +                // parse the header: object numbers and offsets
 +                objStr.streamReset();
 +                str = new EmbedStream(objStr.getStream(), Object(objNull), true, first);
-+                lexer = new Lexer(xref, str);
 +                parser = new Parser(xref, str, false);
 +                for (n = 0; n < nObjects; ++n) {
 +                    obj1 = parser->getObj();