Skip to content

Commit

Permalink
dvisvgm 3.2.1
Browse files Browse the repository at this point in the history
git-svn-id: svn://tug.org/texlive/trunk/Build/source@70431 c570f23f-e606-0410-a88d-b1316a301751
  • Loading branch information
kberry committed Mar 5, 2024
1 parent 66f7636 commit f471e61
Show file tree
Hide file tree
Showing 50 changed files with 467 additions and 609 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 - checked 16jan24
dvisvgm 3.2.1 - checked 5mar24
https://dvisvgm.de/Downloads/
https://github.com/mgieseki/dvisvgm
https://ctan.org/pkg/dvisvgm
Expand Down
19 changes: 13 additions & 6 deletions texk/dvisvgm/TLpatches/TL-Changes
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,14 @@ 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 they won't apply as-is.
Probably easiest to check dvisvgm-prev/configure.ac vs. new:
diff dvisvgm-{prev,$ver}/configure.ac
and then install the changes in our configure.ac by hand.
# Update our ./configure.ac from upstream dvisvgm-src/configure.ac.
# See patch-04-configure for reference, but won't apply if there are any
# non-trivial changes. Best to check dvisvgm-prev/configure.ac vs. new:
cd ..
diff -u2 dvisvgm-{prev,$ver}/configure.ac
# and then install the changes in our configure.ac by hand as needed.

# patch to integrate into TL build; will likely need adjusting also.
# patch to integrate into TL build; even more likely to need adjusting.
patch -d dvisvgm-src -p1 <TLpatches/patch-08-makefiles

# remake autostuff (then make, etc., with fingers crossed).
Expand All @@ -55,6 +56,12 @@ make -C ../../Work/texk/dvisvgm check
\cp -f ../../Work/texk/dvisvgm/sample*.svg tests/
\cp -f ../../Work/texk/dvisvgm/upjf_full.svg tests/upjf.svg
\cp -f ../../Work/texk/dvisvgm/upjf1_full.svg tests/upjf1.svg
#
# check that only diffs are the version number:
svn diff tests
#
# and rerun make check, should pass now:
make -C ../../Work/texk/dvisvgm check

