summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvisvgm/TLpatches
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-01-21 17:25:16 +0000
committerKarl Berry <karl@freefriends.org>2022-01-21 17:25:16 +0000
commitd4696bc762d79099bd38898faea19cd7af41c1f5 (patch)
tree7da6d0bf4f49c5592296f0f903c94d152ad0d857 /Build/source/texk/dvisvgm/TLpatches
parent4dcaee1b127fff1f88f720d6c18c8e96989b98ef (diff)
dvisvgm 2.13
git-svn-id: svn://tug.org/texlive/trunk@61679 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvisvgm/TLpatches')
-rw-r--r--Build/source/texk/dvisvgm/TLpatches/TL-Changes5
-rw-r--r--Build/source/texk/dvisvgm/TLpatches/patch-04-configure70
-rw-r--r--Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles82
3 files changed, 75 insertions, 82 deletions
diff --git a/Build/source/texk/dvisvgm/TLpatches/TL-Changes b/Build/source/texk/dvisvgm/TLpatches/TL-Changes
index b2bdba2711e..cb97d3ca891 100644
--- a/Build/source/texk/dvisvgm/TLpatches/TL-Changes
+++ b/Build/source/texk/dvisvgm/TLpatches/TL-Changes
@@ -5,6 +5,7 @@ Changes applied to the original dvisvgm source as obtained from:
or (hopefully) https://ctan.org/pkg/dvisvgm
Update version in ./version.ac.
+Update DATE and copyrights in configure.ac.
mv dvisvgm-src dvisvgm-prev
tar xf dvisvgm-VER.tar.gz
@@ -30,11 +31,11 @@ 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 simpler to check the previous original dvisvgm/configure.ac
+Probably easiest to check the previous original dvisvgm/configure.ac
vs. the new, and then install the changes in our configure.ac by hand.
# patch to integrate into TL build; will probably need adjusting also.
patch -d dvisvgm-src -p1 <TLpatches/patch-08-makefiles
-# remake autostuff (then make, etc.).
+# remake autostuff (then make, etc., as usual).
autoreconf
diff --git a/Build/source/texk/dvisvgm/TLpatches/patch-04-configure b/Build/source/texk/dvisvgm/TLpatches/patch-04-configure
index fa1a443637b..8f210a67ff5 100644
--- a/Build/source/texk/dvisvgm/TLpatches/patch-04-configure
+++ b/Build/source/texk/dvisvgm/TLpatches/patch-04-configure
@@ -1,18 +1,18 @@
---- dvisvgm-2.11.1/configure.ac 2021-01-21 23:07:49.000000000 +0900
-+++ configure.ac 2021-01-23 08:58:18.575395177 +0900
-@@ -1,149 +1,156 @@
+--- dvisvgm-2.13/configure.ac 2022-01-20 01:52:06.000000000 -0800
++++ configure.ac 2022-01-21 09:14:30.484086131 -0800
+@@ -1,81 +1,69 @@
-# This file is part of dvisvgm
--# Copyright (C) 2005-2021 Martin Gieseking <martin.gieseking@uos.de>
+-# Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de>
-#
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.59)
--AC_INIT([dvisvgm],[2.11.1],[martin.gieseking@uos.de])
-+dnl $Id$
+-AC_INIT([dvisvgm],[2.13],[martin.gieseking@uos.de])
++dnl $Id: configure.ac 57804 2021-02-19 23:14:47Z karl $
+dnl Process this file with autoconf to produce a configure script
+dnl for dvisvgm in TeX Live.
+dnl
-+dnl Copyright 2015-2021 Karl Berry <tex-live@tug.org>
++dnl Copyright 2015-2022 Karl Berry <tex-live@tug.org>
+dnl Copyright 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+dnl
+dnl This file is free software; the copyright holder
@@ -20,12 +20,12 @@
+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-2020 Martin Gieseking
++dnl Copyright 2005-2022 Martin Gieseking
+dnl
+AC_PREREQ([2.65])
+m4_include([version.ac])[] dnl define dvisvgm_version
+AC_INIT([dvisvgm (TeX Live)], dvisvgm_version, [tex-k@tug.org])
- DATE="January 2021"
+ DATE="January 2022"
-AC_CONFIG_SRCDIR(src)
+AC_CONFIG_SRCDIR([dvisvgm-src/src/dvisvgm.cpp])
AC_CONFIG_HEADERS([config.h])
@@ -127,7 +127,7 @@
+fi
AS_IF([test "x$have_libgs" = "xno"],
# Ghostscript not found, check for dlopen
- [AC_CHECK_LIB(dl, dlopen,,
+@@ -83,66 +71,85 @@
[AC_DEFINE(DISABLE_GS, 1, [Set to 1 if PostScript support should be disabled])]
[AC_MSG_WARN(PostScript support disabled)])])
+fi
@@ -137,17 +137,6 @@
-
-# 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().
@@ -211,6 +200,17 @@
+AC_CHECK_FUNC([kpse_set_program_name], [],
+ [AC_MSG_ERROR([cannot find/use libkpathsea])])
+-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@:>@])])
@@ -270,9 +270,7 @@
+# emacs-page
# Check for header files.
AC_HEADER_DIRENT
- AC_HEADER_STDC
-@@ -158,80 +165,74 @@
- AC_FUNC_STAT
+@@ -159,79 +166,75 @@
AC_CHECK_FUNCS_ONCE([ftime gettimeofday sigaction umask uselocale])
-# add options for selection of "optional" library locations
@@ -286,22 +284,15 @@
- [AS_IF([test -n "$ZLIB_DIR"],
- [ZLIB_CFLAGS="-I$ZLIB_DIR -I$ZLIB_DIR/include"]
- [ZLIB_LIBS="-L$ZLIB_DIR/lib" -lz])])])
++AC_SEARCH_LIBS(clock_gettime, rt)dnl for Solaris 10 and other old libc
+
+-AC_SUBST([ZLIB_CFLAGS])
+-AC_SUBST([ZLIB_LIBS])
+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_DEFINE([HAVE_LIBKPATHSEA], 1, [Define to 1 if you have the `kpathsea' library (-lkpathsea).])
-+AC_DEFINE([HAVE_LIBFREETYPE], 1, [Define to 1 if you have the `freetype2' library (-lfreetype).])
-+AC_DEFINE([HAVE_LIBZ], 1, [Define to 1 if you have the `z' library (-lz).])
-+if false; then
-+ AC_DEFINE([KPSE_CXX_UNSAFE], 1, [Define to 1 if the kpathsea headers are not C++ safe.])
-+fi
-
--AC_SUBST([ZLIB_CFLAGS])
--AC_SUBST([ZLIB_LIBS])
-+# TL: skip ttfautohint?
-# Check if the kpathsea headers are C++ safe
-AC_MSG_CHECKING([if the kpathsea headers are C++ safe])
@@ -313,6 +304,15 @@
- AC_DEFINE([KPSE_CXX_UNSAFE], 1,
- [Define to 1 if the kpathsea headers are not C++ safe.])])
-AC_LANG_POP([C++])
++AC_DEFINE([HAVE_LIBKPATHSEA], 1, [Define to 1 if you have the `kpathsea' library (-lkpathsea).])
++AC_DEFINE([HAVE_LIBFREETYPE], 1, [Define to 1 if you have the `freetype2' library (-lfreetype).])
++AC_DEFINE([HAVE_LIBZ], 1, [Define to 1 if you have the `z' library (-lz).])
++if false; then
++ AC_DEFINE([KPSE_CXX_UNSAFE], 1, [Define to 1 if the kpathsea headers are not C++ safe.])
++fi
++
++# TL: skip ttfautohint?
++
+# 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@:>@])],
diff --git a/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles b/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles
index 1dbf08162f4..495c2f81aee 100644
--- a/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles
+++ b/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles
@@ -1,37 +1,39 @@
- See ./TL-Changes.
-
-diff '--exclude=*~' '--exclude=*.py[co]' '--exclude=*.[ao]' '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=autom4te.cache' '--exclude=Makefile.in' '--exclude=configure' '--exclude=Work' '--exclude=inst' '--exclude=build-pdftex' '--ignore-matching-lines=\$Id' -u2r dvisvgm-2.11.1/Makefile.am dvisvgm-src/Makefile.am
---- dvisvgm-2.11.1/Makefile.am 2021-01-21 06:06:33.000000000 -0800
-+++ dvisvgm-src/Makefile.am 2021-01-23 00:47:24.909030000 -0800
-@@ -6,5 +6,5 @@
- AUTOMAKE_OPTIONS = foreign
+diff --strip-trailing-cr -u1 -r dvisvgm-2.13/Makefile.am dvisvgm-src/Makefile.am
+--- dvisvgm-2.13/Makefile.am 2022-01-18 05:39:00.000000000 -0800
++++ dvisvgm-src/Makefile.am 2022-01-21 09:15:51.800456322 -0800
+@@ -7,3 +7,3 @@
EXTRA_DIST = COPYING
-SUBDIRS = libs m4 src tests doc
+SUBDIRS = libs src #not for TL: m4 tests doc
ACLOCAL_AMFLAGS = -I m4
-
-diff '--exclude=*~' '--exclude=*.py[co]' '--exclude=*.[ao]' '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=autom4te.cache' '--exclude=Makefile.in' '--exclude=configure' '--exclude=Work' '--exclude=inst' '--exclude=build-pdftex' '--ignore-matching-lines=\$Id' -u2r dvisvgm-2.11.1/libs/ff-woff/Makefile.am dvisvgm-src/libs/ff-woff/Makefile.am
---- dvisvgm-2.11.1/libs/ff-woff/Makefile.am 2021-01-21 06:06:33.000000000 -0800
-+++ dvisvgm-src/libs/ff-woff/Makefile.am 2021-06-26 08:57:25.865861500 -0700
-@@ -84,5 +84,5 @@
- EXTRA_DIST = LICENSE
+Only in dvisvgm-2.13: aclocal.m4
+Only in dvisvgm-2.13: ar-lib
+Only in dvisvgm-2.13: compile
+Only in dvisvgm-2.13: config.guess
+Only in dvisvgm-2.13: config.sub
+Only in dvisvgm-2.13: configure
+Only in dvisvgm-2.13: depcomp
+Only in dvisvgm-2.13: install-sh
+diff --strip-trailing-cr -u1 -r dvisvgm-2.13/libs/ff-woff/Makefile.am dvisvgm-src/libs/ff-woff/Makefile.am
+--- dvisvgm-2.13/libs/ff-woff/Makefile.am 2019-04-12 07:39:46.000000000 -0700
++++ dvisvgm-src/libs/ff-woff/Makefile.am 2022-01-21 09:15:51.801456314 -0800
+@@ -85,3 +85,3 @@
-AM_CFLAGS = -I$(srcdir)/inc -I$(srcdir)/fontforge $(ZLIB_CFLAGS)
+AM_CFLAGS = -I$(srcdir)/inc -I$(srcdir)/fontforge $(ZLIB_INCLUDES)
- @CODE_COVERAGE_RULES@
-diff '--exclude=*~' '--exclude=*.py[co]' '--exclude=*.[ao]' '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=autom4te.cache' '--exclude=Makefile.in' '--exclude=configure' '--exclude=Work' '--exclude=inst' '--exclude=build-pdftex' '--ignore-matching-lines=\$Id' -u2r dvisvgm-2.11.1/src/Makefile.am dvisvgm-src/src/Makefile.am
---- dvisvgm-2.11.1/src/Makefile.am 2021-01-21 06:06:33.000000000 -0800
-+++ dvisvgm-src/src/Makefile.am 2021-06-26 08:56:40.066387630 -0700
-@@ -5,5 +5,5 @@
-
+Only in dvisvgm-2.13: ltmain.sh
+Only in dvisvgm-2.13: m4
+Only in dvisvgm-2.13: missing
+diff --strip-trailing-cr -u1 -r dvisvgm-2.13/src/Makefile.am dvisvgm-src/src/Makefile.am
+--- dvisvgm-2.13/src/Makefile.am 2022-01-18 05:39:00.000000000 -0800
++++ dvisvgm-src/src/Makefile.am 2022-01-21 09:15:51.801456314 -0800
+@@ -6,3 +6,3 @@
bin_PROGRAMS = dvisvgm
-noinst_LTLIBRARIES = libdvisvgm.la
+noinst_LIBRARIES = libdvisvgm.a
SUBDIRS = optimizer
-
-@@ -15,11 +15,9 @@
-
+@@ -16,9 +16,7 @@
dvisvgm_LDADD = \
- $(noinst_LTLIBRARIES) \
+ $(noinst_LIBRARIES) \
@@ -44,9 +46,7 @@ diff '--exclude=*~' '--exclude=*.py[co]' '--exclude=*.[ao]' '--exclude=CVS' '--e
- $(ZLIB_LIBS)
+ $(XXHASH_LIBS)
- if ENABLE_WOFF
-@@ -36,7 +34,15 @@
- endif
+@@ -37,5 +35,13 @@
-dvisvgm_DEPENDENCIES = $(noinst_LTLIBRARIES)
+dvisvgm_LDADD += \
@@ -62,9 +62,7 @@ diff '--exclude=*~' '--exclude=*.py[co]' '--exclude=*.[ao]' '--exclude=CVS' '--e
+
+libdvisvgm_a_SOURCES = \
AGLTable.hpp \
- BasicDVIReader.hpp BasicDVIReader.cpp \
-@@ -161,26 +167,30 @@
-
+@@ -164,20 +170,14 @@
if ENABLE_WOFF
-libdvisvgm_la_SOURCES += ffwrapper.c ffwrapper.h
+libdvisvgm_a_SOURCES += ffwrapper.c ffwrapper.h
@@ -90,7 +88,7 @@ diff '--exclude=*~' '--exclude=*.py[co]' '--exclude=*.[ao]' '--exclude=CVS' '--e
- $(CODE_COVERAGE_CFLAGS)
+ -I$(dvisvgm_srcdir)/libs/variant/include
- AM_CXXFLAGS += \
+@@ -185,3 +185,13 @@
$(POTRACE_CFLAGS) \
- $(XXHASH_CFLAGS)
+ $(XXHASH_CFLAGS) \
@@ -105,16 +103,12 @@ diff '--exclude=*~' '--exclude=*.py[co]' '--exclude=*.[ao]' '--exclude=CVS' '--e
+AM_CXXFLAGS += -DTEXLIVEWIN32
+endif WIN32
- AM_LDFLAGS = \
-@@ -193,6 +203,4 @@
- -I$(dvisvgm_srcdir)/libs/ff-woff/inc
+@@ -196,4 +206,2 @@
-AM_CXXFLAGS += $(TTFAUTOHINT_CFLAGS)
-
AM_CXXFLAGS += \
- $(BROTLI_CFLAGS) \
-@@ -205,7 +213,8 @@
- endif
+@@ -208,5 +216,6 @@
-AM_LDFLAGS += $(TTFAUTOHINT_LIBS)
endif
@@ -122,14 +116,11 @@ diff '--exclude=*~' '--exclude=*.py[co]' '--exclude=*.[ao]' '--exclude=CVS' '--e
+# TL: do not try to rebuild these source files.
+if ! TEXLIVE_BUILD
- # the command-line parser class is generated from options.xml by opt2cpp
-@@ -221,6 +230,14 @@
-
+@@ -224,2 +233,3 @@
psdefs.ps: ;
+endif ! TEXLIVE_BUILD
- @CODE_COVERAGE_RULES@
-
+@@ -228 +238,8 @@
CLEANFILES = *.gcda *.gcno
+
+# Rebuild libkpathsea:
@@ -138,14 +129,15 @@ diff '--exclude=*~' '--exclude=*.py[co]' '--exclude=*.[ao]' '--exclude=CVS' '--e
+@FREETYPE2_RULE@
+# Rebuild libz:
+@ZLIB_RULE@
-diff '--exclude=*~' '--exclude=*.py[co]' '--exclude=*.[ao]' '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=autom4te.cache' '--exclude=Makefile.in' '--exclude=configure' '--exclude=Work' '--exclude=inst' '--exclude=build-pdftex' '--ignore-matching-lines=\$Id' -u2r dvisvgm-2.11.1/src/optimizer/Makefile.am dvisvgm-src/src/optimizer/Makefile.am
---- dvisvgm-2.11.1/src/optimizer/Makefile.am 2021-01-21 06:06:33.000000000 -0800
-+++ dvisvgm-src/src/optimizer/Makefile.am 2020-11-25 00:24:36.317206031 -0800
-@@ -1,5 +1,5 @@
+Only in dvisvgm-src/src: Makefile.am~
+diff --strip-trailing-cr -u1 -r dvisvgm-2.13/src/optimizer/Makefile.am dvisvgm-src/src/optimizer/Makefile.am
+--- dvisvgm-2.13/src/optimizer/Makefile.am 2019-12-06 00:42:54.000000000 -0800
++++ dvisvgm-src/src/optimizer/Makefile.am 2022-01-21 09:15:51.801456314 -0800
+@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = liboptimizer.la
+noinst_LIBRARIES = liboptimizer.a
-liboptimizer_la_SOURCES = \
+liboptimizer_a_SOURCES = \
AttributeExtractor.hpp AttributeExtractor.cpp \
- DependencyGraph.hpp \
+Only in dvisvgm-2.13: test-driver