From ad547a6b5986815fda458221149728d9d9ab1d87 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 25 Feb 2021 19:22:25 +0000 Subject: restore Build,TODO from r57911 git-svn-id: svn://tug.org/texlive/trunk@57915 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvisvgm/TLpatches/ChangeLog | 221 +++++++++++ Build/source/texk/dvisvgm/TLpatches/TL-Changes | 40 ++ .../texk/dvisvgm/TLpatches/patch-04-configure | 417 +++++++++++++++++++++ .../texk/dvisvgm/TLpatches/patch-08-makefiles | 153 ++++++++ 4 files changed, 831 insertions(+) create mode 100644 Build/source/texk/dvisvgm/TLpatches/ChangeLog create mode 100644 Build/source/texk/dvisvgm/TLpatches/TL-Changes create mode 100644 Build/source/texk/dvisvgm/TLpatches/patch-04-configure create mode 100644 Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles (limited to 'Build/source/texk/dvisvgm/TLpatches') diff --git a/Build/source/texk/dvisvgm/TLpatches/ChangeLog b/Build/source/texk/dvisvgm/TLpatches/ChangeLog new file mode 100644 index 00000000000..c64445c335d --- /dev/null +++ b/Build/source/texk/dvisvgm/TLpatches/ChangeLog @@ -0,0 +1,221 @@ +2021-01-23 TANAKA Takuji + + * Import 2.11.1. + * patch-04-configure: adapt. + +2019-12-09 Martin Gieseking + + * Import 2.8.2. + +2019-11-19 Martin Gieseking + + * patch-04-configure-upstream, patch-08-makefiles, patch-09-woff-zlib: + adapt to 2.8.1. + * patch-10-psdefs: remove. + +2019-06-01 Karl Berry + + * patch-10-psdefs: from Akira. + +2019-03-26 Karl Berry + + * patch-09-woff-zlib: new file. From Mojca and Martin, + tlbuild 25 Mar 2019 21:03:53. + +2019-02-25 Karl Berry + + * patch-08-makefiles (AM_CXXFLAGS): use WARNING_CXXFLAGS, + omit -Wno-mismatched-tags. From Vojta and Scherer, + tlbuild 24 Feb 2019 11:48:55. + +2018-08-30 Karl Berry + + * patch-08-makefiles: adapt to 2.5. + +2018-07-19 Akira Kakuto + + * Import 2.4.2. + * patch-08-makefiles: adapt. + +2018-07-08 Akira Kakuto + + * Import 2.4.1. + * patch-08-makefiles: adapt. + +2018-05-04 Akira Kakuto + + * Import 2.4. + * patch-08-makefiles: adapt. + +2018-03-24 Akira Kakuto + + * Import 2.3.5. + * patch-08-makefiles: adapt. + +2018-02-21 Akira Kakuto + + * Import 2.3.3. + * patch-08-makefiles: adapt. + +2018-02-09 Akira Kakuto + + * Import 2.3.2. + * patch-08-makefiles: adapt. + * patch-16-gserrornames: Remove. + +2018-01-15 Karl Berry + + * Import 2.3.1. + * patch-08-makefiles: adapt. + * patch-16-gserrornames: new patch from Martin. + +2017-01-29 Karl Berry + + * Import 2.1. + * patch-08-makefiles: adapt dvisvgm build to TL. + +2016-07-04 Akira Kakuto + + * Import release 1.16 + * patch-01-process: removed since it is included in the upstream. + +2016-04-25 Karl Berry + + * patch-01-process: received from dvisvgm author. + +2016-04-20 Akira Kakuto + + * Import release 1.15.1 + +2016-02-27 Akira Kakuto + + * Import release 1.15 + +2016-01-20 Akira Kakuto + + * Import release 1.14.2 + +2016-01-06 Akira Kakuto + + * Import release 1.14.1 + +2015-12-28 Akira Kakuto + + * Import release 1.14. + +2015-12-09 Akira Kakuto + + * Import release 1.13. + +2015-12-03 Akira Kakuto + + * Import release 1.12. + +2015-04-12 Peter Breitenlohner + + * Import release 1.9.2. + +2015-03-01 Peter Breitenlohner + + * Import release 1.9.1. + * patch-01-mingw32, patch-09-funccall, patch-10-pow-int-int + (removed): Included upstream. + +2015-01-15 Peter Breitenlohner + + * patch-10-pow-int-int (new): Build fix for ppc-darwin gcc-4.2, + from Mojca Miklavec . + +2015-01-11 Karl Berry + + * patch-09-funccall (new): LLVM/Clang build (or bug) fix. + problem found by Richard Koch . + +2015-01-07 Peter Breitenlohner + + * Import release 1.9. + * patch-01-mingw32 (new): Oldish MinGW32 may not define this. + +2014-09-15 Peter Breitenlohner + + * Import release 1.8.1. + +2014-07-31 Peter Breitenlohner + + * Import release 1.8. + * patch-01-cygwin (removed): Included upstream. + +2014-06-25 Peter Breitenlohner + + * patch-01-cygwin (new): Cygwin soname for gs library. + +2014-06-20 Peter Breitenlohner + + * Import release 1.7. + +2014-04-29 Peter Breitenlohner + + * Import release 1.6. + +2014-04-13 Peter Breitenlohner + + * Import release 1.5.3. + +2014-01-13 Peter Breitenlohner + + * Import release 1.5.2. + +2013-10-30 Peter Breitenlohner + + * Import release 1.5.1. + +2013-09-17 Akira Kakuto + + * patch-01-MSVC (removed): Instead compile with -DNOMINMAX. + +2013-09-16 Akira Kakuto + + * patch-01-MSVC (new): Build fix for Visual Studio 2010. + +2013-09-10 Peter Breitenlohner + + * Import release 1.5. + * patch-01-cpp, patch-02-config_h: Removed. + +2013-08-08 Peter Breitenlohner + + * Import release 1.4. + * patch-01-cpp, patch-02-config_h: Adapted. + +2013-06-28 Peter Breitenlohner + + * patch-02-config_h (new): Include always first. + +2013-06-16 Peter Breitenlohner + + * patch-01-cpp: New version for kpathsea adapted to C++. + +2013-05-17 Peter Breitenlohner + + * Import release 1.3. + * patch-01-cpp: Adapted. + +2013-04-11 Peter Breitenlohner + + * Import release 1.2.1. + * patch-1-cpp (removed): Renamed ... + * patch-01-cpp (new): ... and adapted. + +2013-04-02 Karl Berry + + * patch-1-cpp (new): Force __cplusplus to be 1, + for sake of g++ 4.7.x and including c-memstr.h and Solaris. + Patch from Apostolos, tlbuild 1 Apr 2013 00:34:43. + +2013-03-02 Peter Breitenlohner + + * Import release 1.2. + +2013-01-29 Peter Breitenlohner + + * Import release 1.1. diff --git a/Build/source/texk/dvisvgm/TLpatches/TL-Changes b/Build/source/texk/dvisvgm/TLpatches/TL-Changes new file mode 100644 index 00000000000..b2bdba2711e --- /dev/null +++ b/Build/source/texk/dvisvgm/TLpatches/TL-Changes @@ -0,0 +1,40 @@ +(This file public domain.) + +Changes applied to the original dvisvgm source as obtained from: + https://dvisvgm.de/Downloads/ + or (hopefully) https://ctan.org/pkg/dvisvgm + +Update version in ./version.ac. + +mv dvisvgm-src dvisvgm-prev +tar xf dvisvgm-VER.tar.gz +mv dvisvgm-VER dvisvgm-src +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 -rf m4 autom4te.cache +rm -f aclocal.m4 configure # reduce chance of confusion? +# +# files to add: +svn status | sed -n 's/^\?//p' +svn add `!!` +svn status | sed -n 's/^\?//p' # rerun, should be empty now +# +# files to remove: +svn status | sed -n 's/^\!//p' +svn rm `!!` +svn status | sed -n 's/^\!//p' # rerun, should be empty now +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 +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 +-# +-# 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$ ++dnl Process this file with autoconf to produce a configure script ++dnl for dvisvgm in TeX Live. ++dnl ++dnl Copyright 2015-2021 Karl Berry ++dnl Copyright 2009-2014 Peter Breitenlohner ++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-2020 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" +-AC_CONFIG_SRCDIR(src) ++AC_CONFIG_SRCDIR([dvisvgm-src/src/dvisvgm.cpp]) + AC_CONFIG_HEADERS([config.h]) +-AC_CONFIG_MACRO_DIR([m4]) +-AC_CANONICAL_HOST +-AC_CANONICAL_TARGET +-AM_INIT_AUTOMAKE([subdir-objects]) ++AC_CONFIG_MACRO_DIRS([../../m4])dnl not just _DIR ++AC_CONFIG_AUX_DIR([../../build-aux]) ++ ++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([TARGET_SYSTEM], [The machine triplet of the target system]) + AC_DEFINE_UNQUOTED([TARGET_SYSTEM], ["$target"]) + +-# Checks for programs. + AC_PROG_CC + AC_PROG_CC_C99 + AC_PROG_CXX + AX_CXX_COMPILE_STDCXX([11]) +-AM_PROG_AR + LT_INIT ++KPSE_CXX_HACK + + AC_PROG_RANLIB + 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" +-CFLAGS_SAVE="$CFLAGS" +-LDFLAGS_SAVE="$LDFLAGS" +- +-# Check availability and usability of the kpathsea library +-AC_ARG_VAR(KPSE_CFLAGS, [C/C++ compiler flags for the kpathsea library]) +-AC_ARG_VAR(KPSE_LIBS, [linker flags for the kpathsea library]) +-AC_ARG_VAR(KPSE_LIBS, []) +-AC_ARG_WITH([kpathsea], +- [AS_HELP_STRING([--with-kpathsea=prefix], [set location of kpathsea library])], +- [with_kpathsea="$withval"], +- [with_kpathsea=yes]) +- +-AS_IF([test "x$with_kpathsea" != "xyes"], +- [KPSE_CFLAGS="-I$with_kpathsea/include" KPSE_LIBS="-L$with_kpathsea/lib"] +- [CPPFLAGS="$CPPFLAGS $KPSE_CFLAGS" CFLAGS="$CFLAGS $KPSE_CFLAGS" LDFLAGS="$LDFLAGS $KPSE_LIBS"]) +- +-AC_CHECK_HEADER([kpathsea/kpathsea.h],, +- [AC_MSG_ERROR([please install the kpathsea development package])]) +-AC_CHECK_LIB([kpathsea], [kpse_find_file],, +- [AC_MSG_ERROR([libkpathsea not found, please install the corresponding package first])]) +- +-AC_MSG_CHECKING([kpathsea version]) +-AC_RUN_IFELSE([AC_LANG_SOURCE([#include +- #include +- int main() { +- FILE *f; +- f = fopen("kpseversion", "w"); +- if(!f) exit(1); +- fprintf(f, "%s\n", KPSEVERSION); +- fclose(f); +- exit(0); +- }])], +- [kpseversion=`cat kpseversion|sed 's/kpathsea version //'`], [kpseversion=], [kpseversion=unknown]) +-AC_MSG_RESULT("$kpseversion") +-rm -f kpseversion +-AS_IF([test -z "$kpseversion"], +- [AC_MSG_ERROR([Could not compile a simple kpathsea program -- check your installation])]) +-AC_SUBST(KPSE_CFLAGS) +-AC_SUBST(KPSE_LIBS) +- +-# Check how to link Ghostscript ++KPSE_COND_WIN32 ++KPSE_KPATHSEA_FLAGS ++KPSE_FREETYPE2_FLAGS ++KPSE_ZLIB_FLAGS ++ ++KPSE_SAVE_FLAGS ++ ++# emacs-page Ghostscript complexities. ++LIBGS_INCLUDES= ++LIBGS_LIBS= ++if test "x$enable_native_texlive_build" = xyes; then ++ # TL: always dlload libgs, must avoid shared lib ref in binary. ++ HAVE_LIBGS=0 ++else + have_libgs=yes + AC_CHECK_HEADER([ghostscript/iapi.h], + [AC_CHECK_LIB(gs, gsapi_revision,, [have_libgs=no])], + [have_libgs=no]) ++if test "x$have_libgs" = xyes; then ++ HAVE_LIBGS=1 ++fi + AS_IF([test "x$have_libgs" = "xno"], + # Ghostscript not found, check for dlopen + [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 + +-# 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 nor dlopen(). ++ if test "x$kpse_cv_have_win32" = xno; then ++ # FreeBSD neither has nor requires libdl. ++ AC_SEARCH_LIBS([dlopen], [dl]) ++ AS_CASE([$ac_cv_search_dlopen], ++ [no | "none required"], [], ++ [LIBGS_LIBS=$ac_cv_search_dlopen]) ++ AC_CHECK_HEADER([dlfcn.h]) ++ AC_CHECK_FUNC([dlopen]) ++ if test "x$ac_cv_header_dlfcn_h:$ac_cv_func_dlopen" != xyes:yes; then ++ AC_DEFINE(DISABLE_GS, 1, ++ [Set to 1 if PostScript support is to be disabled]) ++ LIBGS_LIBS= ++ fi ++ fi ++else ++ # query Ghostscript version ++ AC_MSG_CHECKING([Ghostscript version]) ++ AC_RUN_IFELSE([AC_LANG_SOURCE([#include ++ #include ++ int main () { ++ gsapi_revision_t r; ++ if (gsapi_revision(&r, sizeof(gsapi_revision_t)) == 0) { ++ FILE *f; ++ f = fopen("gsversion", "w"); ++ if (!f) exit(1); ++ fprintf(f, "%ld\n", r.revision); ++ fclose(f); ++ exit(0); ++ } ++ }])], ++ [gsversion=`cat gsversion`], [gsversion=], [gsversion=unknown]) ++ AC_MSG_RESULT("$gsversion") ++ rm -f gsversion ++ if test -z "$gsversion" || test "$gsversion" -lt 831; then ++ # current Ghostscript API was introduced in version 8.31 ++ # older versions are not supported ++ AC_DEFINE(DISABLE_GS, 1, [Set to 1 if PostScript support should be disabled]) ++ AC_MSG_WARN([Ghostscript version < 8.31 found; PostScript support disabled]) ++ else ++ LIBGS_LIBS=-lgs ++ fi ++fi ++AC_SUBST([LIBGS_INCLUDES]) ++AC_SUBST([LIBGS_LIBS]) ++ ++if test "x$enable_build" != xno || test -f config.force; then ++ ++# Checks for more libraries. ++KPSE_ADD_FLAGS([zlib]) ++AC_CHECK_FUNC([gzopen], [], ++ [AC_MSG_ERROR([cannot find/use zlib])]) ++ ++KPSE_ADD_FLAGS([freetype2]) ++AC_CHECK_FUNC([FT_Init_FreeType], [], ++ [AC_MSG_ERROR([cannot find/use libfreetype])]) ++ ++KPSE_ADD_FLAGS([kpathsea]) ++AC_CHECK_FUNC([kpse_set_program_name], [], ++ [AC_MSG_ERROR([cannot find/use libkpathsea])]) + +-# 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@:>@])]) +-AM_CONDITIONAL([USE_BUNDLED_LIBS], [test "x$enable_bundled_libs" = "xyes"]) ++# Check if the kpathsea headers are C++ safe. ++AC_LANG_PUSH([C++]) ++AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], ++ [[printf("%s\n", concat("one", "two"))]])], ++ [], ++ [AC_MSG_ERROR([Sorry, your kpathsea headers are too old]) ++ AC_DEFINE([KPSE_CXX_UNSAFE], 1, ++ [Define to 1 if the kpathsea headers are not C++ safe.])]) ++AC_LANG_POP([C++]) + +-# If option --enable-bundled-libs is not given, look for system libraries of brotli, potrace, woff2, and xxhash. +-AS_IF([test "x$enable_bundled_libs" != "xyes"], +- [AC_CHECK_HEADER(potracelib.h, +- [AC_SEARCH_LIBS(potrace_trace, [potrace], [have_potrace=yes])])] +- [AC_CHECK_HEADER([xxhash.h], +- [AC_SEARCH_LIBS(XXH32, [xxhash], [have_xxhash=yes])])] +- [AS_IF([test "x$enable_woff" = "xyes"], +- [PKG_CHECK_MODULES(BROTLI, [libbrotlienc], [have_brotli=yes])] +- [PKG_CHECK_MODULES(WOFF2, [libwoff2enc], [have_woff2=yes])])]) +-AM_CONDITIONAL(HAVE_POTRACE, [test "x$have_potrace" = "xyes"]) +-AM_CONDITIONAL(HAVE_BROTLI, [test "x$have_brotli" = "xyes"]) +-AM_CONDITIONAL(HAVE_WOFF2, [test "x$have_woff2" = "xyes"]) +-AM_CONDITIONAL(HAVE_XXHASH, [test "x$have_xxhash" = "xyes"]) +- +-AS_IF([test "x$enable_woff" != "xyes"], +- [AC_DEFINE([DISABLE_WOFF], 1, [Define if WOFF support is disabled])], +- [AS_IF([test "x$with_ttfautohint" != "xno"], +- [AS_IF([test "x$with_ttfautohint" = "xyes"], +- # --with-ttfautohint without path => check via pkg-config +- [PKG_CHECK_MODULES([TTFAUTOHINT], [ttfautohint],, +- [AC_MSG_ERROR([can't locate ttfautohint, use "--with-ttfautohint=path" to specify its location])])], +- # --with-ttfautohint=/path/ttfautohint given +- [TTFAUTOHINT_CFLAGS="-I$with_ttfautohint/include"] +- [TTFAUTOHINT_LIBS="-L$with_ttfautohint/lib"])] +- [CPPFLAGS="$CPPFLAGS $TTFAUTOHINT_CFLAGS" CFLAGS="$CFLAGS $TTFAUTOHINT_CFLAGS" LDFLAGS="$LDFLAGS $TTFAUTOHINT_LIBS"] +- [AC_CHECK_HEADERS([ttfautohint.h],, [AC_MSG_WARN([ttfautohint.h not found])])] +- [AC_CHECK_LIB([ttfautohint], [TTF_autohint],, +- [AC_MSG_WARN([no working ttfautohint library found])] +- [AC_CHECK_LIB(dl, dlopen, +- [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 + +-AC_CHECK_LIB(z, gzopen) ++KPSE_RESTORE_FLAGS + ++# emacs-page + # Check for header files. + AC_HEADER_DIRENT + AC_HEADER_STDC +@@ -158,80 +165,74 @@ + AC_FUNC_STAT + AC_CHECK_FUNCS_ONCE([ftime gettimeofday sigaction umask uselocale]) + +-# add options for selection of "optional" library locations +-# currently these libraries are mandatory; the --with-foo options +-# are used to specify the locations explicitely +- +-AC_ARG_WITH(zlib, +- [AS_HELP_STRING([--with-zlib=DIR], [set location of the zlib library])], +- [AS_IF([test "x$withval" != "xno"], +- [AS_IF([test "x$withval" != "xyes"], [ZLIB_DIR=$withval])] +- [AS_IF([test -n "$ZLIB_DIR"], +- [ZLIB_CFLAGS="-I$ZLIB_DIR -I$ZLIB_DIR/include"] +- [ZLIB_LIBS="-L$ZLIB_DIR/lib" -lz])])]) ++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]) +-AC_LANG_PUSH([C++]) +-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], +- [[printf("%s\n", concat("one", "two"))]])], +- [AC_MSG_RESULT([yes])], +- [AC_MSG_RESULT([no]) +- AC_DEFINE([KPSE_CXX_UNSAFE], 1, +- [Define to 1 if the kpathsea headers are not C++ safe.])]) +-AC_LANG_POP([C++]) ++# 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@:>@])], ++ [use_bundled_libs=yes]) ++AM_CONDITIONAL([USE_BUNDLED_LIBS], [test "x$use_bundled_libs" = "xyes" dnl ++ || test "x$enable_native_texlive_build" = xyes]) ++# that is, force using bundled libs for native TL build. ++ ++# TL: use bundled md5 too ++AM_CONDITIONAL([USE_BUNDLED_MD5], true) ++ ++# TL: these conditionals for system libraries are in the Makefile.am's. ++AM_CONDITIONAL(HAVE_POTRACE, false) ++AM_CONDITIONAL(HAVE_BROTLI, false) ++AM_CONDITIONAL(HAVE_WOFF2, false) ++AM_CONDITIONAL(HAVE_XXHASH, false) ++ ++# TL: not going to build_manpage (which is the default). ++# TL: not going to attempt code coverage; need to subst it away. ++AM_CONDITIONAL([CODE_COVERAGE_ENABLED], false) ++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) + +-CPPFLAGS="$CPPFLAGS_SAVE" +-CFLAGS="$CFLAGS_SAVE" +-LDFLAGS="$LDFLAGS_SAVE" +- +-AC_ARG_ENABLE([manpage], +- [AS_HELP_STRING([--disable-manpage], [disable generation of manual page @<:@default=no@:>@])]) +-AS_IF([test "x$enable_manpage" != "xno"],[ +- enable_manpage="no" +- # Check for utilities required to build the manpage +- AC_CHECK_PROG(ASCIIDOC, asciidoc, yes) +- AS_IF([test "x$ASCIIDOC" = "xyes"], [ +- AC_CHECK_PROG(XMLTO, xmlto, yes) +- AS_IF([test "x$XMLTO" = "xyes"], [ +- AC_CHECK_PROG(XSLTPROC, xsltproc, yes) +- AS_IF([test "x$XSLTPROC" = "xyes"],[enable_manpage="yes"])])])]) +-AS_IF([test "x$enable_manpage" != "xyes"], +- AC_MSG_NOTICE([generation of manual page has been disabled])) +-AM_CONDITIONAL([BUILD_MANPAGE], [test "x$enable_manpage" = "xyes"]) +- +-AX_CODE_COVERAGE +-AS_IF([ test "$enable_code_coverage" = "yes" ], [ +- # disable optimization +- changequote({,}) +- CFLAGS=`echo $CFLAGS | sed 's/-O[1-9s]//g'` +- CXXFLAGS=`echo $CXXFLAGS | sed 's/-O[1-9s]//g'` +- changequote([,]) +-]) ++AC_SUBST([DVISVGM_TREE], [dvisvgm-src]) + +-AC_SUBST([dvisvgm_srcdir], ['$(top_srcdir)']) ++AC_SUBST([dvisvgm_srcdir], ['$(top_srcdir)/dvisvgm-src']) + AC_SUBST(DATE) + AC_SUBST(AM_CPPFLAGS) + AC_SUBST(AM_LDFLAGS) +-AC_CONFIG_FILES([ +- Makefile +- libs/Makefile +- libs/brotli/Makefile +- libs/clipper/Makefile +- libs/ff-woff/Makefile +- libs/md5/Makefile +- libs/potrace/Makefile +- libs/variant/Makefile +- libs/woff2/Makefile +- libs/xxHash/Makefile +- m4/Makefile +- src/Makefile +- src/version.hpp +- src/optimizer/Makefile +- tests/Makefile +- tests/data/Makefile +- doc/Makefile]) ++AC_CONFIG_FILES([Makefile ++ dvisvgm-src/Makefile ++ dvisvgm-src/libs/Makefile ++ dvisvgm-src/libs/brotli/Makefile ++ dvisvgm-src/libs/clipper/Makefile ++ dvisvgm-src/libs/ff-woff/Makefile ++ dvisvgm-src/libs/md5/Makefile ++ dvisvgm-src/libs/potrace/Makefile ++ dvisvgm-src/libs/variant/Makefile ++ dvisvgm-src/libs/woff2/Makefile ++ dvisvgm-src/libs/xxHash/Makefile ++ dvisvgm-src/src/Makefile ++ dvisvgm-src/src/version.hpp ++ dvisvgm-src/src/optimizer/Makefile ++])dnl TL: skipping tests/* and doc/* + AC_OUTPUT diff --git a/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles b/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles new file mode 100644 index 00000000000..3901a1b4592 --- /dev/null +++ b/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles @@ -0,0 +1,153 @@ + See ./TL-Changes. + +--- dvisvgm-2.8.2/Makefile.am 2019-07-08 17:24:34.000000000 +0200 ++++ dvisvgm-src/Makefile.am 2019-11-16 13:57:04.091210187 +0100 +@@ -5,7 +5,7 @@ + + AUTOMAKE_OPTIONS = foreign + EXTRA_DIST = COPYING +-SUBDIRS = libs m4 src tests doc ++SUBDIRS = libs src #not for TL: m4 tests doc + ACLOCAL_AMFLAGS = -I m4 + + if USE_BUNDLED_LIBS +--- dvisvgm-2.8.2/src/Makefile.am 2019-09-12 14:43:35.000000000 +0200 ++++ dvisvgm-src/src/Makefile.am 2019-11-16 15:54:55.820450555 +0100 +@@ -4,7 +4,7 @@ + ## Process this file with automake. + + bin_PROGRAMS = dvisvgm +-noinst_LTLIBRARIES = libdvisvgm.la ++noinst_LIBRARIES = libdvisvgm.a + SUBDIRS = optimizer + + dvisvgm_SOURCES = \ +@@ -14,13 +14,11 @@ + include ../libs/defs.am + + dvisvgm_LDADD = \ +- $(noinst_LTLIBRARIES) \ ++ $(noinst_LIBRARIES) \ ++ optimizer/liboptimizer.a \ + ../libs/clipper/libclipper.a \ +- $(FREETYPE_LIBS) \ +- $(FONTFORGE_LIBS) \ + $(POTRACE_LIBS) \ +- $(XXHASH_LIBS) \ +- $(ZLIB_LIBS) ++ $(XXHASH_LIBS) + + if ENABLE_WOFF + dvisvgm_LDADD += \ +@@ -35,9 +33,17 @@ + dvisvgm_LDADD += $(LIBCRYPTO_LIBS) + endif + +-dvisvgm_DEPENDENCIES = $(noinst_LTLIBRARIES) ++dvisvgm_LDADD += \ ++ $(KPATHSEA_LIBS) \ ++ $(FREETYPE2_LIBS) \ ++ $(FONTFORGE_LIBS) \ ++ $(ZLIB_LIBS) \ ++ $(LIBGS_LIBS) + +-libdvisvgm_la_SOURCES = \ ++dvisvgm_DEPENDENCIES = $(noinst_LIBRARIES) ++dvisvgm_DEPENDENCIES += $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) $(FREETYPE2_DEPEND) ++ ++libdvisvgm_a_SOURCES = \ + AGLTable.hpp \ + BasicDVIReader.hpp BasicDVIReader.cpp \ + Bezier.hpp Bezier.cpp \ +@@ -160,28 +166,31 @@ + ZLibOutputStream.hpp + + if ENABLE_WOFF +-libdvisvgm_la_SOURCES += ffwrapper.c ffwrapper.h ++libdvisvgm_a_SOURCES += ffwrapper.c ffwrapper.h + endif + +-libdvisvgm_la_LIBADD = optimizer/liboptimizer.la +- + EXTRA_DIST = options.xml options.dtd iapi.h ierrors.h MiKTeXCom.hpp MiKTeXCom.cpp + +-AM_CFLAGS = -Wall \ +- $(ZLIB_CFLAGS) \ ++AM_CFLAGS = $(WARNING_CFLAGS) \ ++ $(ZLIB_INCLUDES) \ + $(CODE_COVERAGE_CFLAGS) + +-AM_CXXFLAGS = -Wall -Wnon-virtual-dtor \ ++AM_CXXFLAGS = $(WARNING_CXXFLAGS) -Wnon-virtual-dtor \ + -I$(dvisvgm_srcdir)/libs/clipper \ +- -I$(dvisvgm_srcdir)/libs/variant/include \ +- $(KPSE_CFLAGS) \ +- $(FREETYPE_CFLAGS) \ +- $(ZLIB_CFLAGS) \ +- $(CODE_COVERAGE_CFLAGS) ++ -I$(dvisvgm_srcdir)/libs/variant/include + + AM_CXXFLAGS += \ + $(POTRACE_CFLAGS) \ +- $(XXHASH_CFLAGS) ++ $(XXHASH_CFLAGS) \ ++ $(KPATHSEA_INCLUDES) \ ++ $(POTRACE_INCLUDES) \ ++ $(FREETYPE2_INCLUDES) \ ++ $(LIBGS_INCLUDES) \ ++ $(CODE_COVERAGE_CFLAGS) ++ ++if WIN32 ++AM_CXXFLAGS += -DTEXLIVEWIN32 ++endif WIN32 + + AM_LDFLAGS = \ + $(KPSE_LIBS) \ +@@ -192,8 +201,6 @@ + -I$(dvisvgm_srcdir)/libs/ff-woff/fontforge \ + -I$(dvisvgm_srcdir)/libs/ff-woff/inc + +-AM_CXXFLAGS += $(TTFAUTOHINT_CFLAGS) +- + AM_CXXFLAGS += \ + $(BROTLI_CFLAGS) \ + $(WOFF2_CFLAGS) +@@ -204,9 +211,10 @@ + AM_CXXFLAGS += $(LIBCRYPTO_CFLAGS) + endif + +-AM_LDFLAGS += $(TTFAUTOHINT_LIBS) + endif + ++# TL: do not try to rebuild these source files. ++if ! TEXLIVE_BUILD + + # the command-line parser class is generated from options.xml by opt2cpp + $(srcdir)/CommandLine.hpp: options.xml +@@ -220,7 +228,15 @@ + fi + + psdefs.ps: ; ++endif ! TEXLIVE_BUILD + + @CODE_COVERAGE_RULES@ + + CLEANFILES = *.gcda *.gcno ++ ++# Rebuild libkpathsea: ++@KPATHSEA_RULE@ ++# Rebuild libfreetype: ++@FREETYPE2_RULE@ ++# Rebuild libz: ++@ZLIB_RULE@ +--- dvisvgm-2.8.2/src/optimizer/Makefile.am 2019-11-08 15:26:11.000000000 +0100 ++++ dvisvgm-src/src/optimizer/Makefile.am 2019-11-16 15:15:54.151760519 +0100 +@@ -1,6 +1,6 @@ +-noinst_LTLIBRARIES = liboptimizer.la ++noinst_LIBRARIES = liboptimizer.a + +-liboptimizer_la_SOURCES = \ ++liboptimizer_a_SOURCES = \ + AttributeExtractor.hpp AttributeExtractor.cpp \ + DependencyGraph.hpp \ + GroupCollapser.hpp GroupCollapser.cpp \ -- cgit v1.2.3