diff options
author | Karl Berry <karl@freefriends.org> | 2017-02-13 18:43:14 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-02-13 18:43:14 +0000 |
commit | 5ef2fb04a27cd5ef7c85fbefec889b2503259290 (patch) | |
tree | 5d213e7091d68bc4226e68d6ad83ffc774dfe370 /Build/source/texk/dvisvgm/TLPATCHES | |
parent | cdedcff919defc8bac478adf4411c495e08ccd25 (diff) |
rename foo/foo-PATCHES to foo/TLPATCHES for better completion
git-svn-id: svn://tug.org/texlive/trunk@43212 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvisvgm/TLPATCHES')
-rw-r--r-- | Build/source/texk/dvisvgm/TLPATCHES/ChangeLog | 151 | ||||
-rw-r--r-- | Build/source/texk/dvisvgm/TLPATCHES/TL-Changes | 17 | ||||
-rw-r--r-- | Build/source/texk/dvisvgm/TLPATCHES/patch-08-makefiles | 108 |
3 files changed, 276 insertions, 0 deletions
diff --git a/Build/source/texk/dvisvgm/TLPATCHES/ChangeLog b/Build/source/texk/dvisvgm/TLPATCHES/ChangeLog new file mode 100644 index 00000000000..f4c01eceb5d --- /dev/null +++ b/Build/source/texk/dvisvgm/TLPATCHES/ChangeLog @@ -0,0 +1,151 @@ +2017-01-29 Karl Berry <karl@freefriends.org> + + * Import 2.1. + * patch-08-makefiles: adapt dvisvgm build to TL. + +2016-07-04 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * Import release 1.16 + * patch-01-process: removed since it is included in the upstream. + +2016-04-25 Karl Berry <karl@tug.org> + + * patch-01-process: received from dvisvgm author. + +2016-04-20 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * Import release 1.15.1 + +2016-02-27 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * Import release 1.15 + +2016-01-20 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * Import release 1.14.2 + +2016-01-06 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * Import release 1.14.1 + +2015-12-28 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * Import release 1.14. + +2015-12-09 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * Import release 1.13. + +2015-12-03 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * Import release 1.12. + +2015-04-12 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Import release 1.9.2. + +2015-03-01 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Import release 1.9.1. + * patch-01-mingw32, patch-09-funccall, patch-10-pow-int-int + (removed): Included upstream. + +2015-01-15 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-10-pow-int-int (new): Build fix for ppc-darwin gcc-4.2, + from Mojca Miklavec <mojca.miklavec.lists@gmail.com>. + +2015-01-11 Karl Berry <karl@tug.org> + + * patch-09-funccall (new): LLVM/Clang build (or bug) fix. + problem found by Richard Koch <koch@math.uoregon.edu>. + +2015-01-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Import release 1.9. + * patch-01-mingw32 (new): Oldish MinGW32 may not define this. + +2014-09-15 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Import release 1.8.1. + +2014-07-31 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Import release 1.8. + * patch-01-cygwin (removed): Included upstream. + +2014-06-25 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-01-cygwin (new): Cygwin soname for gs library. + +2014-06-20 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Import release 1.7. + +2014-04-29 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Import release 1.6. + +2014-04-13 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Import release 1.5.3. + +2014-01-13 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Import release 1.5.2. + +2013-10-30 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Import release 1.5.1. + +2013-09-17 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * patch-01-MSVC (removed): Instead compile with -DNOMINMAX. + +2013-09-16 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * patch-01-MSVC (new): Build fix for Visual Studio 2010. + +2013-09-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Import release 1.5. + * patch-01-cpp, patch-02-config_h: Removed. + +2013-08-08 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Import release 1.4. + * patch-01-cpp, patch-02-config_h: Adapted. + +2013-06-28 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-02-config_h (new): Include <config.h> always first. + +2013-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-01-cpp: New version for kpathsea adapted to C++. + +2013-05-17 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Import release 1.3. + * patch-01-cpp: Adapted. + +2013-04-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Import release 1.2.1. + * patch-1-cpp (removed): Renamed ... + * patch-01-cpp (new): ... and adapted. + +2013-04-02 Karl Berry <karl@tug.org> + + * 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 <peb@mppmu.mpg.de> + + * Import release 1.2. + +2013-01-29 Peter Breitenlohner <peb@mppmu.mpg.de> + + * 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..619ab400c4b --- /dev/null +++ b/Build/source/texk/dvisvgm/TLPATCHES/TL-Changes @@ -0,0 +1,17 @@ +(This file public domain.) + +Changes applied to the dvisvgm-2.1 tree as obtained from: + http://dvisvgm.bplaced.net/Downloads + +Update version in ./version.ac. + +Removed 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? + +# patch to integrate into TL build: +patch -d dvisvgm-src -p1 <dvisvgm-PATCHES/patch-08-makefiles + +# use same automake macro as upstream: +cp dvisvgm-src/m4/ax_cxx_compile_stdcxx.m4 m4 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..38123785f03 --- /dev/null +++ b/Build/source/texk/dvisvgm/TLPATCHES/patch-08-makefiles @@ -0,0 +1,108 @@ +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 +@@ -6,5 +6,5 @@ + AUTOMAKE_OPTIONS = foreign + EXTRA_DIST = COPYING +-SUBDIRS = libs src tests doc ++SUBDIRS = libs src #TL: tests doc + + 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 @@ + $(noinst_LIBRARIES) \ + ../libs/clipper/libclipper.a \ +- ../libs/xxHash/libxxhash.a \ +- $(FREETYPE_LIBS) \ +- $(FONTFORGE_LIBS) \ +- $(ZLIB_LIBS) ++ ../libs/xxHash/libxxhash.a + + if ENABLE_WOFF +@@ -24,5 +21,14 @@ + endif + ++dvisvgm_LDADD += \ ++ $(KPATHSEA_LIBS) \ ++ $(POTRACE_LIBS) \ ++ $(FREETYPE2_LIBS) \ ++ $(FONTFORGE_LIBS) \ ++ $(ZLIB_LIBS) \ ++ $(LIBGS_LIBS) ++ + dvisvgm_DEPENDENCIES = $(noinst_LIBRARIES) ++dvisvgm_DEPENDENCIES += $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) $(FREETYPE2_DEPEND) + + libdvisvgm_a_SOURCES = \ +@@ -232,27 +238,40 @@ + EXTRA_DIST = options.xml options.dtd iapi.h ierrors.h MiKTeXCom.hpp MiKTeXCom.cpp + +-AM_CFLAGS = -Wall \ +- $(ZLIB_CFLAGS) \ +- $(CODE_COVERAGE_CFLAGS) ++dvisvgm_srcdir = $(top_srcdir)/dvisvgm-src + +-AM_CXXFLAGS = -Wall -Wnon-virtual-dtor \ +- -I$(top_srcdir)/libs/clipper \ +- -I$(top_srcdir)/libs/xxHash \ +- $(FREETYPE_CFLAGS) \ +- $(ZLIB_CFLAGS) \ ++AM_CFLAGS = $(WARNING_CFLAGS) \ ++ $(ZLIB_INCLUDES) \ + $(CODE_COVERAGE_CFLAGS) + ++AM_CXXFLAGS = $(WARNING_CFLAGS) -Wnon-virtual-dtor \ ++ -I$(dvisvgm_srcdir)/libs/clipper \ ++ -I$(dvisvgm_srcdir)/libs/xxHash ++ + 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 += \ +- -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 + endif + ++AM_CXXFLAGS += \ ++ $(KPATHSEA_INCLUDES) \ ++ $(POTRACE_INCLUDES) \ ++ $(FREETYPE2_INCLUDES) \ ++ $(ZLIB_INCLUDES) \ ++ $(LIBGS_INCLUDES) \ ++ $(CODE_COVERAGE_CFLAGS) ++ ++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 @@ + + psdefs.ps: ; ++endif ! TEXLIVE_BUILD + + @CODE_COVERAGE_RULES@ + + CLEANFILES = *.gcda *.gcno ++ ++## Rebuild libkpathsea ++@KPATHSEA_RULE@ ++## Rebuild libpotrace ++@POTRACE_RULE@ ++## Rebuild libfreetype ++@FREETYPE2_RULE@ ++## Rebuild libz ++@ZLIB_RULE@ |