# before committing, update patches:
diff -u2 dvisvgm-$ver/configure.ac ./ >TLpatches/patch-04-configure
Expand Down
15 changes: 9 additions & 6 deletions texk/dvisvgm/TLpatches/patch-04-configure
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- dvisvgm-3.2/configure.ac 2024-01-11 00:52:01.000000000 -0800
+++ ./configure.ac 2024-01-16 10:32:10.211225839 -0800
--- dvisvgm-3.2.1/configure.ac 2024-02-29 00:19:44.000000000 -0800
+++ ./configure.ac 2024-03-05 14:59:41.578987696 -0800
@@ -1,18 +1,31 @@
-# This file is part of dvisvgm
-# Copyright (C) 2005-2024 Martin Gieseking <[email protected]>
Expand All @@ -21,10 +21,10 @@
+dnl Copyright 2005-2024 Martin Gieseking
+dnl
AC_PREREQ([2.69])
-AC_INIT([dvisvgm],[3.2],[[email protected]])
-AC_INIT([dvisvgm],[3.2.1],[[email protected]])
+m4_include([version.ac])[] dnl define dvisvgm_version
+AC_INIT([dvisvgm (TeX Live)], dvisvgm_version, [[email protected]])
DATE="January 2024"
DATE="February 2024"
-AC_CONFIG_SRCDIR(src)
+AC_CONFIG_SRCDIR([dvisvgm-src/src/dvisvgm.cpp])
AC_CONFIG_HEADERS([config.h])
Expand Down Expand Up @@ -122,7 +122,7 @@
+fi
AS_IF([test "x$have_libgs" = "xno"],
# Ghostscript not found, check for dlopen
@@ -83,65 +70,88 @@
@@ -83,68 +70,88 @@
[AC_DEFINE(DISABLE_GS, 1, [Set to 1 if PostScript support should be disabled])]
[AC_MSG_WARN(PostScript support disabled)])])
+fi
Expand Down Expand Up @@ -235,6 +235,9 @@
-AM_CONDITIONAL(HAVE_WOFF2, [test "x$have_woff2" = "xyes"])
-AM_CONDITIONAL(HAVE_XXHASH, [test "x$have_xxhash" = "xyes"])
-
-# Dummy required for TL build sections in automake files
-AM_CONDITIONAL(WIN32, false)
-
-AS_IF([test "x$enable_woff" != "xyes"],
- [AC_DEFINE([DISABLE_WOFF], 1, [Define if WOFF support is disabled])],
- [AS_IF([test "x$with_ttfautohint" != "xno"],
Expand Down Expand Up @@ -265,7 +268,7 @@
-
AC_CHECK_HEADERS_ONCE([libintl.h stdlib.h string.h strings.h unistd.h])

@@ -156,81 +166,82 @@
@@ -159,81 +166,82 @@
AX_GCC_BUILTIN(__builtin_clz)

-# add options for selection of "optional" library locations
Expand Down
163 changes: 29 additions & 134 deletions texk/dvisvgm/TLpatches/patch-08-makefiles
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- dvisvgm-3.2/./Makefile.am 2024-01-03 02:50:11.000000000 -0800
+++ dvisvgm-src/./Makefile.am 2024-01-16 09:31:00.523974816 -0800
@@ -4,9 +4,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 @@
## Process this file with automake.

-include $(top_srcdir)/aminclude_static.am
Expand All @@ -9,141 +9,36 @@
AUTOMAKE_OPTIONS = foreign
EXTRA_DIST = COPYING
-SUBDIRS = libs src tests doc
+SUBDIRS = libs src #not for TL: m4 tests doc
ACLOCAL_AMFLAGS = -I m4

--- dvisvgm-3.2/./libs/Makefile.am 2024-01-03 02:50:11.000000000 -0800
+++ dvisvgm-src/./libs/Makefile.am 2024-01-16 09:31:00.524974811 -0800
@@ -4,5 +4,9 @@
## Process this file with automake.

-SUBDIRS = boost clipper md5 potrace variant xxHash
+SUBDIRS = boost clipper md5 variant xxHash
+
+SUBDIRS = libs src
+if !TEXLIVE_BUILD
+SUBDIRS += potrace
+SUBDIRS += m4 tests doc
+endif
ACLOCAL_AMFLAGS = -I m4

if ENABLE_WOFF
--- dvisvgm-3.2/./libs/defs.am 2024-01-03 02:50:11.000000000 -0800
+++ dvisvgm-src/./libs/defs.am 2024-01-16 09:49:05.754922928 -0800
@@ -8,6 +8,9 @@

--- 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 = $(POTRACE_INCLUDES)
+endif
+#
+if TEXLIVE_BUILD
+POTRACE_CFLAGS = $(POTRACE_INCLUDES)
endif

--- dvisvgm-3.2/./src/ttf/Makefile.am 2023-01-10 05:20:29.000000000 -0800
+++ dvisvgm-src/./src/ttf/Makefile.am 2024-01-16 09:31:00.524974811 -0800
@@ -23,3 +23,4 @@
-I$(dvisvgm_srcdir)/libs/boost \
-I$(dvisvgm_srcdir)/libs/variant/include \
+ $(ZLIB_INCLUDES) \
$(BROTLI_CFLAGS) $(WOFF2_CFLAGS)
--- dvisvgm-3.2/./src/Makefile.am 2024-01-11 00:52:01.000000000 -0800
+++ dvisvgm-src/./src/Makefile.am 2024-01-18 09:44:09.359399768 -0800
@@ -18,8 +18,6 @@
../libs/clipper/libclipper.a \
../libs/md5/libmd5.a \
- $(FREETYPE_LIBS) \
$(POTRACE_LIBS) \
- $(XXHASH_LIBS) \
- $(ZLIB_LIBS)
+ $(XXHASH_LIBS)

if ENABLE_WOFF
@@ -29,5 +27,16 @@
$(WOFF2_LIBS) \
$(BROTLI_LIBS)
-endif
+endif ENABLE_WOFF
+
+if TEXLIVE_BUILD
+dvisvgm_LDADD += \
+ $(KPATHSEA_LIBS) \
+ $(FREETYPE2_LIBS) \
+ $(ZLIB_LIBS)
+else
+dvisvgm_LDADD += \
+ $(FREETYPE_LIBS) \
+ $(ZLIB_LIBS)
+endif !TEXLIVE_BUILD

dvisvgm_DEPENDENCIES = $(noinst_LTLIBRARIES)
@@ -171,9 +180,4 @@
EXTRA_DIST = options.xml options.dtd iapi.h ierrors.h MiKTeXCom.hpp MiKTeXCom.cpp

-if !TEXLIVE_BUILD
-WARNING_CFLAGS = -Wall
-WARNING_CXXFLAGS = -Wall -Wnon-virtual-dtor
-endif
+# 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
-
AM_CFLAGS = $(WARNING_CFLAGS) \
$(ZLIB_CFLAGS) \
@@ -182,9 +186,5 @@
AM_CXXFLAGS = $(WARNING_CXXFLAGS) \
-I$(dvisvgm_srcdir)/libs/clipper \
- -I$(dvisvgm_srcdir)/libs/variant/include \
- $(KPSE_CFLAGS) \
- $(FREETYPE_CFLAGS) \
- $(ZLIB_CFLAGS) \
- $(CODE_COVERAGE_CFLAGS)
+ -I$(dvisvgm_srcdir)/libs/variant/include

AM_CXXFLAGS += \
@@ -192,4 +192,22 @@
$(XXHASH_CFLAGS)

+if TEXLIVE_BUILD
+AM_CXXFLAGS += \
+ $(KPATHSEA_INCLUDES) \
+ $(POTRACE_INCLUDES) \
+ $(FREETYPE2_INCLUDES) \
+ $(ZLIB_INCLUDES) \
+ $(CODE_COVERAGE_CFLAGS)
+if WIN32
+AM_CXXFLAGS += -DTEXLIVEWIN32
+endif WIN32
+else
+AM_CXXFLAGS += \
+ $(KPSE_CFLAGS) \
+ $(FREETYPE_CFLAGS) \
+ $(ZLIB_CFLAGS) \
+ $(CODE_COVERAGE_CFLAGS)
+endif !TEXLIVE_BUILD
+
AM_LDFLAGS = \
$(KPSE_LIBS) \
@@ -203,6 +221,9 @@
$(WOFF2_CFLAGS)

+# TL: do not try to rebuild these source files.
+if !TEXLIVE_BUILD
AM_LDFLAGS += $(TTFAUTOHINT_LIBS)
-endif
+endif !TEXLIVE_BUILD
+endif ENABLE_WOFF

AM_CXXFLAGS += -I$(dvisvgm_srcdir)/libs/md5
@@ -226,4 +247,15 @@

if TEXLIVE_BUILD
+# Rebuild libkpathsea:
+@KPATHSEA_RULE@
+# Rebuild libfreetype:
+@FREETYPE2_RULE@
+# Rebuild libz:
+@ZLIB_RULE@
+# Rebuild potrace:
+@POTRACE_RULE@
+endif TEXLIVE_BUILD
+
+if TEXLIVE_BUILD
# Rebuild libkpathsea:
@KPATHSEA_RULE@
-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.
# Generated by GNU Autoconf 2.72 for dvisvgm (TeX Live) 3.2.1.
#
# Report bugs to <[email protected]>.
#
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'
PACKAGE_STRING='dvisvgm (TeX Live) 3.2'
PACKAGE_VERSION='3.2.1'
PACKAGE_STRING='dvisvgm (TeX Live) 3.2.1'
PACKAGE_BUGREPORT='[email protected]'
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 to adapt to many kinds of systems.
'configure' configures dvisvgm (TeX Live) 3.2.1 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:";;
short | recursive ) echo "Configuration of dvisvgm (TeX Live) 3.2.1:";;
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
dvisvgm (TeX Live) configure 3.2.1
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, which was
It was created by dvisvgm (TeX Live) $as_me 3.2.1, 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="January 2024"
DATE="February 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'
VERSION='3.2.1'


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

lt_cl_version="\
dvisvgm (TeX Live) config.lt 3.2
dvisvgm (TeX Live) config.lt 3.2.1
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, which was
This file was extended by dvisvgm (TeX Live) $as_me 3.2.1, 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
dvisvgm (TeX Live) config.status 3.2.1
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, [[email protected]])
DATE="January 2024"
DATE="February 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
5 changes: 4 additions & 1 deletion texk/dvisvgm/dvisvgm-src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ include $(top_srcdir)/dvisvgm-src/aminclude_static.am

AUTOMAKE_OPTIONS = foreign
EXTRA_DIST = COPYING
SUBDIRS = libs src #not for TL: m4 tests doc
SUBDIRS = libs src
if !TEXLIVE_BUILD
SUBDIRS += m4 tests doc
endif
ACLOCAL_AMFLAGS = -I m4

if USE_BUNDLED_LIBS
Expand Down
Loading

0 comments on commit f471e61

Please sign in to comment.