Skip to content

Commit

Permalink
dvisvgm 3.2.2
Browse files Browse the repository at this point in the history
git-svn-id: svn://tug.org/texlive/trunk/Build/source@70487 c570f23f-e606-0410-a88d-b1316a301751
  • Loading branch information
kberry committed Mar 7, 2024
1 parent 1ab6935 commit 611cacc
Show file tree
Hide file tree
Showing 29 changed files with 224 additions and 253 deletions.
2 changes: 1 addition & 1 deletion texk/README
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ dvipos - maintained here, by us

dvipsk - maintained here, by us

dvisvgm 3.2.1 - checked 5mar24
dvisvgm 3.2.2 - checked 7mar24
https://dvisvgm.de/Downloads/
https://github.com/mgieseki/dvisvgm
https://ctan.org/pkg/dvisvgm
Expand Down
4 changes: 3 additions & 1 deletion texk/dvisvgm/TLpatches/TL-Changes
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ svn status | sed -n 's/^\?//p' # rerun, should be empty now
svn status | sed -n 's/^\!//p'
svn rm `!!`
svn status | sed -n 's/^\!//p' # rerun, should be empty now
cd ..

# Update our ./configure.ac from upstream dvisvgm-src/configure.ac.
# See patch-04-configure for reference, but won't apply if there are any
Expand Down Expand Up @@ -67,3 +66,6 @@ make -C ../../Work/texk/dvisvgm check
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

# commit:
svn commit -m"dvisvgm $ver" . ../README
10 changes: 5 additions & 5 deletions texk/dvisvgm/TLpatches/patch-04-configure
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
--- dvisvgm-3.2.1/configure.ac 2024-02-29 00:19:44.000000000 -0800
+++ ./configure.ac 2024-03-05 14:59:41.578987696 -0800
--- dvisvgm-3.2.2/configure.ac 2024-03-07 03:07:02.000000000 -0800
+++ ./configure.ac 2024-03-07 14:41:00.745785681 -0800
@@ -1,18 +1,31 @@
-# This file is part of dvisvgm
-# Copyright (C) 2005-2024 Martin Gieseking <martin.gieseking@uos.de>
-#
-# Process this file with autoconf to produce a configure script.
-
+dnl $Id: configure.ac 69453 2024-01-16 18:32:08Z karl $
+dnl $Id: configure.ac 70431 2024-03-05 23:23:42Z karl $
+dnl Process this file with autoconf to produce a configure script
+dnl for dvisvgm in TeX Live.
+dnl
Expand All @@ -21,10 +21,10 @@
+dnl Copyright 2005-2024 Martin Gieseking
+dnl
AC_PREREQ([2.69])
-AC_INIT([dvisvgm],[3.2.1],[martin.gieseking@uos.de])
-AC_INIT([dvisvgm],[3.2.2],[martin.gieseking@uos.de])
+m4_include([version.ac])[] dnl define dvisvgm_version
+AC_INIT([dvisvgm (TeX Live)], dvisvgm_version, [tex-k@tug.org])
DATE="February 2024"
DATE="March 2024"
-AC_CONFIG_SRCDIR(src)
+AC_CONFIG_SRCDIR([dvisvgm-src/src/dvisvgm.cpp])
AC_CONFIG_HEADERS([config.h])
Expand Down
41 changes: 3 additions & 38 deletions texk/dvisvgm/TLpatches/patch-08-makefiles
Original file line number Diff line number Diff line change
@@ -1,44 +1,9 @@
--- dvisvgm-3.2.1/./Makefile.am 2024-01-03 02:50:11.000000000 -0800
+++ dvisvgm-src/./Makefile.am 2024-03-05 15:17:38.259701130 -0800
@@ -4,9 +4,12 @@
--- dvisvgm-3.2.2/./Makefile.am 2024-03-07 03:04:19.000000000 -0800
+++ dvisvgm-src/./Makefile.am 2024-03-07 14:43:29.913090622 -0800
@@ -4,5 +4,5 @@
## 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 src tests doc
+SUBDIRS = libs src
+if !TEXLIVE_BUILD
+SUBDIRS += m4 tests doc
+endif
ACLOCAL_AMFLAGS = -I m4

