Skip to content

Commit

Permalink
synchronized texlive 69465.
Browse files Browse the repository at this point in the history
  • Loading branch information
clerkma committed Jan 17, 2024
1 parent e26bdbd commit 6b9f051
Show file tree
Hide file tree
Showing 476 changed files with 8,808 additions and 15,480 deletions.
39 changes: 22 additions & 17 deletions texlive/libs/README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$Id: README 69324 2024-01-07 02:49:52Z hironobu $
$Id: README 69453 2024-01-16 18:32:08Z karl $
Public domain. Originally created by Karl Berry, 2005.

Libraries we compile for TeX Live.
Expand All @@ -10,50 +10,55 @@ bypassing or using the original one.
See also comments in ../texk/README.

cairo 1.16.0 - checked 20oct18
http://cairographics.org/releases/
https://cairographics.org/releases/
There are later releases than this, but they removed autotools support.
Since cairo is only used by MetaPost (for png output), and 1.16.0
seems fine for that, not taking the time and trouble to update.

freetype2 2.13.2 - checked 26aug23
http://download.savannah.gnu.org/releases/freetype/
https://download.savannah.gnu.org/releases/freetype/

gd 2.3.3 - checked 13sep21
https://github.com/libgd/libgd/releases

gmp 6.2.1 - checked 15nov20
http://ftp.gnu.org/gnu/gmp/
https://ftp.gnu.org/gnu/gmp/

graphite2 1.3.14 - checked 10apr20
http://sourceforge.net/projects/silgraphite/files/graphite2/
https://sourceforge.net/projects/silgraphite/files/graphite2/
(requires C++11)

harfbuzz 8.3.0 - checked 12nov23
https://github.com/harfbuzz/harfbuzz/releases/tag/8.3.0
https://github.com/harfbuzz/harfbuzz/releases/latest

icu 74.2 - checked 22dec23
https://github.com/unicode-org/icu/releases/

libpaper 1.1.29 - checked 07jan24
http://ftp.debian.org/debian/pool/main/libp/libpaper/
https://ftp.debian.org/debian/pool/main/libp/libpaper/

libpng 1.6.40 - checked 22jun23
https://sourceforge.net/projects/libpng/files/ - used by many

lua 5.2.4 - checked 11mar15
http://www.lua.org/ftp/

lua 5.2.4
lua 5.3.6 - checked 04oct20
http://www.lua.org/ftp/
https://www.lua.org/ftp/
Lua updates must be done carefully, by the LuaTeX maintainer,
since Lua changes generally imply new incompatibilities.

luajit 2.1.0-beta3 - checked 20jun17
http://luajit.org/download/LuaJIT-2.1.0-beta3.tar.gz
https://luajit.org/download/LuaJIT-2.1.0-beta3.tar.gz
As with Lua.

mpfr 4.2.1 - checked 26aug23
http://ftp.gnu.org/gnu/mpfr/
https://ftp.gnu.org/gnu/mpfr/

pixman 0.42.2 - checked 03nov22
http://cairographics.org/releases/
https://cairographics.org/releases/
See cairo above.

potrace 1.16 - checked 29aug22
http://potrace.sourceforge.net
https://potrace.sourceforge.net/

pplib 2.05.0 - checked 21apr20
https://github.com/contextgarden/pplib
Expand All @@ -62,11 +67,11 @@ teckit 2.5.12 - checked 26aug23
https://github.com/silnrsi/teckit/archive/2.5.12.tar.gz

xpdf 4.04 - checked 24apr22
http://www.xpdfreader.com/download.html
https://www.xpdfreader.com/download.html
with modifications for pdftex

zlib 1.3.0 - checked 26aug23
http://www.zlib.net/ - used by many
https://www.zlib.net/ - used by many

zziplib 0.13.72 - checked 10sep22
https://github.com/gdraheim/zziplib/releases
30 changes: 15 additions & 15 deletions texlive/texk/README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$Id: README 69326 2024-01-07 04:37:44Z hironobu $
$Id: README 69453 2024-01-16 18:32:08Z karl $
Copyright 2006-2024 TeX Users Group.
You may freely use, modify and/or distribute this file.

