From 0bb58d7d6ffe30aaab376fede5d1140651d418e8 Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Tue, 21 Jul 2020 04:55:45 -0400
Subject: [texlive-bin]: rebuild against new poppler

---
 libre/texlive-bin/PKGBUILD | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'libre/texlive-bin/PKGBUILD')

diff --git a/libre/texlive-bin/PKGBUILD b/libre/texlive-bin/PKGBUILD
index 62acb7e65..60780ca51 100644
--- a/libre/texlive-bin/PKGBUILD
+++ b/libre/texlive-bin/PKGBUILD
@@ -5,25 +5,27 @@
 # Contributor: Michał Masłowski <mtjm@mtjm.eu>
 # Contributor: Isaac David <isacdaavid(at)isacdaavid!info>
 # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
+# Contrbutor: bill-auger <bill-auger@programmer.net>
+
 
 # parabola changes and rationale:
-#  - rebranded to parabola
-#  - pinned versioned dependencies to mitigate breakage from Arch's .so bumps
-#  - diable xindy on armv7h
+#  - rebrand for parabola
+#  - pin versioned dependencies to mitigate breakage from Arch's .so bumps
+#  - disable xindy on armv7h
+
 
 pkgname=('texlive-bin' 'libsynctex')
 pkgver=2020.54586
 pkgrel=4
-pkgrel+=.parabola1
+pkgrel+=.parabola2
 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')
-makedepends_x86_64=('clisp' 'ffcall')
-makedepends_i686=('clisp' 'ffcall')
+         'perl' 'clisp' 'ffcall')
+[[ "${CARCH}" == 'armv7h' ]] && makedepends=( $(sed -E 's/clisp|ffcall//g' <<<${deps[@]}) )
 url='https://tug.org/texlive/'
 _commit=8e5e0e89d413d09cca133c8966d1a3af8a2ac440 # svn://tug.org/texlive/trunk/Build/source@54586
 source=("git+https://github.com/Tex-Live/texlive-source.git#commit=${_commit}")
@@ -91,8 +93,8 @@ build() {
      --enable-luatex \
      --with-clisp-runtime=default \
      $(case "$CARCH" in
-         x86_64|i686) echo '--enable-xindy --disable-xindy-rules --disable-xindy-docs' ;;
          armv7h     ) echo '--disable-xindy --disable-cxx-runtime-hack'                ;;
+         x86_64|i686) echo '--enable-xindy --disable-xindy-rules --disable-xindy-docs' ;;
        esac)
    #############################################################
    ### make
@@ -124,10 +126,8 @@ package_texlive-bin() {
    options=('!strip')
 
    # pin to current 'icu' and 'poppler' libs
-   local _icu_ver=$(    pacman -S --print-format='%v' icu    )
-   local _poppler_ver=$(pacman -S --print-format='%v' poppler)
-   depends+=("icu>=${_icu_ver}" "icu<$(( ${_icu_ver%%.*} + 1 ))"
-             "poppler=${_poppler_ver}"                         )
+   local poppler_ver=$(pacman -S --print-format='%v' poppler)
+   depends+=('libicui18n.so' 'libicuuc.so' "poppler=${poppler_ver}")
 
    cd "$srcdir/texlive-source"
 
-- 
cgit v1.2.3