summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvisvgm/TLpatches
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-01-20 01:55:04 +0000
committerKarl Berry <karl@freefriends.org>2023-01-20 01:55:04 +0000
commit2c99129a39be3be6622c7efa6826222141d4de1e (patch)
tree95f4cdda555eef7f4e9a98994ce081e2364a8a4a /Build/source/texk/dvisvgm/TLpatches
parent5817f54a04657ab24f46489d2ddb97d47c3bef79 (diff)
dvisvgm-3.0.1 + patches linked from https://github.com/TeX-Live/texlive-source/pull/59#issuecomment-1397666966
git-svn-id: svn://tug.org/texlive/trunk@65593 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvisvgm/TLpatches')
-rw-r--r--Build/source/texk/dvisvgm/TLpatches/TL-Changes11
-rw-r--r--Build/source/texk/dvisvgm/TLpatches/patch-04-configure94
-rw-r--r--Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles129
-rw-r--r--Build/source/texk/dvisvgm/TLpatches/patch-12-potrace-tl46
4 files changed, 99 insertions, 181 deletions
diff --git a/Build/source/texk/dvisvgm/TLpatches/TL-Changes b/Build/source/texk/dvisvgm/TLpatches/TL-Changes
index 849b6f6aaed..2013dee9c92 100644
--- a/Build/source/texk/dvisvgm/TLpatches/TL-Changes
+++ b/Build/source/texk/dvisvgm/TLpatches/TL-Changes
@@ -32,11 +32,16 @@ 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 easiest to check the previous original dvisvgm/configure.ac
-vs. the new, and then install the changes in our configure.ac by hand.
+Probably easiest to check dvisvgm-prev/configure.ac
+vs. new, and then install the changes in our configure.ac by hand.
# patch to integrate into TL build; will likely need adjusting also.
patch -d dvisvgm-src -p1 <TLpatches/patch-08-makefiles
-# remake autostuff (then make, etc., as usual).
+# remake autostuff (then make, etc., with fingers crossed).
autoreconf
+
+# before committing, update patches:
+diff -u2 dvisvgm-3.0.1/configure.ac ./ >TLpatches/patch-04-configure
+for m in `(cd ./dvisvgm-src && find -name Makefile.am)`; do \
+ diff -u2 dvisvgm-{3.0.1,src}/$m; done >TLpatches/patch-08-makefiles
diff --git a/Build/source/texk/dvisvgm/TLpatches/patch-04-configure b/Build/source/texk/dvisvgm/TLpatches/patch-04-configure
index 1ae434b3151..b1579ed6822 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.14/configure.ac 2022-08-12 16:43:05.000000000 +0900
-+++ configure.ac 2022-08-29 21:25:23.000000000 +0900
-@@ -1,149 +1,157 @@
+--- dvisvgm-3.0.1/configure.ac 2023-01-10 05:23:42.000000000 -0800
++++ ./configure.ac 2023-01-19 15:35:24.739713575 -0800
+@@ -1,15 +1,32 @@
-# This file is part of dvisvgm
--# Copyright (C) 2005-2022 Martin Gieseking <martin.gieseking@uos.de>
+-# Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de>
-#
-# Process this file with autoconf to produce a configure script.
-
--AC_PREREQ(2.59)
--AC_INIT([dvisvgm],[2.14],[martin.gieseking@uos.de])
-+dnl $Id: configure.ac 64168 2022-08-22 21:33:05Z lscarso $
+-AC_PREREQ([2.69])
+-AC_INIT([dvisvgm],[3.0.1],[martin.gieseking@uos.de])
++dnl $Id: configure.ac 64941 2022-11-05 15:43:53Z karl $
+dnl Process this file with autoconf to produce a configure script
+dnl for dvisvgm in TeX Live.
+dnl
-+dnl Copyright 2015-2022 Karl Berry <tex-live@tug.org>
++dnl Copyright 2015-2023 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,20 +20,20 @@
+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-2022 Martin Gieseking
++dnl Copyright 2005-2023 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="August 2022"
+ DATE="January 2023"
-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])
+-AM_INIT_AUTOMAKE([subdir-objects dist-xz])
+AC_CONFIG_MACRO_DIRS([../../m4])dnl not just _DIR
++AC_CONFIG_MACRO_DIRS([dvisvgm-src/m4])dnl ax_gcc_builtin
+AC_CONFIG_AUX_DIR([../../build-aux])
+
+AM_CONDITIONAL([TEXLIVE_BUILD], [test "x$enable_texlive_build" = xyes])
@@ -43,19 +43,15 @@
+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
+ AH_TEMPLATE([HOST_SYSTEM], [The machine triplet of the host system])
+@@ -20,60 +37,35 @@
AC_PROG_CXX
AX_CXX_COMPILE_STDCXX([11])
-AM_PROG_AR
++dnl AM_PROG_AR is above.
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"])
@@ -86,6 +82,7 @@
-
-AC_MSG_CHECKING([kpathsea version])
-AC_RUN_IFELSE([AC_LANG_SOURCE([#include <stdio.h>
+- #include <stdlib.h>
- #include <kpathsea/kpathsea.h>
- int main() {
- FILE *f;
@@ -128,7 +125,7 @@
+fi
AS_IF([test "x$have_libgs" = "xno"],
# Ghostscript not found, check for dlopen
- [AC_CHECK_LIB(dl, dlopen,,
+@@ -81,69 +73,89 @@
[AC_DEFINE(DISABLE_GS, 1, [Set to 1 if PostScript support should be disabled])]
[AC_MSG_WARN(PostScript support disabled)])])
+fi
@@ -138,6 +135,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().
@@ -159,6 +167,7 @@
+ # query Ghostscript version
+ AC_MSG_CHECKING([Ghostscript version])
+ AC_RUN_IFELSE([AC_LANG_SOURCE([#include <stdio.h>
++ #include <stdlib.h>
+ #include <ghostscript/iapi.h>
+ int main () {
+ gsapi_revision_t r;
@@ -201,17 +210,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@:>@])])
@@ -271,10 +269,12 @@
+# emacs-page
# Check for header files.
AC_HEADER_DIRENT
- AC_HEADER_STDC
-@@ -158,80 +166,75 @@
- AC_FUNC_STAT
- AC_CHECK_FUNCS_ONCE([ftime gettimeofday sigaction umask uselocale])
+-
++AC_HEADER_STDC
+ AC_CHECK_HEADERS_ONCE([libintl.h stdlib.h string.h strings.h unistd.h])
+
+@@ -158,81 +170,82 @@
+ AX_GCC_BUILTIN(__builtin_clz)
-# add options for selection of "optional" library locations
-# currently these libraries are mandatory; the --with-foo options
@@ -307,6 +307,11 @@
- AC_DEFINE([KPSE_CXX_UNSAFE], 1,
- [Define to 1 if the kpathsea headers are not C++ safe.])])
-AC_LANG_POP([C++])
++AC_ARG_WITH([ttfautohint],
++ [AS_HELP_STRING([--with-ttfautohint@<:@=prefix@:>@], [enable ttfautohint support (disabled by default)])],
++ [with_ttfautohint="$withval"],
++ [with_ttfautohint=no])
++
+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).])
@@ -314,9 +319,8 @@
+ 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).
++# Add option to enable linking of bundled libraries (brotli, woff2, xxhash).
++# TL: potrace not bundled.
+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])
@@ -328,11 +332,13 @@
+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: now includes potrace in libs, so always true.
++AM_CONDITIONAL(HAVE_POTRACE, true)
++
+# 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)
@@ -370,6 +376,7 @@
-AM_CONDITIONAL([BUILD_MANPAGE], [test "x$enable_manpage" = "xyes"])
-
-AX_CODE_COVERAGE
+-
-AS_IF([ test "$enable_code_coverage" = "yes" ], [
- # disable optimization
- changequote({,})
@@ -387,33 +394,36 @@
-AC_CONFIG_FILES([
- Makefile
- libs/Makefile
+- libs/boost/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/fonts/Makefile
- src/optimizer/Makefile
+- src/ttf/Makefile
- tests/Makefile
- tests/data/Makefile
- doc/Makefile])
+AC_CONFIG_FILES([Makefile
+ dvisvgm-src/Makefile
+ dvisvgm-src/libs/Makefile
++ dvisvgm-src/libs/boost/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/variant/Makefile
+ dvisvgm-src/libs/woff2/Makefile
+ dvisvgm-src/libs/xxHash/Makefile
+ dvisvgm-src/src/Makefile
+ dvisvgm-src/src/version.hpp
++ dvisvgm-src/src/fonts/Makefile
+ dvisvgm-src/src/optimizer/Makefile
++ dvisvgm-src/src/ttf/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
index da5a814c92b..377c0243c72 100644
--- a/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles
+++ b/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles
@@ -1,86 +1,60 @@
-diff --strip-trailing-cr -ur dvisvgm-2.14/Makefile.am dvisvgm-src/Makefile.am
---- dvisvgm-2.14/Makefile.am 2022-01-18 22:39:00.000000000 +0900
-+++ dvisvgm-src/Makefile.am 2022-08-29 21:34:21.000000000 +0900
-@@ -5,7 +5,7 @@
+--- dvisvgm-3.0.1/./Makefile.am 2023-01-10 05:22:18.000000000 -0800
++++ dvisvgm-src/./Makefile.am 2023-01-19 15:27:47.262096221 -0800
+@@ -4,9 +4,9 @@
+ ## Process this file with automake.
+
+-include $(top_srcdir)/aminclude_static.am
++include $(top_srcdir)/dvisvgm-src/aminclude_static.am
AUTOMAKE_OPTIONS = foreign
EXTRA_DIST = COPYING
--SUBDIRS = libs m4 src tests doc
+-SUBDIRS = libs src tests doc
+SUBDIRS = libs src #not for TL: m4 tests doc
ACLOCAL_AMFLAGS = -I m4
- if USE_BUNDLED_LIBS
-diff --strip-trailing-cr -ur dvisvgm-2.14/libs/ff-woff/Makefile.am dvisvgm-src/libs/ff-woff/Makefile.am
---- dvisvgm-2.14/libs/ff-woff/Makefile.am 2019-04-12 23:39:46.000000000 +0900
-+++ dvisvgm-src/libs/ff-woff/Makefile.am 2022-08-29 21:34:21.000000000 +0900
-@@ -83,7 +83,7 @@
-
- EXTRA_DIST = LICENSE
-
--AM_CFLAGS = -I$(srcdir)/inc -I$(srcdir)/fontforge $(ZLIB_CFLAGS)
-+AM_CFLAGS = -I$(srcdir)/inc -I$(srcdir)/fontforge $(ZLIB_INCLUDES)
-
- @CODE_COVERAGE_RULES@
-
-diff --strip-trailing-cr -ur dvisvgm-2.14/src/Makefile.am dvisvgm-src/src/Makefile.am
---- dvisvgm-2.14/src/Makefile.am 2022-07-14 16:53:39.000000000 +0900
-+++ dvisvgm-src/src/Makefile.am 2022-08-29 21:34:21.000000000 +0900
-@@ -4,7 +4,7 @@
+--- dvisvgm-3.0.1/./libs/Makefile.am 2023-01-10 05:22:18.000000000 -0800
++++ dvisvgm-src/./libs/Makefile.am 2023-01-19 15:14:57.121900128 -0800
+@@ -4,5 +4,9 @@
## 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
+-SUBDIRS = boost clipper md5 potrace variant xxHash
++SUBDIRS = boost clipper md5 variant xxHash
++
++if !TEXLIVE_BUILD
++SUBDIRS += potrace
++endif
- dvisvgm_LDADD = \
-- $(noinst_LTLIBRARIES) \
-+ $(noinst_LIBRARIES) \
-+ optimizer/liboptimizer.a \
+ if ENABLE_WOFF
+--- dvisvgm-3.0.1/./src/Makefile.am 2023-01-10 05:22:18.000000000 -0800
++++ dvisvgm-src/./src/Makefile.am 2023-01-19 15:45:32.415222210 -0800
+@@ -17,8 +17,6 @@
+ $(noinst_LTLIBRARIES) \
../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)
+@@ -36,5 +34,16 @@
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 = $(noinst_LTLIBRARIES)
+dvisvgm_DEPENDENCIES += $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) $(FREETYPE2_DEPEND)
+
-+libdvisvgm_a_SOURCES = \
- AGLTable.hpp \
- BasicDVIReader.hpp BasicDVIReader.cpp \
- Bezier.hpp Bezier.cpp \
-@@ -164,28 +170,32 @@
- ZLibOutputStream.hpp
++if TEXLIVE_BUILD
++dvisvgm_DEPENDENCIES += $(POTRACE_DEPEND)
++endif
- if ENABLE_WOFF
--libdvisvgm_la_SOURCES += ffwrapper.c ffwrapper.h
-+libdvisvgm_a_SOURCES += ffwrapper.c ffwrapper.h
- endif
-
--libdvisvgm_la_LIBADD = optimizer/liboptimizer.la
--
+ libdvisvgm_la_SOURCES = \
+@@ -171,19 +180,25 @@
EXTRA_DIST = options.xml options.dtd iapi.h ierrors.h MiKTeXCom.hpp MiKTeXCom.cpp
-AM_CFLAGS = -Wall \
@@ -115,53 +89,28 @@ diff --strip-trailing-cr -ur dvisvgm-2.14/src/Makefile.am dvisvgm-src/src/Makefi
+endif WIN32
AM_LDFLAGS = \
- $(KPSE_LIBS) \
-@@ -196,8 +206,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)
-@@ -208,9 +216,10 @@
- AM_CXXFLAGS += $(LIBCRYPTO_CFLAGS)
- endif
-
--AM_LDFLAGS += $(TTFAUTOHINT_LIBS)
+@@ -207,5 +222,6 @@
endif
+-
+# TL: do not try to rebuild these source files.
-+if ! TEXLIVE_BUILD
++if !TEXLIVE_BUILD
# the command-line parser class is generated from options.xml by opt2cpp
- $(srcdir)/CommandLine.hpp: options.xml
-@@ -224,7 +233,15 @@
- fi
+@@ -221,4 +237,16 @@
psdefs.ps: ;
-+endif ! TEXLIVE_BUILD
-
- @CODE_COVERAGE_RULES@
++endif !TEXLIVE_BUILD
CLEANFILES = *.gcda *.gcno
+
++if TEXLIVE_BUILD
+# Rebuild libkpathsea:
+@KPATHSEA_RULE@
+# Rebuild libfreetype:
+@FREETYPE2_RULE@
+# Rebuild libz:
+@ZLIB_RULE@
-diff --strip-trailing-cr -ur dvisvgm-2.14/src/optimizer/Makefile.am dvisvgm-src/src/optimizer/Makefile.am
---- dvisvgm-2.14/src/optimizer/Makefile.am 2022-08-12 15:52:19.000000000 +0900
-+++ dvisvgm-src/src/optimizer/Makefile.am 2022-08-29 21:34:21.000000000 +0900
-@@ -1,6 +1,6 @@
--noinst_LTLIBRARIES = liboptimizer.la
-+noinst_LIBRARIES = liboptimizer.a
-
--liboptimizer_la_SOURCES = \
-+liboptimizer_a_SOURCES = \
- AttributeExtractor.hpp AttributeExtractor.cpp \
- ClipPathReassigner.hpp ClipPathReassigner.cpp \
- DependencyGraph.hpp \
++# Rebuild potrace:
++@POTRACE_RULE@
++endif TEXLIVE_BUILD
diff --git a/Build/source/texk/dvisvgm/TLpatches/patch-12-potrace-tl b/Build/source/texk/dvisvgm/TLpatches/patch-12-potrace-tl
deleted file mode 100644
index dcab1ba788e..00000000000
--- a/Build/source/texk/dvisvgm/TLpatches/patch-12-potrace-tl
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git dvisvgm-2.14/libs/Makefile.am dvisvgm-src/libs/Makefile.am
-index f98732f04ee..89969f44542 100644
---- dvisvgm-2.14/libs/Makefile.am
-+++ dvisvgm-src/libs/Makefile.am
-@@ -3,7 +3,7 @@
- ##
- ## Process this file with automake.
-
--SUBDIRS = clipper md5 potrace variant xxHash
-+SUBDIRS = clipper md5 variant xxHash
-
- if ENABLE_WOFF
- SUBDIRS += brotli ff-woff woff2
-diff --git dvisvgm-2.14/libs/defs.am dvisvgm-src/libs/defs.am
-index 6e220e43340..7889693bdc6 100644
---- dvisvgm-2.14/libs/defs.am
-+++ dvisvgm-src/libs/defs.am
-@@ -4,8 +4,7 @@ BROTLI_LIBS += ../libs/brotli/libbrotli.a
- endif
-
- if !HAVE_POTRACE
--POTRACE_CFLAGS = -I$(dvisvgm_srcdir)/libs/potrace
--POTRACE_LIBS = ../libs/potrace/libpotrace.a
-+POTRACE_CFLAGS = $(POTRACE_INCLUDES)
- endif
-
- if !HAVE_WOFF2
-diff --git dvisvgm-2.14/src/Makefile.am dvisvgm-src/src/Makefile.am
-index d329e35f4a0..065b869d72e 100644
---- dvisvgm-2.14/src/Makefile.am
-+++ dvisvgm-src/src/Makefile.am
-@@ -41,7 +41,7 @@ dvisvgm_LDADD += \
- $(LIBGS_LIBS)
-
- dvisvgm_DEPENDENCIES = $(noinst_LIBRARIES)
--dvisvgm_DEPENDENCIES += $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) $(FREETYPE2_DEPEND)
-+dvisvgm_DEPENDENCIES += $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) $(FREETYPE2_DEPEND) $(POTRACE_DEPEND)
-
- libdvisvgm_a_SOURCES = \
- AGLTable.hpp \
-@@ -245,3 +245,5 @@ CLEANFILES = *.gcda *.gcno
- @FREETYPE2_RULE@
- # Rebuild libz:
- @ZLIB_RULE@
-+# Rebuild potrace:
-+@POTRACE_RULE@