Expand Down Expand Up @@ -26,16 +26,16 @@ bibtex-x - maintained here, contains
bibtex8, bibtexu

chktex 1.7.8 - checked 15dec22
http://mirror.ctan.org/support/chktex/
http://download.savannah.gnu.org/releases/chktex/
https://mirror.ctan.org/support/chktex/
https://download.savannah.gnu.org/releases/chktex/

cjkutils 4.8.5 - checked 22jan22
http://git.savannah.gnu.org/gitweb/?p=cjk.git;a=summary
http://www.nongnu.org/cjk/
https://git.savannah.gnu.org/gitweb/?p=cjk.git;a=summary
https://www.nongnu.org/cjk/

detex 2.8.11 - checked 07jan24
https://github.com/pkubowicz/opendetex/releases
original author: http://www.cs.purdue.edu/homes/trinkle/detex/
original author: https://www.cs.purdue.edu/homes/trinkle/detex/

dtl - maintained here, by Takuji

Expand All @@ -52,7 +52,7 @@ dviout-util - by Japanese TeX Development Community (Hironobu, Takuji et al.)

dvipdfm-x - maintained here, by us, contains
dvipdfmx and xdvipdfmx.
old info: http://project.ktug.org/dvipdfmx/
old info: https://project.ktug.org/dvipdfmx/

dvipng 1.17 - checked 31may22
https://mirror.ctan.org/dviware/dvipng/
Expand All @@ -61,7 +61,7 @@ dvipos - maintained here, by us

dvipsk - maintained here, by us

dvisvgm 3.0.3 - checked 21feb23
dvisvgm 3.2 - checked 16jan24
https://dvisvgm.de/Downloads/
https://github.com/mgieseki/dvisvgm
https://ctan.org/pkg/dvisvgm
Expand All @@ -85,7 +85,7 @@ mendexk - by Japanese TeX Development Community (Takuji, Hironobu et al.)
https://github.com/texjporg/tex-jp-build

musixtnt 2016-01-30 - checked 15mar20
http://mirror.ctan.org/macros/musixtnt/
https://mirror.ctan.org/macros/musixtnt/

ps2pk - maintained here, by us

Expand Down Expand Up @@ -121,19 +121,19 @@ web2c - maintained here, by us - core web2c, plain tex, etc.
eptex - https://github.com/texjporg/tex-jp-build
also: https://osdn.jp/projects/eptex
etex - maintained here
euptex - http://www.t-lab.opal.ne.jp/tex/uptex_en.html
euptex - https://www.t-lab.opal.ne.jp/tex/uptex_en.html
hitex - https://hint.userweb.mwn.de/hint/hitex.html
mflua[jit] - https://serveur-svn.lri.fr/svn/modhel/mflua
also: http://www.luatex.org/download.html
also: https://www.luatex.org/download.html
mplibdir - https://tug.org/metapost/
luatex - http://luatex.org/
pdftex - http://pdftex.org/
luatex - https://luatex.org/
pdftex - https://pdftex.org/
[u]pmpost - nothing current, see README for old info
ptex - https://github.com/texjporg/tex-jp-build
old info: https://asciidwango.github.io/ptex/
synctex - maintained here, but also https://github.com/jlaurens/synctex
uptex - http://www.t-lab.opal.ne.jp/tex/uptex_en.html
xetex - http://tug.org/xetex/
uptex - https://www.t-lab.opal.ne.jp/tex/uptex_en.html
xetex - https://tug.org/xetex/

xdvik 22.87.06 - checked 31may22
https://sourceforge.net/projects/xdvi/files/xdvik/
Expand Down
16 changes: 13 additions & 3 deletions texlive/texk/dvisvgm/TLpatches/TL-Changes
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,28 @@ cd ..

Update our ./configure.ac from upstream dvisvgm-src/configure.ac.
See patch-04-configure for reference, but they won't apply as-is.
Probably easiest to check dvisvgm-prev/configure.ac
vs. new, and then install the changes in our configure.ac by hand.
Probably easiest to check dvisvgm-prev/configure.ac vs. new:
diff dvisvgm-{prev,$ver}/configure.ac
and then install the changes in our configure.ac by hand.

