summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvisvgm/TLpatches
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-03-15 22:49:59 +0000
committerKarl Berry <karl@freefriends.org>2020-03-15 22:49:59 +0000
commit19d768ec00d8115ba1ff63de137a813662598155 (patch)
tree2c8d67339738161fa0ca38cf85f7e206fea57e65 /Build/source/texk/dvisvgm/TLpatches
parent94d8a851454f2294254325942a0a96b90404147d (diff)
dvisvgm 2.9
git-svn-id: svn://tug.org/texlive/trunk@54335 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvisvgm/TLpatches')
-rw-r--r--Build/source/texk/dvisvgm/TLpatches/TL-Changes4
-rw-r--r--Build/source/texk/dvisvgm/TLpatches/patch-04-configure (renamed from Build/source/texk/dvisvgm/TLpatches/patch-04-configure-upstream)229
-rw-r--r--Build/source/texk/dvisvgm/TLpatches/patch-04-configure-tl15
-rw-r--r--Build/source/texk/dvisvgm/TLpatches/patch-09-woff-zlib13
4 files changed, 130 insertions, 131 deletions
diff --git a/Build/source/texk/dvisvgm/TLpatches/TL-Changes b/Build/source/texk/dvisvgm/TLpatches/TL-Changes
index da5ab203a23..b2bdba2711e 100644
--- a/Build/source/texk/dvisvgm/TLpatches/TL-Changes
+++ b/Build/source/texk/dvisvgm/TLpatches/TL-Changes
@@ -29,7 +29,9 @@ 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.)
+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 <TLpatches/patch-08-makefiles
diff --git a/Build/source/texk/dvisvgm/TLpatches/patch-04-configure-upstream b/Build/source/texk/dvisvgm/TLpatches/patch-04-configure
index f431355070f..fb93d7a0dd7 100644
--- a/Build/source/texk/dvisvgm/TLpatches/patch-04-configure-upstream
+++ b/Build/source/texk/dvisvgm/TLpatches/patch-04-configure
@@ -1,18 +1,18 @@
---- dvisvgm-2.8.2/configure.ac
-+++ configure.ac
-@@ -1,78 +1,63 @@
+--- dvisvgm-src/configure.ac 2020-03-13 04:34:12.000000000 -0700
++++ configure.ac 2020-03-15 15:37:10.268162998 -0700
+@@ -1,149 +1,156 @@
-# This file is part of dvisvgm
--# Copyright (C) 2005-2019 Martin Gieseking <martin.gieseking@uos.de>
+-# Copyright (C) 2005-2020 Martin Gieseking <martin.gieseking@uos.de>
-#
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.59)
--AC_INIT([dvisvgm],[2.8.2],[martin.gieseking@uos.de])
-+# $Id: configure.ac 49819 2019-01-25 23:20:32Z karl $
+-AC_INIT([dvisvgm],[2.9],[martin.gieseking@uos.de])
++# $Id: configure.ac 53077 2019-12-10 06:22:32Z preining $
+dnl Process this file with autoconf to produce a configure script
+dnl for dvisvgm in TeX Live.
+dnl
-+dnl Copyright 2015-2019 Karl Berry <tex-live@tug.org>
++dnl Copyright 2015-2020 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-2019 Martin Gieseking
++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="December 2019"
+ DATE="March 2020"
-AC_CONFIG_SRCDIR(src)
+AC_CONFIG_SRCDIR([dvisvgm-src/src/dvisvgm.cpp])
AC_CONFIG_HEADERS([config.h])
@@ -121,18 +121,33 @@
have_libgs=yes
AC_CHECK_HEADER([ghostscript/iapi.h],
[AC_CHECK_LIB(gs, gsapi_revision,, [have_libgs=no])],
-@@ -82,12 +67,100 @@
+ [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])
-+fi
-+
+-
+-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().
@@ -195,7 +210,11 @@
+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 <kpathsea/kpathsea.h>]],
@@ -205,44 +224,7 @@
+ AC_DEFINE([KPSE_CXX_UNSAFE], 1,
+ [Define to 1 if the kpathsea headers are not C++ safe.])])
+AC_LANG_POP([C++])
-+
-+echo timestamp >config.force
-+fi
-+
-+KPSE_RESTORE_FLAGS
-+
-+# emacs-page
-+# Check for header files.
-+AC_HEADER_DIRENT
-+AC_HEADER_STDC
-+AC_CHECK_HEADERS_ONCE([libintl.h stdlib.h string.h strings.h unistd.h])
-+
-+# Check for typedefs, structures, and compiler characteristics.
-+AC_HEADER_STDBOOL
-+AC_TYPE_SIZE_T
-+AC_STRUCT_TM
-+
-+# Check for library functions.
-+AC_FUNC_STAT
-+AC_CHECK_FUNCS_ONCE([ftime gettimeofday sigaction umask uselocale])
-
- AC_ARG_ENABLE([woff],
- [AS_HELP_STRING([--disable-woff], [Disable WOFF support @<:@default=no@:>@])],
-@@ -95,124 +168,44 @@
- [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])
--
-+# 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@:>@])])
--AM_CONDITIONAL([USE_BUNDLED_LIBS], [test "x$enable_bundled_libs" = "xyes"])
--
-# 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,
@@ -279,23 +261,20 @@
-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)
--
--# Check for header files.
--AC_HEADER_DIRENT
--AC_HEADER_STDC
--AC_CHECK_HEADERS_ONCE([libintl.h stdlib.h string.h strings.h unistd.h])
--
--# Check for typedefs, structures, and compiler characteristics.
--AC_HEADER_STDBOOL
--AC_TYPE_SIZE_T
--AC_STRUCT_TM
--
--# Check for library functions.
--AC_FUNC_STAT
--AC_CHECK_FUNCS_ONCE([ftime gettimeofday sigaction umask uselocale])
--
++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
@@ -307,10 +286,23 @@
- [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++])
@@ -321,36 +313,8 @@
- AC_DEFINE([KPSE_CXX_UNSAFE], 1,
- [Define to 1 if the kpathsea headers are not C++ safe.])])
-AC_LANG_POP([C++])
--
--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_srcdir], ['$(top_srcdir)'])
++# 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
@@ -382,11 +346,72 @@
+# (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-04-configure-tl b/Build/source/texk/dvisvgm/TLpatches/patch-04-configure-tl
deleted file mode 100644
index 4d8c71a4484..00000000000
--- a/Build/source/texk/dvisvgm/TLpatches/patch-04-configure-tl
+++ /dev/null
@@ -1,15 +0,0 @@
- These are the changes from the previous TL dvisvgm/configure.ac
- 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 50314)
-+++ configure.ac (working copy)
-@@ -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="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
diff --git a/Build/source/texk/dvisvgm/TLpatches/patch-09-woff-zlib b/Build/source/texk/dvisvgm/TLpatches/patch-09-woff-zlib
deleted file mode 100644
index 6066a1b1454..00000000000
--- a/Build/source/texk/dvisvgm/TLpatches/patch-09-woff-zlib
+++ /dev/null
@@ -1,13 +0,0 @@
- tlbuild mail from Martin, 25 Mar 2019 21:03:53.
-
---- dvisvgm-src/libs/ff-woff/Makefile.am (revision 50601)
-+++ dvisvgm-src/libs/ff-woff/Makefile.am (working copy)
-@@ -83,7 +83,7 @@
-
- EXTRA_DIST = LICENSE
-
--AM_CFLAGS = -I$(srcdir)/inc -I$(srcdir)/fontforge
-+AM_CFLAGS = -I$(srcdir)/inc -I$(srcdir)/fontforge $(ZLIB_INCLUDES)
-
- @CODE_COVERAGE_RULES@
-