Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (a9ab73540b025d3b5c0b307151863daa946b27ab)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (a9ab73540b025d3b5c0b307151863daa946b27ab)
  • Date: Fri, 21 Aug 2020 19:58:10 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

latex/texlive/HISTORY | 1 +
latex/texlive/PRE_BUILD | 45 +++++++++++++++++++--------------------------
2 files changed, 20 insertions(+), 26 deletions(-)

New commits:
commit a9ab73540b025d3b5c0b307151863daa946b27ab
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

texlive: Rework poppler API patching

diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY
index fe433f7..e026472 100644
--- a/latex/texlive/HISTORY
+++ b/latex/texlive/HISTORY
@@ -1,6 +1,7 @@
2020-08-21 Ismael Luceno <ismael AT sourcemage.org>
* BUILD: Fixed build with binutils >= 2.35
* PRE_BUILD: Optimized data installation prefix patching
+ Reworked poppler API patching

2019-08-13 Pavel Vinogradov <public AT sourcemage.org>
* DEPENDS: needs ghostscript with libgs
diff --git a/latex/texlive/PRE_BUILD b/latex/texlive/PRE_BUILD
index 882049d..224b3b1 100755
--- a/latex/texlive/PRE_BUILD
+++ b/latex/texlive/PRE_BUILD
@@ -74,34 +74,27 @@ sed '/utypes.h/i\

mkdir "$COMPILE_DIRECTORY" &&

-# Poppler sources:
-# really old: keep things as-is
-# 0.59.x to 0.68.x: pdftoepdf-poppler0.68.0.cc, pdftosrc-newpoppler.cc
-# 0.69.x: pdftoepdf-poppler0.69.0.cc, pdftosrc-newpoppler.cc
-# 0.70.x: pdftoepdf-poppler0.70.0.cc, pdftosrc-newpoppler.cc
-# 0.71.x: pdftoepdf-poppler0.71.0.cc, pdftosrc-poppler0.71.0.cc
-# This is nuts.
if spell_ok poppler; then
cd "${SOURCE_DIRECTORY}/texk/web2c/pdftexdir" &&
popplerver="$(installed_version poppler | cut -f 1,2 -d .)" &&
- if is_version_between 0.59 "$popplerver" 0.68; then
- cp pdftoepdf-poppler0.68.0.cc pdftoepdf.cc &&
- cp pdftosrc-newpoppler.cc pdftosrc.cc
- elif [[ "$popplerver" = 0.69 ]]; then
- cp pdftoepdf-poppler0.69.0.cc pdftoepdf.cc &&
- cp pdftosrc-newpoppler.cc pdftosrc.cc
- elif [[ "$popplerver" = 0.70 ]]; then
- cp pdftoepdf-poppler0.70.0.cc pdftoepdf.cc &&
- cp pdftosrc-newpoppler.cc pdftosrc.cc
- elif [[ "$popplerver" = 0.71 ]]; then
- cp pdftoepdf-poppler0.71.0.cc pdftoepdf.cc &&
- cp pdftosrc-poppler0.71.0.cc pdftosrc.cc
- elif [[ "$popplerver" = 0.72 ]]; then
- cp pdftoepdf-poppler0.72.0.cc pdftoepdf.cc &&
- cp pdftosrc-poppler0.72.0.cc pdftosrc.cc
- elif ! is_version_less "$popplerver" 0.73; then
- cp pdftoepdf-poppler0.75.0.cc pdftoepdf.cc &&
- cp pdftosrc-poppler0.72.0.cc pdftosrc.cc
- fi &&
+ case "$popplerver" in
+ # really old: keep things as-is
+ (0.?|0.[0-4]?|0.5[0-8]) ;;
+ # special case for the non-versioned file
+ (0.59|0.6?|0.70)
+ ln -vsf pdftosrc{-newpoppler,}.cc
+ ;&
+ # symlink the best matches for the installed poppler version
+ (*)
+ {
+ echo ./pdftosrc-poppler$popplerver.z
+ echo ./pdftoepdf-poppler$popplerver.z
+ find -name 'pdfto*-poppler*.0.cc'
+ } | sort -V | awk -F- '
+ /z$/ { done[$1]; next }
+ !($1 in done) { latest[$1] = $0 }
+ END { for (i in latest) print latest[i], i ".cc" }
+ ' | xargs -n 2 ln -vsf
+ esac &&
cd "${SOURCE_DIRECTORY}"
fi



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (a9ab73540b025d3b5c0b307151863daa946b27ab), Ismael Luceno, 08/21/2020

Archive powered by MHonArc 2.6.24.

Top of Page