summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvisvgm/TLpatches
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-01-25 23:20:32 +0000
committerKarl Berry <karl@freefriends.org>2019-01-25 23:20:32 +0000
commitdbb07a7a7359963676891de548723b36785eff79 (patch)
treee46b8d2cb0e53954b3cb06cab0d9bae28606a9e3 /Build/source/texk/dvisvgm/TLpatches
parent0c9aa4f80b0f44658e8ba13f2261a2386e99c774 (diff)
dvisvgm 2.6.2
git-svn-id: svn://tug.org/texlive/trunk@49819 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-tl62
-rw-r--r--Build/source/texk/dvisvgm/TLpatches/patch-04-configure-upstream118
-rw-r--r--Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles106
4 files changed, 111 insertions, 179 deletions
diff --git a/Build/source/texk/dvisvgm/TLpatches/TL-Changes b/Build/source/texk/dvisvgm/TLpatches/TL-Changes
index f0aab1706d0..4de459624a7 100644
--- a/Build/source/texk/dvisvgm/TLpatches/TL-Changes
+++ b/Build/source/texk/dvisvgm/TLpatches/TL-Changes
@@ -14,7 +14,7 @@ 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 -r m4 aclocal.m4 configure # reduce chance of confusion?
+rm aclocal.m4 configure # reduce chance of confusion?
#
# files to add:
svn status | sed -n 's/^\?//p'
@@ -34,5 +34,5 @@ Update our ./configure.ac from upstream dvisvgm-src/configure.ac.
# any top_srcdir in dvisvgm-src/src/Makefile.am needs to become dvisvgm_srcdir.
patch -d dvisvgm-src -p1 <TLpatches/patch-08-makefiles
-# remake autostuff.
+# remake autostuff (then make, etc.).
autoreconf
diff --git a/Build/source/texk/dvisvgm/TLpatches/patch-04-configure-tl b/Build/source/texk/dvisvgm/TLpatches/patch-04-configure-tl
index 6fd92ffbdc9..1a0f63a1fd6 100644
--- a/Build/source/texk/dvisvgm/TLpatches/patch-04-configure-tl
+++ b/Build/source/texk/dvisvgm/TLpatches/patch-04-configure-tl
@@ -2,45 +2,41 @@
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 49009)
+--- configure.ac (revision 49813)
+++ configure.ac (working copy)
-@@ -15,7 +15,7 @@
+@@ -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
AC_PREREQ([2.65])
m4_include([version.ac])[] dnl define dvisvgm_version
AC_INIT([dvisvgm (TeX Live)], dvisvgm_version, [tex-k@tug.org])
--DATE="September 2018"
-+DATE="October 2018"
+-DATE="October 2018"
++DATE="January 2019"
AC_CONFIG_SRCDIR([dvisvgm-src/src/dvisvgm.cpp])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIRS([../../m4])dnl not just _DIR
-@@ -29,8 +29,7 @@
- KPSE_COMMON([dvisvgm])
+@@ -200,8 +200,20 @@
+ CODE_COVERAGE_RULES=
+ AC_SUBST([CODE_COVERAGE_RULES])
- AH_TEMPLATE([TARGET_SYSTEM], [The machine triplet of the target system])
--AC_DEFINE_UNQUOTED([TARGET_SYSTEM], ["$host"],
-- [The machine triplet of the target system.])
-+AC_DEFINE_UNQUOTED([TARGET_SYSTEM], ["$target"])
-
- AC_PROG_CC
- AC_PROG_CC_C99
-@@ -162,7 +161,6 @@
- # Check for library functions.
- AC_FUNC_STAT
- AC_CHECK_FUNCS_ONCE([ftime gettimeofday sigaction umask uselocale])
--# TL? memset strcasecmp strtol
-
- AC_ARG_ENABLE([woff],
- [AS_HELP_STRING([--disable-woff], [Disable WOFF support @<:@default=no@:>@])],
-@@ -190,6 +188,12 @@
- # 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: 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)
+
- # 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)
+ 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 28e2c5ad816..254c87a5861 100644
--- a/Build/source/texk/dvisvgm/TLpatches/patch-04-configure-upstream
+++ b/Build/source/texk/dvisvgm/TLpatches/patch-04-configure-upstream
@@ -8,17 +8,17 @@
TL builds, we want to use the versions of those which are in the
TL source tree.
---- dvisvgm-2.6.1/configure.ac 2018-10-11 05:25:40.000000000 -0700
-+++ configure.ac 2018-10-29 11:17:00.956683648 -0700
-@@ -1,28 +1,42 @@
+--- 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 @@
-# This file is part of dvisvgm
--# Copyright (C) 2005-2018 Martin Gieseking <martin.gieseking@uos.de>
+-# 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.1],[martin.gieseking@uos.de])
-+# $Id: configure.ac 48654 2018-09-13 17:10:25Z karl $
+-AC_INIT([dvisvgm],[2.6.2],[martin.gieseking@uos.de])
++# $Id: configure.ac 49020 2018-10-29 22:11:07Z karl $
+dnl Process this file with autoconf to produce a configure script
+dnl for dvisvgm in TeX Live.
+dnl
@@ -30,12 +30,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
+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"
-AC_CONFIG_SRCDIR(src)
+AC_CONFIG_SRCDIR([dvisvgm-src/src/dvisvgm.cpp])
AC_CONFIG_HEADERS([config.h])
@@ -66,9 +66,7 @@
+KPSE_CXX_HACK
AC_PROG_RANLIB
- AC_LANG(C)
-@@ -30,48 +44,20 @@
- AC_CHECK_HEADERS([sys/time.h sys/timeb.h xlocale.h])
+@@ -31,46 +45,18 @@
AC_HEADER_TIOCGWINSZ
-CPPFLAGS_SAVE="$CPPFLAGS"
@@ -129,9 +127,7 @@
+else
have_libgs=yes
AC_CHECK_HEADER([ghostscript/iapi.h],
- [AC_CHECK_LIB(gs, gsapi_revision,, [have_libgs=no])],
-@@ -81,68 +67,87 @@
- [AC_CHECK_LIB(dl, dlopen,,
+@@ -82,66 +68,85 @@
[AC_DEFINE(DISABLE_GS, 1, [Set to 1 if PostScript support should be disabled])]
[AC_MSG_WARN(PostScript support disabled)])])
+fi
@@ -141,6 +137,17 @@
-
-# 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().
@@ -204,17 +211,6 @@
+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@:>@])])
@@ -274,9 +270,7 @@
+# emacs-page
# Check for header files.
AC_HEADER_DIRENT
- AC_HEADER_STDC
-@@ -157,78 +162,61 @@
- AC_FUNC_STAT
+@@ -158,77 +163,72 @@
AC_CHECK_FUNCS_ONCE([ftime gettimeofday sigaction umask uselocale])
-# add options for selection of "optional" library locations
@@ -295,9 +289,7 @@
+ [],
+ [enable_woff=yes])
+AM_CONDITIONAL([ENABLE_WOFF], [test "x$enable_woff" = "xyes"])
-
--AC_SUBST([ZLIB_CFLAGS])
--AC_SUBST([ZLIB_LIBS])
++
+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).])
@@ -305,6 +297,10 @@
+ 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++])
@@ -315,7 +311,39 @@
- AC_DEFINE([KPSE_CXX_UNSAFE], 1,
- [Define to 1 if the kpathsea headers are not C++ safe.])])
-AC_LANG_POP([C++])
-+# 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@:>@])],
++ [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"
@@ -344,31 +372,10 @@
- CXXFLAGS=`echo $CXXFLAGS | sed 's/-O[1-9s]//g'`
- changequote([,])
-])
-+# 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])
-+
+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)
@@ -403,4 +410,3 @@
+ dvisvgm-src/src/version.hpp
+])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
index f6f2423e19d..a0fe86548e9 100644
--- a/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles
+++ b/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles
@@ -1,60 +1,19 @@
See ./TL-Changes.
-diff -ur dvisvgm-2.6.1/Makefile.am dvisvgm-src/Makefile.am
---- dvisvgm-2.6.1/Makefile.am 2018-09-20 04:39:12.000000000 -0700
-+++ dvisvgm-src/Makefile.am 2018-10-28 11:05:34.960588136 -0700
-@@ -5,7 +5,7 @@
-
+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
+@@ -6,5 +6,5 @@
AUTOMAKE_OPTIONS = foreign
EXTRA_DIST = COPYING
-SUBDIRS = libs src tests doc
+SUBDIRS = libs src #not for TL: tests doc
ACLOCAL_AMFLAGS = -I m4
- if USE_BUNDLED_LIBS
-diff -ur dvisvgm-2.6.1/libs/defs.am dvisvgm-src/libs/defs.am
---- dvisvgm-2.6.1/libs/defs.am 2018-10-10 02:02:17.000000000 -0700
-+++ dvisvgm-src/libs/defs.am 2018-10-29 11:19:34.259446467 -0700
-@@ -1,23 +1,23 @@
- if HAVE_BROTLI
- else
--BROTLI_CFLAGS += -I$(top_srcdir)/libs/brotli/include
--BROTLI_LIBS += ../libs/brotli/libbrotli.a
-+BROTLI_CFLAGS = -I$(dvisvgm_srcdir)/libs/brotli/include
-+BROTLI_LIBS = ../libs/brotli/libbrotli.a
- endif
-
- if HAVE_POTRACE
- else
--POTRACE_CFLAGS = -I$(top_srcdir)/libs/potrace
-+POTRACE_CFLAGS = -I$(dvisvgm_srcdir)/libs/potrace
- POTRACE_LIBS = ../libs/potrace/libpotrace.a
- endif
-
- if HAVE_WOFF2
- else
--WOFF2_CFLAGS += -I$(top_srcdir)/libs/woff2/include
--WOFF2_LIBS += ../libs/woff2/libwoff2.a
-+WOFF2_CFLAGS = -I$(dvisvgm_srcdir)/libs/woff2/include
-+WOFF2_LIBS = ../libs/woff2/libwoff2.a
- endif
-
- if HAVE_XXHASH
- else
--XXHASH_CFLAGS = -I$(top_srcdir)/libs/xxHash
-+XXHASH_CFLAGS = -I$(dvisvgm_srcdir)/libs/xxHash
- XXHASH_LIBS = ../libs/xxHash/libxxhash.a
- endif
-diff -ur dvisvgm-2.6.1/src/Makefile.am dvisvgm-src/src/Makefile.am
---- dvisvgm-2.6.1/src/Makefile.am 2018-10-10 02:02:17.000000000 -0700
-+++ dvisvgm-src/src/Makefile.am 2018-10-29 14:31:28.299115543 -0700
-@@ -12,14 +12,13 @@
-
- include ../libs/defs.am
-
-+dvisvgm_srcdir = $(top_srcdir)/dvisvgm-src
-+
- dvisvgm_LDADD = \
+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
+@@ -16,9 +16,6 @@
$(noinst_LIBRARIES) \
../libs/clipper/libclipper.a \
- $(FREETYPE_LIBS) \
@@ -65,9 +24,7 @@ diff -ur dvisvgm-2.6.1/src/Makefile.am dvisvgm-src/src/Makefile.am
+ $(XXHASH_LIBS)
if ENABLE_WOFF
- dvisvgm_LDADD += \
-@@ -34,7 +33,15 @@
- dvisvgm_LDADD += $(LIBCRYPTO_LIBS)
+@@ -35,5 +32,13 @@
endif
+dvisvgm_LDADD += \
@@ -81,9 +38,7 @@ diff -ur dvisvgm-2.6.1/src/Makefile.am dvisvgm-src/src/Makefile.am
+dvisvgm_DEPENDENCIES += $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) $(FREETYPE2_DEPEND)
libdvisvgm_a_SOURCES = \
- AGLTable.hpp \
-@@ -258,17 +265,13 @@
-
+@@ -259,15 +264,11 @@
EXTRA_DIST = options.xml options.dtd iapi.h ierrors.h MiKTeXCom.hpp MiKTeXCom.cpp
-AM_CFLAGS = -Wall \
@@ -93,40 +48,17 @@ diff -ur dvisvgm-2.6.1/src/Makefile.am dvisvgm-src/src/Makefile.am
$(CODE_COVERAGE_CFLAGS)
-AM_CXXFLAGS = -Wall -Wnon-virtual-dtor -Wno-mismatched-tags \
-- -I$(top_srcdir)/libs/clipper \
-- -I$(top_srcdir)/libs/variant/include \
++AM_CXXFLAGS = $(WARNING_CFLAGS) -Wnon-virtual-dtor -Wno-mismatched-tags \
+ -I$(dvisvgm_srcdir)/libs/clipper \
+- -I$(dvisvgm_srcdir)/libs/variant/include \
- $(KPSE_CFLAGS) \
- $(FREETYPE_CFLAGS) \
- $(ZLIB_CFLAGS) \
- $(CODE_COVERAGE_CFLAGS)
-+AM_CXXFLAGS = $(WARNING_CFLAGS) -Wnon-virtual-dtor -Wno-mismatched-tags \
-+ -I$(dvisvgm_srcdir)/libs/clipper \
+ -I$(dvisvgm_srcdir)/libs/variant/include
AM_CXXFLAGS += \
- $(POTRACE_CFLAGS) \
-@@ -280,8 +283,8 @@
-
- if ENABLE_WOFF
- AM_CFLAGS += \
-- -I$(top_srcdir)/libs/ff-woff/fontforge \
-- -I$(top_srcdir)/libs/ff-woff/inc
-+ -I$(dvisvgm_srcdir)/libs/ff-woff/fontforge \
-+ -I$(dvisvgm_srcdir)/libs/ff-woff/inc
-
- AM_CXXFLAGS += $(TTFAUTOHINT_CFLAGS)
-
-@@ -290,7 +293,7 @@
- $(WOFF2_CFLAGS)
-
- if USE_BUNDLED_MD5
--AM_CXXFLAGS += -I$(top_srcdir)/libs/md5
-+AM_CXXFLAGS += -I$(dvisvgm_srcdir)/libs/md5
- else
- AM_CXXFLAGS += $(LIBCRYPTO_CFLAGS)
- endif
-@@ -298,7 +301,20 @@
- AM_LDFLAGS += $(TTFAUTOHINT_LIBS)
+@@ -299,5 +300,18 @@
endif
+AM_CXXFLAGS += \
@@ -145,9 +77,7 @@ diff -ur dvisvgm-2.6.1/src/Makefile.am dvisvgm-src/src/Makefile.am
+# TL: do not try to rebuild these source files.
# the command-line parser class is generated from options.xml by opt2cpp
$(srcdir)/CommandLine.hpp: options.xml
- rm -f $@
-@@ -311,7 +327,15 @@
- fi
+@@ -312,6 +326,14 @@
psdefs.ps: ;
+endif ! TEXLIVE_BUILD
@@ -156,9 +86,9 @@ diff -ur dvisvgm-2.6.1/src/Makefile.am dvisvgm-src/src/Makefile.am
CLEANFILES = *.gcda *.gcno
+
-+## Rebuild libkpathsea
++# Rebuild libkpathsea:
+@KPATHSEA_RULE@
-+## Rebuild libfreetype
++# Rebuild libfreetype:
+@FREETYPE2_RULE@
-+## Rebuild libz
++# Rebuild libz:
+@ZLIB_RULE@