# patch to integrate into TL build; will likely need adjusting also.
patch -d dvisvgm-src -p1 <TLpatches/patch-08-makefiles

# remake autostuff (then make, etc., with fingers crossed).
autoreconf

# try build.
# try build. Might need full rebuild due to C++.
make -C ../../Work/texk/dvisvgm

# try tests; they will fail due to dvisvgm version number,
# but make sure nothing else has changed.
make -C ../../Work/texk/dvisvgm check
#
# then update reference results:
\cp -f ../../Work/texk/dvisvgm/sample*.svg tests/
\cp -f ../../Work/texk/dvisvgm/upjf_full.svg tests/upjf.svg
\cp -f ../../Work/texk/dvisvgm/upjf1_full.svg tests/upjf1.svg

# before committing, update patches:
diff -u2 dvisvgm-$ver/configure.ac ./ >TLpatches/patch-04-configure
for m in `(cd ./dvisvgm-src && find -name Makefile.am -o -name defs.am)`; do \
Expand Down
68 changes: 31 additions & 37 deletions texlive/texk/dvisvgm/TLpatches/patch-04-configure
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
--- dvisvgm-3.0.3/configure.ac 2023-02-21 02:44:31.000000000 -0800
+++ ./configure.ac 2023-02-21 17:44:53.885508429 -0800
@@ -1,15 +1,32 @@
--- dvisvgm-3.2/configure.ac 2024-01-11 00:52:01.000000000 -0800
+++ ./configure.ac 2024-01-16 09:29:40.201424363 -0800
@@ -1,18 +1,31 @@
-# This file is part of dvisvgm
-# Copyright (C) 2005-2023 Martin Gieseking <[email protected]>
-# Copyright (C) 2005-2024 Martin Gieseking <[email protected]>
-#
-# Process this file with autoconf to produce a configure script.
-
+dnl $Id: configure.ac 65593 2023-01-20 01:55:04Z karl $
+dnl $Id: configure.ac 67404 2023-06-18 22:03:59Z karl $
+dnl Process this file with autoconf to produce a configure script
+dnl for dvisvgm in TeX Live.
+dnl
+dnl Copyright 2015-2023 Karl Berry <[email protected]>
+dnl Copyright 2015-2024 Karl Berry <[email protected]>
+dnl Copyright 2009-2014 Peter Breitenlohner <[email protected]>
+dnl
+dnl This file is free software; the copyright holder
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl Adapted for TeX Live from original dvisvgm configure.ac
+dnl Copyright 2005-2023 Martin Gieseking
+dnl Copyright 2005-2024 Martin Gieseking
+dnl
AC_PREREQ([2.69])
-AC_INIT([dvisvgm],[3.0.3],[[email protected]])
-AC_INIT([dvisvgm],[3.2],[[email protected]])
+m4_include([version.ac])[] dnl define dvisvgm_version
+AC_INIT([dvisvgm (TeX Live)], dvisvgm_version, [[email protected]])
DATE="February 2023"
DATE="January 2024"
-AC_CONFIG_SRCDIR(src)
+AC_CONFIG_SRCDIR([dvisvgm-src/src/dvisvgm.cpp])
AC_CONFIG_HEADERS([config.h])
Expand All @@ -34,20 +34,18 @@
+AC_CONFIG_MACRO_DIRS([../../m4])dnl not just _DIR
+AC_CONFIG_MACRO_DIRS([dvisvgm-src/m4])dnl ax_gcc_builtin
+AC_CONFIG_AUX_DIR([../../build-aux])
+
+AM_CONDITIONAL([TEXLIVE_BUILD], [test "x$enable_texlive_build" = xyes])
+
AM_CONDITIONAL([TEXLIVE_BUILD], [test "x$enable_texlive_build" = xyes])
+# Common code for all programs using libkpathsea.
+# PROG_AR must be run before KPSE_COMMON, since the latter calls LT_INIT.
+AM_PROG_AR
+KPSE_COMMON([dvisvgm])
+
AH_TEMPLATE([HOST_SYSTEM], [The machine triplet of the host system])
@@ -20,60 +37,35 @@
AC_DEFINE_UNQUOTED([HOST_SYSTEM], ["$host"])
@@ -22,60 +35,34 @@
AC_PROG_CXX
AX_CXX_COMPILE_STDCXX([11])
-AM_PROG_AR
+dnl AM_PROG_AR is above.
LT_INIT
+KPSE_CXX_HACK