--- dvisvgm-3.2.1/./libs/defs.am 2024-01-22 05:46:24.000000000 -0800
+++ dvisvgm-src/./libs/defs.am 2024-03-05 15:20:00.075059010 -0800
@@ -11,6 +11,6 @@
else
if !HAVE_POTRACE
-POTRACE_CFLAGS = -I$(dvisvgm_srcdir)/libs/potrace
-POTRACE_LIBS = ../libs/potrace/libpotrace.a
+# POTRACE_CFLAGS = -I$(dvisvgm_srcdir)/libs/potrace
+# POTRACE_LIBS = ../libs/potrace/libpotrace.a
endif !HAVE_POTRACE
endif !TEXLIVE_BUILD
--- dvisvgm-3.2.1/./src/Makefile.am 2024-02-29 00:19:44.000000000 -0800
+++ dvisvgm-src/./src/Makefile.am 2024-03-05 15:05:07.159805866 -0800
@@ -258,13 +258,2 @@
@POTRACE_RULE@
endif TEXLIVE_BUILD
-
-if TEXLIVE_BUILD
-# Rebuild libkpathsea:
-@KPATHSEA_RULE@
-# Rebuild libfreetype:
-@FREETYPE2_RULE@
-# Rebuild libz:
-@ZLIB_RULE@
-# Rebuild potrace:
-@POTRACE_RULE@
-endif TEXLIVE_BUILD
24 changes: 12 additions & 12 deletions texk/dvisvgm/configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.72 for dvisvgm (TeX Live) 3.2.1.
# Generated by GNU Autoconf 2.72 for dvisvgm (TeX Live) 3.2.2.
#
# Report bugs to <tex-k@tug.org>.
#
Expand Down Expand Up @@ -614,8 +614,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='dvisvgm (TeX Live)'
PACKAGE_TARNAME='dvisvgm--tex-live-'
PACKAGE_VERSION='3.2.1'
PACKAGE_STRING='dvisvgm (TeX Live) 3.2.1'
PACKAGE_VERSION='3.2.2'
PACKAGE_STRING='dvisvgm (TeX Live) 3.2.2'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''

Expand Down Expand Up @@ -1431,7 +1431,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
'configure' configures dvisvgm (TeX Live) 3.2.1 to adapt to many kinds of systems.
'configure' configures dvisvgm (TeX Live) 3.2.2 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -1503,7 +1503,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of dvisvgm (TeX Live) 3.2.1:";;
short | recursive ) echo "Configuration of dvisvgm (TeX Live) 3.2.2:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1643,7 +1643,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
dvisvgm (TeX Live) configure 3.2.1
dvisvgm (TeX Live) configure 3.2.2
generated by GNU Autoconf 2.72

Copyright (C) 2023 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2391,7 +2391,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by dvisvgm (TeX Live) $as_me 3.2.1, which was
It was created by dvisvgm (TeX Live) $as_me 3.2.2, which was
generated by GNU Autoconf 2.72. Invocation command line was

$ $0$ac_configure_args_raw
Expand Down Expand Up @@ -3386,7 +3386,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu


DATE="February 2024"
DATE="March 2024"

ac_config_headers="$ac_config_headers config.h"

Expand Down Expand Up @@ -9185,7 +9185,7 @@ fi

# Define the identity of the package.
PACKAGE='dvisvgm--tex-live-'
VERSION='3.2.1'
VERSION='3.2.2'


printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
Expand Down Expand Up @@ -21644,7 +21644,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."

lt_cl_version="\
dvisvgm (TeX Live) config.lt 3.2.1
dvisvgm (TeX Live) config.lt 3.2.2
configured by $0, generated by GNU Autoconf 2.72.

