diff options
author | Karl Berry <karl@freefriends.org> | 2018-01-17 22:50:15 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-01-17 22:50:15 +0000 |
commit | e7dfe5ab98e759081fc73990ed6c1ac6910a105d (patch) | |
tree | 1635f79c86856a6aa57a45b8b952b651ef9fcba9 /Build/source/texk/dvisvgm/TLpatches | |
parent | ae542350b1e3add10d4ee3d7b68f610132f31a50 (diff) |
dvisvgm 2.3.1 (patched)
git-svn-id: svn://tug.org/texlive/trunk@46352 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvisvgm/TLpatches')
4 files changed, 61 insertions, 22 deletions
diff --git a/Build/source/texk/dvisvgm/TLpatches/ChangeLog b/Build/source/texk/dvisvgm/TLpatches/ChangeLog index f4c01eceb5d..21c01cbdaba 100644 --- a/Build/source/texk/dvisvgm/TLpatches/ChangeLog +++ b/Build/source/texk/dvisvgm/TLpatches/ChangeLog @@ -1,3 +1,9 @@ +2018-01-15 Karl Berry <karl@freefriends.org> + + * Import 2.3.1. + * patch-08-makefiles: adapt. + * patch-16-gserrornames: new patch from Martin. + 2017-01-29 Karl Berry <karl@freefriends.org> * Import 2.1. diff --git a/Build/source/texk/dvisvgm/TLpatches/TL-Changes b/Build/source/texk/dvisvgm/TLpatches/TL-Changes index 19bac3ae763..ce481d6e4f3 100644 --- a/Build/source/texk/dvisvgm/TLpatches/TL-Changes +++ b/Build/source/texk/dvisvgm/TLpatches/TL-Changes @@ -5,13 +5,28 @@ Changes applied to the original dvisvgm source as obtained from: Update version in ./version.ac. -Removed common and generated files: +mv dvisvgm-src dvisvm-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 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 .. # patch to integrate into TL build: patch -d dvisvgm-src -p1 <TLpatches/patch-08-makefiles -# use same automake macro as upstream: -cp dvisvgm-src/m4/ax_cxx_compile_stdcxx.m4 m4 +autoreconf diff --git a/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles b/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles index 38123785f03..b9d0894fbdc 100644 --- a/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles +++ b/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles @@ -1,17 +1,17 @@ -diff -u2r '--exclude=config.h.in' '--exclude=aclocal.m4' '--exclude=Makefile.in' dvisvgm-2.1/Makefile.am new/Makefile.am ---- dvisvgm-2.1/Makefile.am 2017-01-06 09:21:42.000000000 -0800 -+++ new/Makefile.am 2017-01-30 10:54:21.383122973 -0800 +diff -u2r dvisvgm-2.3.1/Makefile.am dvisvgm-src/Makefile.am +--- dvisvgm-2.3.1/Makefile.am 2018-01-02 01:09:10.000000000 -0800 ++++ dvisvgm-src/Makefile.am 2018-01-15 15:21:16.671504747 -0800 @@ -6,5 +6,5 @@ AUTOMAKE_OPTIONS = foreign EXTRA_DIST = COPYING -SUBDIRS = libs src tests doc -+SUBDIRS = libs src #TL: tests doc ++SUBDIRS = libs src #not for TL: tests doc + ACLOCAL_AMFLAGS = -I m4 - if CODE_COVERAGE_ENABLED -diff -u2r '--exclude=config.h.in' '--exclude=aclocal.m4' '--exclude=Makefile.in' dvisvgm-2.1/src/Makefile.am new/src/Makefile.am ---- dvisvgm-2.1/src/Makefile.am 2017-01-19 07:10:14.000000000 -0800 -+++ new/src/Makefile.am 2017-01-31 09:30:46.062748355 -0800 -@@ -12,8 +12,5 @@ +diff -u2r dvisvgm-2.3.1/src/Makefile.am dvisvgm-src/src/Makefile.am +--- dvisvgm-2.3.1/src/Makefile.am 2018-01-02 01:09:11.000000000 -0800 ++++ dvisvgm-src/src/Makefile.am 2018-01-15 15:28:34.370204007 -0800 +@@ -14,8 +14,5 @@ $(noinst_LIBRARIES) \ ../libs/clipper/libclipper.a \ - ../libs/xxHash/libxxhash.a \ @@ -21,7 +21,7 @@ diff -u2r '--exclude=config.h.in' '--exclude=aclocal.m4' '--exclude=Makefile.in' + ../libs/xxHash/libxxhash.a if ENABLE_WOFF -@@ -24,5 +21,14 @@ +@@ -26,5 +23,14 @@ endif +dvisvgm_LDADD += \ @@ -36,7 +36,7 @@ diff -u2r '--exclude=config.h.in' '--exclude=aclocal.m4' '--exclude=Makefile.in' +dvisvgm_DEPENDENCIES += $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) $(FREETYPE2_DEPEND) libdvisvgm_a_SOURCES = \ -@@ -232,27 +238,40 @@ +@@ -242,35 +248,45 @@ EXTRA_DIST = options.xml options.dtd iapi.h ierrors.h MiKTeXCom.hpp MiKTeXCom.cpp -AM_CFLAGS = -Wall \ @@ -44,9 +44,11 @@ diff -u2r '--exclude=config.h.in' '--exclude=aclocal.m4' '--exclude=Makefile.in' - $(CODE_COVERAGE_CFLAGS) +dvisvgm_srcdir = $(top_srcdir)/dvisvgm-src --AM_CXXFLAGS = -Wall -Wnon-virtual-dtor \ +-AM_CXXFLAGS = -Wall -Wnon-virtual-dtor -Wno-mismatched-tags \ - -I$(top_srcdir)/libs/clipper \ +- -I$(top_srcdir)/libs/variant/include \ - -I$(top_srcdir)/libs/xxHash \ +- $(KPSE_CFLAGS) \ - $(FREETYPE_CFLAGS) \ - $(ZLIB_CFLAGS) \ +AM_CFLAGS = $(WARNING_CFLAGS) \ @@ -55,8 +57,13 @@ diff -u2r '--exclude=config.h.in' '--exclude=aclocal.m4' '--exclude=Makefile.in' +AM_CXXFLAGS = $(WARNING_CFLAGS) -Wnon-virtual-dtor \ + -I$(dvisvgm_srcdir)/libs/clipper \ ++ -I$(dvisvgm_srcdir)/libs/variant/include \ + -I$(dvisvgm_srcdir)/libs/xxHash + + AM_LDFLAGS = \ +- $(KPSE_LIBS) \ + $(CODE_COVERAGE_LDFLAGS) + if ENABLE_WOFF AM_CFLAGS += \ - -I$(top_srcdir)/libs/ff-woff/fontforge \ @@ -65,10 +72,13 @@ diff -u2r '--exclude=config.h.in' '--exclude=aclocal.m4' '--exclude=Makefile.in' + -I$(dvisvgm_srcdir)/libs/ff-woff/inc AM_CXXFLAGS += \ -- -I$(top_srcdir)/libs/woff2/brotli/enc \ -- -I$(top_srcdir)/libs/woff2/src -+ -I$(dvisvgm_srcdir)/libs/woff2/brotli/enc \ -+ -I$(dvisvgm_srcdir)/libs/woff2/src + $(TTFAUTOHINT_CFLAGS) \ +- -I$(top_srcdir)/libs/brotli/include \ +- -I$(top_srcdir)/libs/woff2/include ++ -I$(dvisvgm_srcdir)/libs/brotli/include \ ++ -I$(dvisvgm_srcdir)/libs/woff2/include + + AM_LDFLAGS += $(TTFAUTOHINT_LIBS) endif +AM_CXXFLAGS += \ @@ -82,14 +92,12 @@ diff -u2r '--exclude=config.h.in' '--exclude=aclocal.m4' '--exclude=Makefile.in' +if WIN32 +AM_CXXFLAGS += -DTEXLIVEWIN32 +endif WIN32 -+ - AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS) +if ! TEXLIVE_BUILD +# 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 -@@ -267,6 +286,16 @@ +@@ -285,6 +301,16 @@ psdefs.ps: ; +endif ! TEXLIVE_BUILD diff --git a/Build/source/texk/dvisvgm/TLpatches/patch-16-gserrornames b/Build/source/texk/dvisvgm/TLpatches/patch-16-gserrornames new file mode 100644 index 00000000000..acdeaddddcf --- /dev/null +++ b/Build/source/texk/dvisvgm/TLpatches/patch-16-gserrornames @@ -0,0 +1,10 @@ +diff -u2r dvisvgm-2.3.1/src/Ghostscript.cpp dvisvgm-src/src/Ghostscript.cpp +--- dvisvgm-2.3.1/src/Ghostscript.cpp 2018-01-02 01:09:11.000000000 -0800 ++++ dvisvgm-src/src/Ghostscript.cpp 2018-01-15 15:57:09.114619987 -0800 +@@ -347,5 +347,5 @@ + return error_names[code-1]; + #else +- if (auto error_names = LOAD_SYMBOL(gs_error_names)) ++ if (auto error_names = loadSymbol<const char**>("gs_error_names")) + return error_names[code-1]; + return nullptr; |