Expand Down Expand Up @@ -124,27 +122,13 @@
+fi
AS_IF([test "x$have_libgs" = "xno"],
# Ghostscript not found, check for dlopen
@@ -81,69 +73,89 @@
@@ -83,65 +70,89 @@
[AC_DEFINE(DISABLE_GS, 1, [Set to 1 if PostScript support should be disabled])]
[AC_MSG_WARN(PostScript support disabled)])])
+fi

-# Check for pkg-config
-PKG_PROG_PKG_CONFIG
-
-# Check for libraries.
-PKG_CHECK_MODULES([FREETYPE], [freetype2])
-
-AC_ARG_ENABLE([woff],
- [AS_HELP_STRING([--disable-woff], [Disable WOFF support @<:@default=no@:>@])],
- [],
- [enable_woff=yes])
-AM_CONDITIONAL([ENABLE_WOFF], [test "x$enable_woff" = "xyes"])
-
-AC_ARG_WITH([ttfautohint],
- [AS_HELP_STRING([--with-ttfautohint@<:@=prefix@:>@], [enable ttfautohint support (disabled by default)])],
- [with_ttfautohint="$withval"],
- [with_ttfautohint=no])
+if test -z "$HAVE_LIBGS" || test "$HAVE_LIBGS" -eq 0; then
+ AC_MSG_NOTICE([not linking to libgs, trying to arrange for dynamic loading])
+ # Windows (native or MinGW32) has neither <dlfcn.h> nor dlopen().
Expand Down Expand Up @@ -209,6 +193,20 @@
+AC_CHECK_FUNC([kpse_set_program_name], [],
+ [AC_MSG_ERROR([cannot find/use libkpathsea])])

-# Check for libraries.
-PKG_CHECK_MODULES([FREETYPE], [freetype2])
-
-AC_ARG_ENABLE([woff],
- [AS_HELP_STRING([--disable-woff], [Disable WOFF support @<:@default=no@:>@])],
- [],
- [enable_woff=yes])
-AM_CONDITIONAL([ENABLE_WOFF], [test "x$enable_woff" = "xyes"])
-
-AC_ARG_WITH([ttfautohint],
- [AS_HELP_STRING([--with-ttfautohint@<:@=prefix@:>@], [enable ttfautohint support (disabled by default)])],
- [with_ttfautohint="$withval"],
- [with_ttfautohint=no])
-
-# Add option to enable linking of bundled libraries (brotli, potrace, woff2, xxhash).
-AC_ARG_ENABLE([bundled-libs],
- [AS_HELP_STRING([--enable-bundled-libs], [use bundled libraries instead of the system ones @<:@default=no@:>@])])
Expand Down Expand Up @@ -255,10 +253,6 @@
- [AC_MSG_NOTICE([enabled dynamic loading of ttfautohint])],
- [AC_MSG_WARN([disabled ttfautohint support])])])]
- [AC_SUBST(TTFAUTOHINT_CFLAGS) AC_SUBST(TTFAUTOHINT_LIBS)])])
-
-AC_CHECK_HEADERS([openssl/md5.h])
-PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto], [HAVE_LIBCRYPTO=1], [HAVE_LIBCRYPTO=0])
-AM_CONDITIONAL([USE_BUNDLED_MD5], [test "$HAVE_LIBCRYPTO" -eq 0])
+echo timestamp >config.force
+fi

Expand All @@ -272,7 +266,7 @@
+AC_HEADER_STDC
AC_CHECK_HEADERS_ONCE([libintl.h stdlib.h string.h strings.h unistd.h])

@@ -158,81 +170,82 @@
@@ -156,81 +167,82 @@
AX_GCC_BUILTIN(__builtin_clz)

-# add options for selection of "optional" library locations
Expand Down
Loading

0 comments on commit 6b9f051

Please sign in to comment.