Copyright (C) 2011 Free Software Foundation, Inc.
Expand Down Expand Up @@ -25142,7 +25142,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by dvisvgm (TeX Live) $as_me 3.2.1, which was
This file was extended by dvisvgm (TeX Live) $as_me 3.2.2, which was
generated by GNU Autoconf 2.72. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -25210,7 +25210,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
dvisvgm (TeX Live) config.status 3.2.1
dvisvgm (TeX Live) config.status 3.2.2
configured by $0, generated by GNU Autoconf 2.72,
with options \\"\$ac_cs_config\\"

Expand Down
2 changes: 1 addition & 1 deletion texk/dvisvgm/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dnl
AC_PREREQ([2.69])
m4_include([version.ac])[] dnl define dvisvgm_version
AC_INIT([dvisvgm (TeX Live)], dvisvgm_version, [tex-k@tug.org])
DATE="February 2024"
DATE="March 2024"
AC_CONFIG_SRCDIR([dvisvgm-src/src/dvisvgm.cpp])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIRS([../../m4])dnl not just _DIR
Expand Down
2 changes: 1 addition & 1 deletion texk/dvisvgm/dvisvgm-src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = foreign
EXTRA_DIST = COPYING
SUBDIRS = libs src
if !TEXLIVE_BUILD
SUBDIRS += m4 tests doc
SUBDIRS += tests doc
endif
ACLOCAL_AMFLAGS = -I m4

Expand Down
6 changes: 3 additions & 3 deletions texk/dvisvgm/dvisvgm-src/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
@SET_MAKE@

# aminclude_static.am generated automatically by Autoconf
# from AX_AM_MACROS_STATIC on Thu Feb 29 09:20:58 CET 2024
# from AX_AM_MACROS_STATIC on Thu Mar 7 12:08:01 CET 2024
VPATH = @srcdir@
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
Expand Down Expand Up @@ -90,7 +90,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@TEXLIVE_BUILD_FALSE@am__append_1 = m4 tests doc
@TEXLIVE_BUILD_FALSE@am__append_1 = tests doc
subdir = dvisvgm-src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/dvisvgm-src/m4/ax_gcc_builtin.m4 \
Expand Down Expand Up @@ -168,7 +168,7 @@ am__define_uniq_tagged_files = \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | $(am__uniquify_input)`
DIST_SUBDIRS = libs src m4 tests doc
DIST_SUBDIRS = libs src tests doc
am__DIST_COMMON = $(srcdir)/Makefile.in \
$(top_srcdir)/dvisvgm-src/aminclude_static.am AUTHORS COPYING \
INSTALL NEWS README
Expand Down
10 changes: 8 additions & 2 deletions texk/dvisvgm/dvisvgm-src/NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
dvisvgm-3.2.2 (2024-03-07)
- fixed the extraction of bitmaps from PS/EPS files that no longer worked
since Ghostscript 10.02.1 due to the removal of GS-specific operators
(GH issue #264)
- minor automake updates required for TeX Live builds

dvisvgm-3.2.1 (2024-02-29)
- delayed loading of Ghostscript library to speed up the conversion of
DVI files without PS specials (GH issue #262)
Expand All @@ -17,12 +23,12 @@ dvisvgm-3.2 (2024-01-11)
after writing an SVG file (GH issue #258)
- applied upstream patch regarding undefined type punning to the bundled
woff2 library
- few improvements of the manual page
- few improvements of the manual page

dvisvgm-3.1.2 (2023-10-12)
- improved evaluation of graphic extents created by the 'preview' package
(GH issue #246)
- fixed computation of character boxes when using --exact-bbox (GH issue #248)
- fixed computation of character boxes when using --exact-bbox (GH issue #248)
- fixed memory error in optimizer module (GH issue #250)
- updated bundled brotli library to version 1.1.0

Expand Down
2 changes: 1 addition & 1 deletion texk/dvisvgm/dvisvgm-src/aminclude_static.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# aminclude_static.am generated automatically by Autoconf
# from AX_AM_MACROS_STATIC on Thu Feb 29 09:20:58 CET 2024
# from AX_AM_MACROS_STATIC on Thu Mar 7 12:08:01 CET 2024


# Code coverage
Expand Down
Loading

0 comments on commit 611cacc

Please sign in to comment.