diff options
Diffstat (limited to 'Build/source/texk/dvisvgm/TLpatches')
-rw-r--r-- | Build/source/texk/dvisvgm/TLpatches/TL-Changes | 13 | ||||
-rw-r--r-- | Build/source/texk/dvisvgm/TLpatches/patch-04-configure | 8 | ||||
-rw-r--r-- | Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles | 31 |
3 files changed, 36 insertions, 16 deletions
diff --git a/Build/source/texk/dvisvgm/TLpatches/TL-Changes b/Build/source/texk/dvisvgm/TLpatches/TL-Changes index 415d9d2abd6..277e08771e4 100644 --- a/Build/source/texk/dvisvgm/TLpatches/TL-Changes +++ b/Build/source/texk/dvisvgm/TLpatches/TL-Changes @@ -7,10 +7,11 @@ Changes applied to the original dvisvgm source as obtained from: Update version in ./version.ac. Update DATE and copyrights in configure.ac. +ver=3.NEW.VER mv dvisvgm-src dvisvgm-prev -tar xf dvisvgm-VER.tar.gz -mv dvisvgm-VER dvisvgm-src -tar xf dvisvgm-VER.tar.gz # again, so we can compare orig release to ours +tar xf dvisvgm-$ver.tar.gz +mv dvisvgm-$ver dvisvgm-src +tar xf dvisvgm-$ver.tar.gz # again, so we can compare orig release to ours # remove common and generated files: cd dvisvgm-src @@ -43,6 +44,6 @@ patch -d dvisvgm-src -p1 <TLpatches/patch-08-makefiles 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 -u2 dvisvgm-$ver/configure.ac ./ >TLpatches/patch-04-configure +for m in `(cd ./dvisvgm-src && find -name Makefile.am -o -name defs.am)`; do \ + diff -u2 dvisvgm-{$ver,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 b1579ed6822..948f16eb4d6 100644 --- a/Build/source/texk/dvisvgm/TLpatches/patch-04-configure +++ b/Build/source/texk/dvisvgm/TLpatches/patch-04-configure @@ -1,5 +1,5 @@ ---- dvisvgm-3.0.1/configure.ac 2023-01-10 05:23:42.000000000 -0800 -+++ ./configure.ac 2023-01-19 15:35:24.739713575 -0800 +--- dvisvgm-3.0.2/configure.ac 2023-01-29 23:25:49.000000000 -0800 ++++ ./configure.ac 2023-01-19 17:55:07.781367630 -0800 @@ -1,15 +1,32 @@ -# This file is part of dvisvgm -# Copyright (C) 2005-2023 Martin Gieseking <martin.gieseking@uos.de> @@ -7,8 +7,8 @@ -# Process this file with autoconf to produce a configure script. - -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 $ +-AC_INIT([dvisvgm],[3.0.2],[martin.gieseking@uos.de]) ++dnl $Id: configure.ac 65593 2023-01-20 01:55:04Z karl $ +dnl Process this file with autoconf to produce a configure script +dnl for dvisvgm in TeX Live. +dnl diff --git a/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles b/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles index 377c0243c72..a9d592c59c6 100644 --- a/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles +++ b/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles @@ -1,5 +1,5 @@ ---- 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 +--- dvisvgm-3.0.2/./Makefile.am 2023-01-17 00:55:33.000000000 -0800 ++++ dvisvgm-src/./Makefile.am 2023-02-01 15:05:49.038254644 -0800 @@ -4,9 +4,9 @@ ## Process this file with automake. @@ -12,8 +12,27 @@ +SUBDIRS = libs src #not for TL: m4 tests doc ACLOCAL_AMFLAGS = -I m4 ---- 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 +--- dvisvgm-3.0.2/./libs/defs.am 2022-12-06 08:13:36.000000000 -0800 ++++ dvisvgm-src/./libs/defs.am 2023-02-01 15:07:30.036487762 -0800 +@@ -5,6 +5,14 @@ + + if !HAVE_POTRACE +-POTRACE_CFLAGS = -I$(dvisvgm_srcdir)/libs/potrace +-POTRACE_LIBS = ../libs/potrace/libpotrace.a ++# Gets automake warnings: ++# dvisvgm-src/src/../libs/defs.am:9: warning: POTRACE_LIBS was already defined in condition TRUE, which includes condition !HAVE_POTRACE and !TEXLIVE_BUILD ... ++# dvisvgm-src/src/Makefile.am:14: 'dvisvgm-src/src/../libs/defs.am' included from here ++# configure.ac:51: ... 'POTRACE_LIBS' previously defined here ++#if !TEXLIVE_BUILD ++#POTRACE_CFLAGS = -I$(dvisvgm_srcdir)/libs/potrace ++#POTRACE_LIBS = ../libs/potrace/libpotrace.a ++#else ++POTRACE_CFLAGS = $(POTRACE_INCLUDES) ++#endif TEXLIVE_BUILD + endif + +--- dvisvgm-3.0.2/./libs/Makefile.am 2023-01-17 00:55:33.000000000 -0800 ++++ dvisvgm-src/./libs/Makefile.am 2023-02-01 15:05:49.038254644 -0800 @@ -4,5 +4,9 @@ ## Process this file with automake. @@ -25,8 +44,8 @@ +endif 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 +--- dvisvgm-3.0.2/./src/Makefile.am 2023-01-17 00:55:33.000000000 -0800 ++++ dvisvgm-src/./src/Makefile.am 2023-02-01 15:05:49.038254644 -0800 @@ -17,8 +17,6 @@ $(noinst_LTLIBRARIES) \ ../libs/clipper/libclipper.a \ |