From a8b01fd62375e0df65d5f8f20c5ee142ec6739b6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 5 Nov 2022 03:17:06 +0000 Subject: gentoo auto-resync : 05:11:2022 - 03:17:06 --- app-text/Manifest.gz | Bin 48899 -> 48901 bytes app-text/dvisvgm/Manifest | 3 +- app-text/dvisvgm/dvisvgm-2.14-r1.ebuild | 9 +- .../files/dvisvgm-2.14-configure-autoreconf.patch | 383 +++++++++++++++++++++ 4 files changed, 392 insertions(+), 3 deletions(-) create mode 100644 app-text/dvisvgm/files/dvisvgm-2.14-configure-autoreconf.patch (limited to 'app-text') diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz index 71387f1b90a7..1bcfdeaac387 100644 Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest index 0c72216b8ebd..df7395453e44 100644 --- a/app-text/dvisvgm/Manifest +++ b/app-text/dvisvgm/Manifest @@ -1,4 +1,5 @@ AUX dvisvgm-2.14-Add-missing-cstdint-includes-for-GCC-13.patch 2368 BLAKE2B ace726ea5eb8364b1a5fdf18649b3b5096b915db87528a8016f59ec1b5ac0d2290502cc2ecf116cda4ccc8a308847a1f1b7cf01d535ade5ed878249fe8022e7b SHA512 ce9c08f3f7c902a6a2127b43420b07d016d821bafd3650a36c3f08acd5650ad204f55346a46928ea445c55be562549b81c3eec494917ca1b76b3d54ec388e610 +AUX dvisvgm-2.14-configure-autoreconf.patch 10069 BLAKE2B afc456c40d73e19d260ad1b3574d2284787f3489eb129a900846c052f441e5cb658316d85448d56b65a5a79e72573e1cac5ce0d70563ea5abab3ee193a5afcbd SHA512 e5038d84ac08097fe43c891494037e327357617800a861a87d83c6fdccce318ba3229660ea32bbd15c363696a4c0a74f68773be10ac02a6e9ab000a4ff3fcfd6 AUX dvisvgm-2.14-configure-clang16.patch 681 BLAKE2B cc91e791f4846e9d0fcc9aab8d528bc55c4f3408e52ca5773b79bc91237acd78968717b0477e5ca65ee64ee3e0025539fec6c6a6d8b576894f2a9a3550237179 SHA512 19d6199ba2237c0a41e3cc0a203f6fca840dd87da1e88d50efba1c0f1eda274c71e61d88bc470995fefd6676955860b5f6a1069b6d7db9d6a23a9e01c3722b36 AUX dvisvgm-2.14-ghostscript.patch 7790 BLAKE2B b9220dbbc39ba015f17f4b330dcffe4506a233753faa4b99b5e70fdc42aaff739b649c6f2d91056db7380dd352e7e694557c92710d0a7adc076cd48ca218102a SHA512 5b4acabfdca5748d28a579c27b294bb247d126dcabbef2d8e385b0b091587ff34a7dfd81e19dfd4cabee4d5b6f3206e9c69a7182a45f4201310fbbda4f288504 DIST dvisvgm-2.12.tar.gz 3164951 BLAKE2B 249f1ee43444ac95ed512eac803ab073e1ec04a58266fc569a272014510ab373890fdc7be2207d2037742f4192e266eb214078c0bb448de953ffdf5c29deabba SHA512 3f0ca530f24a8866839d71093dc6fd84f2a0f984d06cdd189425aeeb7c7e7e3c9e283d1fe2e7e9ec79845f36c8bd4d973224a321b8ad39da229a3b4fd59b7008 @@ -6,5 +7,5 @@ DIST dvisvgm-2.13.tar.gz 3174723 BLAKE2B bee6efd0fd32b1b0c116820df955a3b76cfd795 DIST dvisvgm-2.14.tar.gz 3192670 BLAKE2B 16b290db680c57babba06d97250b26925223984af807695a5b24b2e134a0d41e0b7292efd47e6781e75c4790c3e6482d3447e8a5ad7e25b9b36526ba033d15d4 SHA512 874d2d3deed2b1c1cd3e459a53d43533e7fc19613ad2ade09fdf303cedfecd8091d944933c30a7107aad2e8901cc23f1debd4e36031a90b1ad8ba2f56d2a3ba6 EBUILD dvisvgm-2.12.ebuild 1133 BLAKE2B 682c6f278485d685080c7cd998a0e55a39e52a8bddca2fd0ffe3a1964773a283bfaaf16771eb66fc850e5755842a8ad325c40bc96e6bb2cac8c4a8547e80d463 SHA512 74a88a33242e5f7b7511f97557b2f70afdb3e28d1cf51a53789e552a215671d58229378d65bddd342da3bf4cef6b6539674753fe0fd46970f4835d416bfe70da EBUILD dvisvgm-2.13.ebuild 1149 BLAKE2B 7a169d678e8f57eba8a15243116d053f6a2acc04346f69a13d2b97291d9089f4f86961ecadc20b1e4a4465c993814975f0eddbbd4089d1da5927425c263cc762 SHA512 4a408fb8dc501c660f581ce8369c5ae1605230e2fe2f57dcfb90a29a33f5a22df193ce846d841fad7510a86ac0b0e6401e25687a3f423dcc466c06a19654a400 -EBUILD dvisvgm-2.14-r1.ebuild 1435 BLAKE2B 91233901d5e6dea414888b8ccdf24031164477a1a8f42b0ee2cdffe73ded6df9a9a8ecf28a3d0e43009b0b4b05045e19fa55b1a36a576e23c8f2a2f666df2bbd SHA512 1681ece4850e425e9bce936c1b2aaf1a621958d87b8584d03b12b1187f9aa84a9a4c41be878a66737459f8110da3b3b33b1270c72fcb745995c2620940d29eae +EBUILD dvisvgm-2.14-r1.ebuild 1650 BLAKE2B 0167cd67ac95180b961c03ed87e9d9a6d7b7a3dbfb202d5b92a90489b0ec29d96d802e0e39e78598d9b3e9b1cdfd6e2f34a4aede62257eec2aec202f4ff944c9 SHA512 8233979908127a3d3b6ac94b30f2945ee8edcf7f10cf53a4758d140c7f51b1a78187278c7931a18a9129f07f23e8931cb20b230a03a1c2284a86ed8dc29cc3f7 MISC metadata.xml 383 BLAKE2B d4d13b1caf7ebbd81baf9d911434c0ca57f5b9c5d5c136c0ae569341c511e61fbbaf9211accff192d86bdcedca81ad9f6dab2e23f65778a0b2b7c4be0a286a1e SHA512 563b8459b11497c84145cd7dca5cfa38cafbd5bbeb2c2709080633e785509073b96d1ee999fa87b4263f2babefe32b030361fb537b9016cc3eb5ccf423639573 diff --git a/app-text/dvisvgm/dvisvgm-2.14-r1.ebuild b/app-text/dvisvgm/dvisvgm-2.14-r1.ebuild index 7c440a044d8a..2e70826ca37e 100644 --- a/app-text/dvisvgm/dvisvgm-2.14-r1.ebuild +++ b/app-text/dvisvgm/dvisvgm-2.14-r1.ebuild @@ -47,12 +47,17 @@ PATCHES=( "${FILESDIR}"/${P}-ghostscript.patch "${FILESDIR}"/${P}-Add-missing-cstdint-includes-for-GCC-13.patch "${FILESDIR}"/${PN}-2.14-configure-clang16.patch + "${FILESDIR}"/${PN}-2.14-configure-autoreconf.patch ) src_prepare() { - default - # Drop once configure patch merged for clang 16 + local macro + for macro in ax_check_compile_flag.m4 ax_code_coverage.m4 ax_cxx_compile_stdcxx.m4 ; do + cp "${BROOT}"/usr/share/aclocal/${macro} m4/ || die + done + + default eautoreconf } diff --git a/app-text/dvisvgm/files/dvisvgm-2.14-configure-autoreconf.patch b/app-text/dvisvgm/files/dvisvgm-2.14-configure-autoreconf.patch new file mode 100644 index 000000000000..6641d3e2cae5 --- /dev/null +++ b/app-text/dvisvgm/files/dvisvgm-2.14-configure-autoreconf.patch @@ -0,0 +1,383 @@ +https://github.com/mgieseki/dvisvgm/pull/202 + +From 2dc8627a0864ea1543027e577ad96676a56bf4c5 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Fri, 4 Nov 2022 20:04:43 +0000 +Subject: [PATCH 1/4] Cleanup obsolete m4 dist hack + +autoconf & automake, at least nowadays, handle including m4/ +correctly in dist tarballs (from `make dist`). + +Previously, dist tarballs lacked m4/ax_*.m4 and therefore `autoreconf -fi` +would break the Makefile with: +``` +make[3]: Entering directory '/var/tmp/portage/app-text/dvisvgm-2.14-r1/work/dvisvgm-2.14/libs/clipper' +Makefile:664: *** missing separator. Stop. +``` + +On that line is an unexpanded @CODE_COVERAGE_RULES@. + +Bug: https://bugs.gentoo.org/879539 +Signed-off-by: Sam James +--- a/Makefile.am ++++ b/Makefile.am +@@ -5,7 +5,7 @@ + + AUTOMAKE_OPTIONS = foreign + EXTRA_DIST = COPYING +-SUBDIRS = libs m4 src tests doc ++SUBDIRS = libs src tests doc + ACLOCAL_AMFLAGS = -I m4 + + if USE_BUNDLED_LIBS +--- a/configure.ac ++++ b/configure.ac +@@ -228,7 +228,6 @@ AC_CONFIG_FILES([ + libs/variant/Makefile + libs/woff2/Makefile + libs/xxHash/Makefile +- m4/Makefile + src/Makefile + src/version.hpp + src/optimizer/Makefile +--- a/m4/Makefile.am ++++ /dev/null +@@ -1,4 +0,0 @@ +-M4_EXTRA_DIST = \ +- ax_check_compile_flag.m4 \ +- ax_code_coverage.m4 \ +- ax_cxx_compile_stdcxx.m4 + +From 2b03bccde2dd8a1b101f793159663446dd522ac9 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Fri, 4 Nov 2022 20:27:35 +0000 +Subject: [PATCH 2/4] Update to newer autoconf-archive (AX_*) macros + +Signed-off-by: Sam James +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,6 +3,8 @@ + ## + ## Process this file with automake. + ++include $(top_srcdir)/aminclude_static.am ++ + AUTOMAKE_OPTIONS = foreign + EXTRA_DIST = COPYING + SUBDIRS = libs src tests doc +--- a/configure.ac ++++ b/configure.ac +@@ -205,6 +205,7 @@ AS_IF([test "x$enable_manpage" != "xyes"], + AM_CONDITIONAL([BUILD_MANPAGE], [test "x$enable_manpage" = "xyes"]) + + AX_CODE_COVERAGE ++ + AS_IF([ test "$enable_code_coverage" = "yes" ], [ + # disable optimization + changequote({,}) +--- a/libs/brotli/Makefile.am ++++ b/libs/brotli/Makefile.am +@@ -81,7 +81,6 @@ libbrotli_a_SOURCES = \ + + AM_CFLAGS = -Wall -I$(srcdir)/include + +-@CODE_COVERAGE_RULES@ + endif + + EXTRA_DIST = LICENSE +--- a/libs/clipper/Makefile.am ++++ b/libs/clipper/Makefile.am +@@ -6,6 +6,4 @@ AM_CXXFLAGS = -Wall + + clipper.cpp: clipper.hpp + +-@CODE_COVERAGE_RULES@ +- + CLEANFILES = *.gcda *.gcno +--- a/libs/ff-woff/Makefile.am ++++ b/libs/ff-woff/Makefile.am +@@ -85,6 +85,4 @@ EXTRA_DIST = LICENSE + + AM_CFLAGS = -I$(srcdir)/inc -I$(srcdir)/fontforge $(ZLIB_CFLAGS) + +-@CODE_COVERAGE_RULES@ +- + CLEANFILES = *.gcda *.gcno +--- a/libs/md5/Makefile.am ++++ b/libs/md5/Makefile.am +@@ -6,7 +6,6 @@ AM_CXXFLAGS = -Wall + + md5.c: md5.h + +-@CODE_COVERAGE_RULES@ + endif + + CLEANFILES = *.gcda *.gcno +--- a/libs/potrace/Makefile.am ++++ b/libs/potrace/Makefile.am +@@ -17,7 +17,6 @@ libpotrace_a_SOURCES = \ + + AM_CFLAGS = -Wall -I$(srcdir) + +-@CODE_COVERAGE_RULES@ + endif + + CLEANFILES = *.gcda *.gcno +--- a/libs/woff2/Makefile.am ++++ b/libs/woff2/Makefile.am +@@ -28,7 +28,6 @@ libwoff2_a_SOURCES = \ + + AM_CXXFLAGS = -Wall -I$(srcdir)/include -I$(srcdir)/../brotli/include + +-@CODE_COVERAGE_RULES@ + endif + + EXTRA_DIST = LICENSE +--- a/libs/xxHash/Makefile.am ++++ b/libs/xxHash/Makefile.am +@@ -6,7 +6,6 @@ AM_CXXFLAGS = -Wall + + xxhash.c: xxhash.h xxh3.h + +-@CODE_COVERAGE_RULES@ + endif + + CLEANFILES = *.gcda *.gcno +--- /dev/null ++++ b/m4/ax_ac_append_to_file.m4 +@@ -0,0 +1,32 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_ac_append_to_file.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_AC_APPEND_TO_FILE([FILE],[DATA]) ++# ++# DESCRIPTION ++# ++# Appends the specified data to the specified Autoconf is run. If you want ++# to append to a file when configure is run use AX_APPEND_TO_FILE instead. ++# ++# LICENSE ++# ++# Copyright (c) 2009 Allan Caffee ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 10 ++ ++AC_DEFUN([AX_AC_APPEND_TO_FILE],[ ++AC_REQUIRE([AX_FILE_ESCAPES]) ++m4_esyscmd( ++AX_FILE_ESCAPES ++[ ++printf "%s" "$2" >> "$1" ++]) ++]) +--- /dev/null ++++ b/m4/ax_ac_print_to_file.m4 +@@ -0,0 +1,32 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_ac_print_to_file.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_AC_PRINT_TO_FILE([FILE],[DATA]) ++# ++# DESCRIPTION ++# ++# Writes the specified data to the specified file when Autoconf is run. If ++# you want to print to a file when configure is run use AX_PRINT_TO_FILE ++# instead. ++# ++# LICENSE ++# ++# Copyright (c) 2009 Allan Caffee ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 10 ++ ++AC_DEFUN([AX_AC_PRINT_TO_FILE],[ ++m4_esyscmd( ++AC_REQUIRE([AX_FILE_ESCAPES]) ++[ ++printf "%s" "$2" > "$1" ++]) ++]) +--- /dev/null ++++ b/m4/ax_add_am_macro_static.m4 +@@ -0,0 +1,28 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_add_am_macro_static.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_ADD_AM_MACRO_STATIC([RULE]) ++# ++# DESCRIPTION ++# ++# Adds the specified rule to $AMINCLUDE. ++# ++# LICENSE ++# ++# Copyright (c) 2009 Tom Howard ++# Copyright (c) 2009 Allan Caffee ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 8 ++ ++AC_DEFUN([AX_ADD_AM_MACRO_STATIC],[ ++ AC_REQUIRE([AX_AM_MACROS_STATIC]) ++ AX_AC_APPEND_TO_FILE(AMINCLUDE_STATIC,[$1]) ++]) +--- /dev/null ++++ b/m4/ax_am_macros_static.m4 +@@ -0,0 +1,38 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_am_macros_static.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_AM_MACROS_STATIC ++# ++# DESCRIPTION ++# ++# Adds support for macros that create Automake rules. You must manually ++# add the following line ++# ++# include $(top_srcdir)/aminclude_static.am ++# ++# to your Makefile.am files. ++# ++# LICENSE ++# ++# Copyright (c) 2009 Tom Howard ++# Copyright (c) 2009 Allan Caffee ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 11 ++ ++AC_DEFUN([AMINCLUDE_STATIC],[aminclude_static.am]) ++ ++AC_DEFUN([AX_AM_MACROS_STATIC], ++[ ++AX_AC_PRINT_TO_FILE(AMINCLUDE_STATIC,[ ++# ]AMINCLUDE_STATIC[ generated automatically by Autoconf ++# from AX_AM_MACROS_STATIC on ]m4_esyscmd([LC_ALL=C date])[ ++]) ++]) +--- /dev/null ++++ b/m4/ax_file_escapes.m4 +@@ -0,0 +1,30 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_file_escapes.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_FILE_ESCAPES ++# ++# DESCRIPTION ++# ++# Writes the specified data to the specified file. ++# ++# LICENSE ++# ++# Copyright (c) 2008 Tom Howard ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 8 ++ ++AC_DEFUN([AX_FILE_ESCAPES],[ ++AX_DOLLAR="\$" ++AX_SRB="\\135" ++AX_SLB="\\133" ++AX_BS="\\\\" ++AX_DQ="\"" ++]) +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -225,6 +225,4 @@ $(srcdir)/psdefs.cpp: psdefs.ps + + psdefs.ps: ; + +-@CODE_COVERAGE_RULES@ +- + CLEANFILES = *.gcda *.gcno +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -421,6 +421,4 @@ XMLStringTest_LDADD = $(TESTLIBS) + EXTRA_DIST += check-conv genhashcheck.py normalize.xsl + TESTS += check-conv + +-@CODE_COVERAGE_RULES@ +- + CLEANFILES = *.gcda *.gcno hashcheck.cpp + +From 8689f1ceb2284038627668e70ec7e15f99220a5c Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Fri, 4 Nov 2022 22:42:58 +0000 +Subject: [PATCH 4/4] Upgrade to Autoconf 2.69 + +autoconf 2.69 is still pretty old and this only affects +folks who want to run autoreconf anyway. + +Signed-off-by: Sam James +--- a/configure.ac ++++ b/configure.ac +@@ -3,7 +3,7 @@ + # + # Process this file with autoconf to produce a configure script. + +-AC_PREREQ(2.59) ++AC_PREREQ([2.69]) + AC_INIT([dvisvgm],[2.14],[martin.gieseking@uos.de]) + DATE="August 2022" + AC_CONFIG_SRCDIR(src) +@@ -18,13 +18,11 @@ AC_DEFINE_UNQUOTED([TARGET_SYSTEM], ["$target"]) + + # Checks for programs. + AC_PROG_CC +-AC_PROG_CC_C99 + AC_PROG_CXX + AX_CXX_COMPILE_STDCXX([11]) + AM_PROG_AR + LT_INIT + +-AC_PROG_RANLIB + AC_LANG(C) + + AX_CHECK_COMPILE_FLAG([-Wmismatched-tags -Wno-mismatched-tags], [CXXFLAGS="$CXXFLAGS -Wno-mismatched-tags"]) +@@ -147,7 +145,7 @@ AC_CHECK_LIB(z, gzopen) + + # Check for header files. + AC_HEADER_DIRENT +-AC_HEADER_STDC ++ + AC_CHECK_HEADERS_ONCE([libintl.h stdlib.h string.h strings.h unistd.h]) + + # Check for typedefs, structures, and compiler characteristics. + -- cgit v1.2.3