diff options
Diffstat (limited to 'Build/source/texk/dvisvgm/TLpatches')
4 files changed, 32 insertions, 53 deletions
diff --git a/Build/source/texk/dvisvgm/TLpatches/TL-Changes b/Build/source/texk/dvisvgm/TLpatches/TL-Changes index 4de459624a7..da5ab203a23 100644 --- a/Build/source/texk/dvisvgm/TLpatches/TL-Changes +++ b/Build/source/texk/dvisvgm/TLpatches/TL-Changes @@ -14,7 +14,8 @@ cd dvisvgm-src # remove common and generated files: rm ar-lib compile config.guess config.sub depcomp install-sh rm ltmain.sh missing test-driver -rm aclocal.m4 configure # reduce chance of confusion? +rm -rf m4 autom4te.cache +rm -f aclocal.m4 configure # reduce chance of confusion? # # files to add: svn status | sed -n 's/^\?//p' @@ -30,8 +31,7 @@ cd .. Update our ./configure.ac from upstream dvisvgm-src/configure.ac. (See patch-04-configure-* for reference, but they won't apply as-is.) -# patch to integrate into TL build. Will probably need adjusting; -# any top_srcdir in dvisvgm-src/src/Makefile.am needs to become dvisvgm_srcdir. +# 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.). diff --git a/Build/source/texk/dvisvgm/TLpatches/patch-04-configure-tl b/Build/source/texk/dvisvgm/TLpatches/patch-04-configure-tl index 1a0f63a1fd6..4d8c71a4484 100644 --- a/Build/source/texk/dvisvgm/TLpatches/patch-04-configure-tl +++ b/Build/source/texk/dvisvgm/TLpatches/patch-04-configure-tl @@ -2,41 +2,14 @@ to the current one. For reference only, won't apply to a new version as is. See also patch-04-configure-upstream. ---- configure.ac (revision 49813) +--- configure.ac (revision 50314) +++ configure.ac (working copy) -@@ -10,12 +10,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-2018 Martin Gieseking -+dnl Copyright 2005-2019 Martin Gieseking - dnl +@@ -15,7 +15,7 @@ AC_PREREQ([2.65]) m4_include([version.ac])[] dnl define dvisvgm_version AC_INIT([dvisvgm (TeX Live)], dvisvgm_version, [tex-k@tug.org]) --DATE="October 2018" -+DATE="January 2019" +-DATE="January 2019" ++DATE="March 2019" AC_CONFIG_SRCDIR([dvisvgm-src/src/dvisvgm.cpp]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIRS([../../m4])dnl not just _DIR -@@ -200,8 +200,20 @@ - CODE_COVERAGE_RULES= - AC_SUBST([CODE_COVERAGE_RULES]) - -+# TL: the original configure calls pkg_check_modules, -+# which calls ac_arg_var on the _cflags and _libs for various libraries, -+# which calls ac_subst. we'll just ac_subst them to get initial (empty) -+# definitions, so we can retain the += used by the original lib/defs.am. -+# (init brotli) -+AC_SUBST(BROTLI_CFLAGS) -+AC_SUBST(BROTLI_LIBS) -+# (init woff2) -+AC_SUBST(WOFF2_CFLAGS) -+AC_SUBST(WOFF2_LIBS) -+ - AC_SUBST([DVISVGM_TREE], [dvisvgm-src]) - -+AC_SUBST([dvisvgm_srcdir], ['$(top_srcdir)/dvisvgm-src']) - AC_SUBST(DATE) - AC_SUBST(AM_CPPFLAGS) - AC_SUBST(AM_LDFLAGS) diff --git a/Build/source/texk/dvisvgm/TLpatches/patch-04-configure-upstream b/Build/source/texk/dvisvgm/TLpatches/patch-04-configure-upstream index 254c87a5861..ea055633138 100644 --- a/Build/source/texk/dvisvgm/TLpatches/patch-04-configure-upstream +++ b/Build/source/texk/dvisvgm/TLpatches/patch-04-configure-upstream @@ -1,4 +1,4 @@ - These are the (extensive) changes from the previous upstream + These are the (extensive) changes from the upstream dvisvgm configure.ac to the current one in TL. For reference only, won't apply to a new version as is. See also patch-04-configure-tl. @@ -8,21 +8,21 @@ TL builds, we want to use the versions of those which are in the TL source tree. ---- dvisvgm-2.6.2/configure.ac 2019-01-15 06:08:19.000000000 -0800 -+++ configure.ac 2019-01-25 15:10:14.747210950 -0800 -@@ -1,27 +1,41 @@ +--- dvisvgm-2.6.3/configure.ac 2019-03-09 04:13:38.000000000 -0800 ++++ configure.ac 2019-03-10 11:06:11.763261566 -0700 +@@ -1,78 +1,63 @@ -# This file is part of dvisvgm -# Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de> -# -# Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.59) --AC_INIT([dvisvgm],[2.6.2],[martin.gieseking@uos.de]) -+# $Id: configure.ac 49020 2018-10-29 22:11:07Z karl $ +-AC_INIT([dvisvgm],[2.6.3],[martin.gieseking@uos.de]) ++# $Id: configure.ac 49819 2019-01-25 23:20:32Z karl $ +dnl Process this file with autoconf to produce a configure script +dnl for dvisvgm in TeX Live. +dnl -+dnl Copyright 2015-2018 Karl Berry <tex-live@tug.org> ++dnl Copyright 2015-2019 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 @@ -35,7 +35,7 @@ +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 2019" + DATE="March 2019" -AC_CONFIG_SRCDIR(src) +AC_CONFIG_SRCDIR([dvisvgm-src/src/dvisvgm.cpp]) AC_CONFIG_HEADERS([config.h]) @@ -66,7 +66,10 @@ +KPSE_CXX_HACK AC_PROG_RANLIB -@@ -31,46 +45,18 @@ + AC_LANG(C) + +-AX_CHECK_COMPILE_FLAG([-Wmismatched-tags -Wno-mismatched-tags], [CXXFLAGS="$CXXFLAGS -Wno-mismatched-tags"]) + AC_CHECK_HEADERS([sys/time.h sys/timeb.h xlocale.h]) AC_HEADER_TIOCGWINSZ -CPPFLAGS_SAVE="$CPPFLAGS" @@ -127,7 +130,9 @@ +else have_libgs=yes AC_CHECK_HEADER([ghostscript/iapi.h], -@@ -82,66 +68,85 @@ + [AC_CHECK_LIB(gs, gsapi_revision,, [have_libgs=no])], +@@ -82,68 +67,87 @@ + [AC_CHECK_LIB(dl, dlopen,, [AC_DEFINE(DISABLE_GS, 1, [Set to 1 if PostScript support should be disabled])] [AC_MSG_WARN(PostScript support disabled)])]) +fi @@ -270,7 +275,9 @@ +# emacs-page # Check for header files. AC_HEADER_DIRENT -@@ -158,77 +163,72 @@ + AC_HEADER_STDC +@@ -158,79 +162,73 @@ + AC_FUNC_STAT AC_CHECK_FUNCS_ONCE([ftime gettimeofday sigaction umask uselocale]) -# add options for selection of "optional" library locations @@ -390,6 +397,7 @@ - libs/variant/Makefile - libs/woff2/Makefile - libs/xxHash/Makefile +- m4/Makefile - src/Makefile - src/version.hpp - tests/Makefile diff --git a/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles b/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles index df1e276f513..e5ce9d5ce3b 100644 --- a/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles +++ b/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles @@ -1,18 +1,16 @@ See ./TL-Changes. -diff -u2r dvisvgm-2.6.2/Makefile.am dvisvgm-src/Makefile.am ---- dvisvgm-2.6.2/Makefile.am 2019-01-15 06:04:43.000000000 -0800 -+++ dvisvgm-src/Makefile.am 2019-01-25 11:23:04.983398741 -0800 +--- dvisvgm-2.6.3/Makefile.am 2019-03-09 04:09:01.000000000 -0800 ++++ dvisvgm-src/Makefile.am 2019-03-10 11:06:34.614937057 -0700 @@ -6,5 +6,5 @@ AUTOMAKE_OPTIONS = foreign EXTRA_DIST = COPYING --SUBDIRS = libs src tests doc +-SUBDIRS = libs m4 src tests doc +SUBDIRS = libs src #not for TL: tests doc ACLOCAL_AMFLAGS = -I m4 -diff -u2r dvisvgm-2.6.2/src/Makefile.am dvisvgm-src/src/Makefile.am ---- dvisvgm-2.6.2/src/Makefile.am 2019-01-15 06:04:44.000000000 -0800 -+++ dvisvgm-src/src/Makefile.am 2019-01-25 11:24:16.836002925 -0800 +--- dvisvgm-2.6.3/src/Makefile.am 2019-03-09 04:09:01.000000000 -0800 ++++ dvisvgm-src/src/Makefile.am 2019-03-10 11:08:14.712515629 -0700 @@ -16,9 +16,6 @@ $(noinst_LIBRARIES) \ ../libs/clipper/libclipper.a \ @@ -47,7 +45,7 @@ diff -u2r dvisvgm-2.6.2/src/Makefile.am dvisvgm-src/src/Makefile.am + $(ZLIB_INCLUDES) \ $(CODE_COVERAGE_CFLAGS) --AM_CXXFLAGS = -Wall -Wnon-virtual-dtor -Wno-mismatched-tags \ +-AM_CXXFLAGS = -Wall -Wnon-virtual-dtor \ +AM_CXXFLAGS = $(WARNING_CXXFLAGS) -Wnon-virtual-dtor \ -I$(dvisvgm_srcdir)/libs/clipper \ - -I$(dvisvgm_srcdir)/libs/variant/include \ |