Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (57d8cd85bea0dd488829f8aa2ed40dafb2bb2dc3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (57d8cd85bea0dd488829f8aa2ed40dafb2bb2dc3)
  • Date: Wed, 8 Mar 2023 23:41:41 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

latex/texlive/DEPENDS | 1
latex/texlive/DETAILS | 4
latex/texlive/HISTORY | 8
latex/texlive/INSTALL | 7
latex/texlive/PRE_BUILD | 31
--
latex/texlive/patches/freetype2-config.patch | 106
----------
latex/texlive/patches/texlive-20180414-source-upstream_fixes-1.patch | 33
---
7 files changed, 20 insertions(+), 170 deletions(-)

New commits:
commit 57d8cd85bea0dd488829f8aa2ed40dafb2bb2dc3
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

texlive: update to 20220321

There is lots of updating to do, dependencies to handle.
Xindy probably should be built nowadays, for example.

This is an emergency update to get some texlive at all,
but the spell needs serious fixing.

diff --git a/latex/texlive/DEPENDS b/latex/texlive/DEPENDS
index 25f7a24..574c2b5 100755
--- a/latex/texlive/DEPENDS
+++ b/latex/texlive/DEPENDS
@@ -10,7 +10,6 @@ with_system cairo &&
with_system mpfr &&
with_system libpaper &&
with_system poppler XPDF_HEADERS &&
-with_system xpdf &&
with_system graphite2 &&
with_system harfbuzz GRAPHITE2 &&
with_system icu &&
diff --git a/latex/texlive/DETAILS b/latex/texlive/DETAILS
index 905ab22..a393953 100755
--- a/latex/texlive/DETAILS
+++ b/latex/texlive/DETAILS
@@ -1,6 +1,6 @@
SPELL=texlive
- VERSION=20200406
-
SOURCE_HASH=sha512:65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
+ VERSION=20220321
+
SOURCE_HASH=sha512:1c6b4c80d474b661060c3ac126b41782fd34e883139b9bca89ca1ffe543891bd9451df3be5e6297af965ddbceea9802008a61589344c3dee8075044b1b288dd7
SOURCE="${SPELL}-${VERSION}-source.tar.xz"

SOURCE_URL[0]=ftp://tug.org/historic/systems/texlive/${VERSION:0:4}/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION:0:8}-source"
diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY
index 3053efc..e37d416 100644
--- a/latex/texlive/HISTORY
+++ b/latex/texlive/HISTORY
@@ -1,3 +1,11 @@
+2023-03-08 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updating to 20220321, just to get it to build again
+ * PRE_BUILD: poppler versioning gone, hope remains
+ * patches/freetype2-config.patch: gone
+ * patches/texlive-20180414-source-upstream_fixes-1.patch: gone
+ * INSTALL: avoid failure because of old.libraries, note
+ about fmtutil and outdated texmf
+
2021-04-23 Ismael Luceno <ismael AT iodev.co.uk>
* FINAL, INSTALL: moved fontconfig cache update to FINAL

diff --git a/latex/texlive/INSTALL b/latex/texlive/INSTALL
index a4cc0b2..2eedc73 100755
--- a/latex/texlive/INSTALL
+++ b/latex/texlive/INSTALL
@@ -1,3 +1,5 @@
+# These mess with just-installed binaries. Should be fixed properly.
+rm -rf "${SOURCE_DIRECORY}/old.libraries" &&
cd ${COMPILE_DIRECTORY} &&
default_install &&

@@ -33,7 +35,10 @@ cp -vdR "$SOURCE_DIRECTORY/texk/tests/TeXLive" \

# update filename db & create all formats
${INSTALL_ROOT}/usr/bin/mktexlsr &&
-${INSTALL_ROOT}/usr/bin/fmtutil-sys --cnffile "$fmtutilcnf" --fmtdir
${INSTALL_ROOT}/usr/share/texmf-dist/web2c --all &&
+if ! ${INSTALL_ROOT}/usr/bin/fmtutil-sys --cnffile "$fmtutilcnf" --fmtdir
${INSTALL_ROOT}/usr/share/texmf-dist/web2c --all; then
+ message "${ERROR_COLOR}Failure of fmtutil might just mean that your texmf
is out of date.$DEFAULT_COLOR"
+ exit 1
+fi &&

# allow fontconfig to see latex fonts
mkdir -p "${INSTALL_ROOT}/etc/fonts/conf.avail" &&
diff --git a/latex/texlive/PRE_BUILD b/latex/texlive/PRE_BUILD
index 224b3b1..7281d3a 100755
--- a/latex/texlive/PRE_BUILD
+++ b/latex/texlive/PRE_BUILD
@@ -27,6 +27,9 @@ done &&
# Override bundled libraries' buildsystems to force system versions
# XXX lua52 and luajit can't be so easily removed due to internal API
# dependencies.
+# The whole xpdf business is confusing. We need an overhaul of dependencies,
+# anyway for the 2022 update. Just getting it to build!
+# xpdf \
for i in \
cairo \
freetype2 \
@@ -41,7 +44,6 @@ for i in \
pixman \
poppler \
potrace \
- xpdf \
zlib \
zziplib
do
@@ -72,29 +74,4 @@ sed '/utypes.h/i\
#include <unicode/utf16.h>
' -i texk/upmendex/mendex.h &&

-mkdir "$COMPILE_DIRECTORY" &&
-
-if spell_ok poppler; then
- cd "${SOURCE_DIRECTORY}/texk/web2c/pdftexdir" &&
- popplerver="$(installed_version poppler | cut -f 1,2 -d .)" &&
- 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
+mkdir "$COMPILE_DIRECTORY"
diff --git a/latex/texlive/patches/freetype2-config.patch
b/latex/texlive/patches/freetype2-config.patch
deleted file mode 100644
index 4be76fb..0000000
--- a/latex/texlive/patches/freetype2-config.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-Origin: Void Linux
-
-[ismael AT sourcemage.org: Required for using freetype >= 2.9.1]
-
-Disables the use of freetype2-config. Does some weird stuff on
-i686, armv5tel, ppc*, etc. No harm caused by disabling it
-everywhere.
-
---- a/texk/dvipng/configure 2020-06-08 10:00:42.953000000 +1000
-+++ b/texk/dvipng/configure 2020-06-08 10:00:57.069000000 +1000
-@@ -16432,10 +16432,7 @@
- else
- PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
- fi
--if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
-- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
-- FREETYPE2_LIBS=`$FT2_CONFIG --libs`
--elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
-+if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
- FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
- FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
- elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
---- a/configure 2020-06-08 10:03:04.785000000 +1000
-+++ b/configure 2020-06-08 10:01:47.902000000 +1000
-@@ -21471,10 +21471,7 @@
- else
- PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
- fi
--if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
-- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
-- FREETYPE2_LIBS=`$FT2_CONFIG --libs`
--elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
-+if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
- FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
- FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
- elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
---- a/libs/gd/configure 2019-03-26 04:27:50.000000000 +1100
-+++ b/libs/gd/configure 2020-06-08 10:06:28.481000000 +1000
-@@ -5933,10 +5933,7 @@
- else
- PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
- fi
--if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
-- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
-- FREETYPE2_LIBS=`$FT2_CONFIG --libs`
--elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
-+if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
- FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
- FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
- elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
---- a/texk/dvisvgm/configure 2020-03-22 09:04:56.000000000 +1100
-+++ b/texk/dvisvgm/configure 2020-06-08 10:08:15.384000000 +1000
-@@ -21794,10 +21794,7 @@
- else
- PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
- fi
--if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
-- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
-- FREETYPE2_LIBS=`$FT2_CONFIG --libs`
--elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
-+if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
- FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
- FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
- elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
---- a/texk/xdvik/configure 2020-03-02 06:07:53.000000000 +1100
-+++ b/texk/xdvik/configure 2020-06-08 10:08:15.731000000 +1000
-@@ -19055,10 +19055,7 @@
- else
- PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
- fi
--if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
-- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
-- FREETYPE2_LIBS=`$FT2_CONFIG --libs`
--elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
-+if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
- FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
- FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
- elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
---- a/texk/web2c/configure 2020-01-17 09:02:50.000000000 +1100
-+++ b/texk/web2c/configure 2020-06-08 10:08:15.533000000 +1000
-@@ -25346,10 +25346,7 @@
- else
- PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
- fi
--if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
-- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
-- FREETYPE2_LIBS=`$FT2_CONFIG --libs`
--elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
-+if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
- FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
- FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
- elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
---- a/texk/ttf2pk2/configure 2019-03-26 04:27:50.000000000 +1100
-+++ b/texk/ttf2pk2/configure 2020-06-08 10:08:15.656000000 +1000
-@@ -15265,10 +15265,7 @@
- else
- PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
- fi
--if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
-- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
-- FREETYPE2_LIBS=`$FT2_CONFIG --libs`
--elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
-+if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then
- FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
- FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
- elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
diff --git
a/latex/texlive/patches/texlive-20180414-source-upstream_fixes-1.patch
b/latex/texlive/patches/texlive-20180414-source-upstream_fixes-1.patch
deleted file mode 100644
index 3521d37..0000000
--- a/latex/texlive/patches/texlive-20180414-source-upstream_fixes-1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
b/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
---- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
-+++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
-@@ -761,7 +761,7 @@
- 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);
-diff --git a/texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc
b/texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc
---- a/texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc
-+++ b/texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc
-@@ -156,7 +156,6 @@
- (e->type == xrefEntryFree ? "f" : "n"));
- else { // e->offset is the object number of the
object stream
- Stream *str;
-- Lexer *lexer;
- Parser *parser;
- Object objStr, obj1, obj2;
- int nObjects, first, n;
-@@ -174,8 +173,7 @@
- // 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, lexer, false);
-+ parser = new Parser(xref, str, false);
- for (n = 0; n < nObjects; ++n) {
- obj1 = parser->getObj();
- obj2 = parser->getObj();



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (57d8cd85bea0dd488829f8aa2ed40dafb2bb2dc3), Thomas Orgis, 03/08/2023

Archive powered by MHonArc 2.6.24.

Top of Page