summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvisvgm
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-01-18 17:49:47 +0000
committerKarl Berry <karl@freefriends.org>2024-01-18 17:49:47 +0000
commit9f5b723c1c2ff7d563aab7b101fdc90296016afa (patch)
tree5fb35a00cd2f855e3c13ac6c10ea931e83f3819c /Build/source/texk/dvisvgm
parent9ad369f9aac83cb4588db267067c43e5d99f0d1f (diff)
fixes from Martin for non-TL build
git-svn-id: svn://tug.org/texlive/trunk@69478 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvisvgm')
-rw-r--r--Build/source/texk/dvisvgm/ChangeLog12
-rw-r--r--Build/source/texk/dvisvgm/TLpatches/patch-04-configure9
-rw-r--r--Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles43
-rwxr-xr-xBuild/source/texk/dvisvgm/configure81
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-src/configure.ac3
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.am7
-rw-r--r--Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.in4
7 files changed, 46 insertions, 113 deletions
diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index f0cc47e1108..bef8438410d 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,15 @@
+2024-01-18 Karl Berry <karl@freefriends.org>
+
+ * configure.ac,
+ * Makefile.am,
+ * TLpatches/patch-04-configure,
+ * TLpatches/patch-08-makefiles: tweaks from Martin for non-TL build.
+ https://github.com/mgieseki/dvisvgm/issues/259
+
+2024-01-18 Karl Berry <karl@freefriends.org>
+
+ * Import dvisvgm-3.2.
+
2024-01-01 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
* tests/dvisvgm.test: Make easier to test on Windows.
diff --git a/Build/source/texk/dvisvgm/TLpatches/patch-04-configure b/Build/source/texk/dvisvgm/TLpatches/patch-04-configure
index cac651640ff..5fcac0cc37e 100644
--- a/Build/source/texk/dvisvgm/TLpatches/patch-04-configure
+++ b/Build/source/texk/dvisvgm/TLpatches/patch-04-configure
@@ -1,12 +1,12 @@
--- dvisvgm-3.2/configure.ac 2024-01-11 00:52:01.000000000 -0800
-+++ ./configure.ac 2024-01-16 09:29:40.201424363 -0800
++++ ./configure.ac 2024-01-16 10:32:10.211225839 -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 67404 2023-06-18 22:03:59Z karl $
++dnl $Id: configure.ac 69453 2024-01-16 18:32:08Z karl $
+dnl Process this file with autoconf to produce a configure script
+dnl for dvisvgm in TeX Live.
+dnl
@@ -122,7 +122,7 @@
+fi
AS_IF([test "x$have_libgs" = "xno"],
# Ghostscript not found, check for dlopen
-@@ -83,65 +70,89 @@
+@@ -83,65 +70,88 @@
[AC_DEFINE(DISABLE_GS, 1, [Set to 1 if PostScript support should be disabled])]
[AC_MSG_WARN(PostScript support disabled)])])
+fi
@@ -263,10 +263,9 @@
# Check for header files.
AC_HEADER_DIRENT
-
-+AC_HEADER_STDC
AC_CHECK_HEADERS_ONCE([libintl.h stdlib.h string.h strings.h unistd.h])
-@@ -156,81 +167,82 @@
+@@ -156,81 +166,82 @@
AX_GCC_BUILTIN(__builtin_clz)
-# add options for selection of "optional" library locations
diff --git a/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles b/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles
index 7d9461900ea..728144cf82d 100644
--- a/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles
+++ b/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles
@@ -47,7 +47,7 @@
+ $(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-16 09:53:07.401546123 -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 \
@@ -86,16 +86,20 @@
-
AM_CFLAGS = $(WARNING_CFLAGS) \
$(ZLIB_CFLAGS) \
-@@ -182,13 +186,28 @@
+@@ -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 += \
-+ $(POTRACE_CFLAGS) \
-+ $(XXHASH_CFLAGS)
-+
+
+ AM_CXXFLAGS += \
+@@ -192,4 +192,22 @@
+ $(XXHASH_CFLAGS)
+
+if TEXLIVE_BUILD
+AM_CXXFLAGS += \
+ $(KPATHSEA_INCLUDES) \
@@ -103,23 +107,20 @@
+ $(FREETYPE2_INCLUDES) \
+ $(ZLIB_INCLUDES) \
+ $(CODE_COVERAGE_CFLAGS)
-+else
-+AM_CXXFLAGS += \
- $(KPSE_CFLAGS) \
- $(FREETYPE_CFLAGS) \
- $(ZLIB_CFLAGS) \
- $(CODE_COVERAGE_CFLAGS)
-+endif !TEXLIVE_BUILD
-
--AM_CXXFLAGS += \
-- $(POTRACE_CFLAGS) \
-- $(XXHASH_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 = \
-@@ -203,6 +222,9 @@
+ $(KPSE_LIBS) \
+@@ -203,6 +221,9 @@
$(WOFF2_CFLAGS)
+# TL: do not try to rebuild these source files.
@@ -130,7 +131,7 @@
+endif ENABLE_WOFF
AM_CXXFLAGS += -I$(dvisvgm_srcdir)/libs/md5
-@@ -226,4 +248,15 @@
+@@ -226,4 +247,15 @@
if TEXLIVE_BUILD
+# Rebuild libkpathsea:
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index 07280503805..f19161e807d 100755
--- a/Build/source/texk/dvisvgm/configure
+++ b/Build/source/texk/dvisvgm/configure
@@ -24004,87 +24004,6 @@ fi
fi
-# Autoupdate added the next two lines to ensure that your configure
-# script's behavior did not change. They are probably safe to remove.
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-printf %s "checking for egrep... " >&6; }
-if test ${ac_cv_path_EGREP+y}
-then :
- printf %s "(cached) " >&6
-else case e in #(
- e) if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
- then ac_cv_path_EGREP="$GREP -E"
- else
- if test -z "$EGREP"; then
- ac_path_EGREP_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_prog in egrep
- do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
- # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in #(
-*GNU*)
- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-#(
-*)
- ac_count=0
- printf %s 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- printf "%s\n" 'EGREP' >> "conftest.nl"
- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_EGREP="$ac_path_EGREP"
- ac_path_EGREP_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_EGREP_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_EGREP"; then
- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
-else
- ac_cv_path_EGREP=$EGREP
-fi
-
- fi ;;
-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-printf "%s\n" "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
- EGREP_TRADITIONAL=$EGREP
- ac_cv_path_EGREP_TRADITIONAL=$EGREP
-
-
diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/configure.ac b/Build/source/texk/dvisvgm/dvisvgm-src/configure.ac
index 6cca2c4efdc..0374478903b 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-src/configure.ac
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/configure.ac
@@ -119,6 +119,9 @@ AM_CONDITIONAL(HAVE_BROTLI, [test "x$have_brotli" = "xyes"])
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"],
diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.am b/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.am
index b8fec8de785..df36656d73c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.am
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.am
@@ -198,6 +198,9 @@ AM_CXXFLAGS += \
$(FREETYPE2_INCLUDES) \
$(ZLIB_INCLUDES) \
$(CODE_COVERAGE_CFLAGS)
+if WIN32
+AM_CXXFLAGS += -DTEXLIVEWIN32
+endif WIN32
else
AM_CXXFLAGS += \
$(KPSE_CFLAGS) \
@@ -206,10 +209,6 @@ AM_CXXFLAGS += \
$(CODE_COVERAGE_CFLAGS)
endif !TEXLIVE_BUILD
-if WIN32
-AM_CXXFLAGS += -DTEXLIVEWIN32
-endif WIN32
-
AM_LDFLAGS = \
$(KPSE_LIBS) \
$(CODE_COVERAGE_LDFLAGS)
diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.in b/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.in
index ce4cb14d4b0..886f09acc08 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.in
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.in
@@ -118,13 +118,13 @@ bin_PROGRAMS = dvisvgm$(EXEEXT)
@TEXLIVE_BUILD_TRUE@ $(ZLIB_INCLUDES) \
@TEXLIVE_BUILD_TRUE@ $(CODE_COVERAGE_CFLAGS)
-@TEXLIVE_BUILD_FALSE@am__append_12 = \
+@TEXLIVE_BUILD_TRUE@@WIN32_TRUE@am__append_12 = -DTEXLIVEWIN32
+@TEXLIVE_BUILD_FALSE@am__append_13 = \
@TEXLIVE_BUILD_FALSE@ $(KPSE_CFLAGS) \
@TEXLIVE_BUILD_FALSE@ $(FREETYPE_CFLAGS) \
@TEXLIVE_BUILD_FALSE@ $(ZLIB_CFLAGS) \
@TEXLIVE_BUILD_FALSE@ $(CODE_COVERAGE_CFLAGS)
-@WIN32_TRUE@am__append_13 = -DTEXLIVEWIN32
@ENABLE_WOFF_TRUE@am__append_14 = $(TTFAUTOHINT_CFLAGS) \
@ENABLE_WOFF_TRUE@ $(BROTLI_CFLAGS) $(WOFF2_CFLAGS)