public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-text/dvisvgm/, app-text/dvisvgm/files/
@ 2022-11-04  5:15 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-11-04  5:15 UTC (permalink / raw
  To: gentoo-commits

commit:     cc40eb6f345c1193e853cb752bc8b727d6602e53
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  4 05:09:18 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov  4 05:09:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc40eb6f

app-text/dvisvgm: fix configure w/ clang 16

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...{dvisvgm-2.14.ebuild => dvisvgm-2.14-r1.ebuild} | 12 +++++++++++-
 .../files/dvisvgm-2.14-configure-clang16.patch     | 22 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/app-text/dvisvgm/dvisvgm-2.14.ebuild b/app-text/dvisvgm/dvisvgm-2.14-r1.ebuild
similarity index 84%
rename from app-text/dvisvgm/dvisvgm-2.14.ebuild
rename to app-text/dvisvgm/dvisvgm-2.14-r1.ebuild
index 7a3027f6d6e0..7c440a044d8a 100644
--- a/app-text/dvisvgm/dvisvgm-2.14.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.14-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit autotools
+
 DESCRIPTION="Converts DVI files to SVG"
 HOMEPAGE="https://dvisvgm.de/"
 SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
@@ -43,9 +45,17 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${P}-ghostscript.patch
-	"${FILESDIR}"/${PN}-2.14-Add-missing-cstdint-includes-for-GCC-13.patch
+	"${FILESDIR}"/${P}-Add-missing-cstdint-includes-for-GCC-13.patch
+	"${FILESDIR}"/${PN}-2.14-configure-clang16.patch
 )
 
+src_prepare() {
+	default
+
+	# Drop once configure patch merged for clang 16
+	eautoreconf
+}
+
 src_configure() {
 	local myargs=(
 		--without-ttfautohint

diff --git a/app-text/dvisvgm/files/dvisvgm-2.14-configure-clang16.patch b/app-text/dvisvgm/files/dvisvgm-2.14-configure-clang16.patch
new file mode 100644
index 000000000000..6fe679f551d1
--- /dev/null
+++ b/app-text/dvisvgm/files/dvisvgm-2.14-configure-clang16.patch
@@ -0,0 +1,22 @@
+https://github.com/mgieseki/dvisvgm/pull/200
+
+From e3cfc0976ec1f5bbcd389c318eabc2a783990de0 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 4 Nov 2022 05:07:09 +0000
+Subject: [PATCH] configure.ac: fix -Wimplicit-function-declaration
+
+Clang 16 makes -Wimplicit-function-declaration an error by default. We
+need to include <stdlib.h> for exit().
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,6 +55,7 @@ AC_CHECK_LIB([kpathsea], [kpse_find_file],,
+ 
+ AC_MSG_CHECKING([kpathsea version])
+ AC_RUN_IFELSE([AC_LANG_SOURCE([#include <stdio.h>
++	#include <stdlib.h>
+ 	#include <kpathsea/kpathsea.h>
+ 	int main() {
+ 		FILE *f;
+


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/dvisvgm/, app-text/dvisvgm/files/
@ 2022-11-04 23:31 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-11-04 23:31 UTC (permalink / raw
  To: gentoo-commits

commit:     54a47f1ede26b55a0c47f71bd44708920a9bf0b5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  4 23:31:26 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov  4 23:31:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54a47f1e

app-text/dvisvgm: fix configure

Closes: https://bugs.gentoo.org/879539
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/dvisvgm/dvisvgm-2.14-r1.ebuild            |   9 +-
 .../files/dvisvgm-2.14-configure-autoreconf.patch  | 383 +++++++++++++++++++++
 2 files changed, 390 insertions(+), 2 deletions(-)

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 <sam@gentoo.org>
+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 <sam@gentoo.org>
+--- 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 <sam@gentoo.org>
+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 <sam@gentoo.org>
+--- 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 <allan.caffee@gmail.com>
++#
++#   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 <allan.caffee@gmail.com>
++#
++#   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 <tomhoward@users.sf.net>
++#   Copyright (c) 2009 Allan Caffee <allan.caffee@gmail.com>
++#
++#   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 <tomhoward@users.sf.net>
++#   Copyright (c) 2009 Allan Caffee <allan.caffee@gmail.com>
++#
++#   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 <tomhoward@users.sf.net>
++#
++#   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 <sam@gentoo.org>
+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 <sam@gentoo.org>
+--- 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.
+


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/dvisvgm/, app-text/dvisvgm/files/
@ 2023-02-17 10:39 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-02-17 10:39 UTC (permalink / raw
  To: gentoo-commits

commit:     79a19ac1c1e41ef96ef27bd35031a24ee6bca46f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 17 10:12:17 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 10:12:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79a19ac1

app-text/dvisvgm: add 3.0.2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/dvisvgm/Manifest                          |   1 +
 app-text/dvisvgm/dvisvgm-3.0.2.ebuild              |  61 ++++++++++++
 app-text/dvisvgm/files/dvisvgm-3.0.2-gcc-13.patch  | 109 +++++++++++++++++++++
 .../dvisvgm/files/dvisvgm-3.0.2-rendering.patch    |  25 +++++
 4 files changed, 196 insertions(+)

diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 56560a914cc2..074161d605f4 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -2,3 +2,4 @@ DIST dvisvgm-2.12.tar.gz 3164951 BLAKE2B 249f1ee43444ac95ed512eac803ab073e1ec04a
 DIST dvisvgm-2.13.tar.gz 3174723 BLAKE2B bee6efd0fd32b1b0c116820df955a3b76cfd795acb75063f35bf2b6b15b6bacc8ddc60d9622d8554c80f7c2ab44c85c78a120d4e18fd7a0c902eabb70b6060fc SHA512 264643f9d9dcfa7e1d20df31c3514108ed45c88e0bd0f1ce88c37af22ae57447d624537720e902c5e5e799906d567999c9449fea411f755e75e4c4158e37de30
 DIST dvisvgm-2.14.tar.gz 3192670 BLAKE2B 16b290db680c57babba06d97250b26925223984af807695a5b24b2e134a0d41e0b7292efd47e6781e75c4790c3e6482d3447e8a5ad7e25b9b36526ba033d15d4 SHA512 874d2d3deed2b1c1cd3e459a53d43533e7fc19613ad2ade09fdf303cedfecd8091d944933c30a7107aad2e8901cc23f1debd4e36031a90b1ad8ba2f56d2a3ba6
 DIST dvisvgm-3.0.1.tar.gz 2897716 BLAKE2B 52574002b285191cbeb878f94440451beb10291fe5fadacffa59ed6da181c525053ffddd3cd3570d7357941825df4449c311e86bd25b530de505cbeae865e180 SHA512 1ddee12735883c814cdd3c647e902f8372dbe82693b9a599fb752509a184174e376d028c0fee5e11d23115ae94f34e04fb44fe1f8f20f4d599dc92229a2dd94d
+DIST dvisvgm-3.0.2.tar.gz 2897978 BLAKE2B f0263e4d9013b85cff275b77318bcc204ddc1f8f99deee21d5e0a20f7803938f6feb35b205d5d76867a67ec435354816e2010cd4ad1ad4038d3606b67fc9d8b3 SHA512 41c7b142f0760ffd629d1b487ff6b98cd7cbaaf8c5853ef054e7646dc09e61af80a2935eaeef65dae6aa33faf2f8875e7b952a8ffc6509a13d4dc2a0b57abd1f

diff --git a/app-text/dvisvgm/dvisvgm-3.0.2.ebuild b/app-text/dvisvgm/dvisvgm-3.0.2.ebuild
new file mode 100644
index 000000000000..15bed4426cd2
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-3.0.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="https://dvisvgm.de/"
+SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
+
+# dvisvgm: GPL-3
+# Boost (tiny part, one header): Boost-1.0
+# md5: || ( public-domain BSD-1 )
+# clipper: Boost-1.0
+# variant: Boost-1.0
+LICENSE="GPL-3 Boost-1.0 || ( public-domain BSD-1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+
+# Tests don't work from ${WORKDIR}: kpathsea tries to search in relative
+# directories from where the binary is executed.
+# We cannot really use absolute paths in the kpathsea configuration since that
+# would make it harder for prefix installs.
+RESTRICT="test"
+
+RDEPEND="
+	>=app-arch/brotli-1.0.5:=
+	app-text/ghostscript-gpl:=
+	dev-libs/kpathsea:=
+	dev-libs/openssl:=
+	>=dev-libs/xxhash-0.8.1
+	>=media-gfx/potrace-1.10-r1
+	media-libs/freetype:2
+	>=media-libs/woff2-1.0.2
+	sys-libs/zlib
+	virtual/tex-base
+"
+DEPEND="
+	${RDEPEND}
+	test? ( >=dev-cpp/gtest-1.11 )
+"
+BDEPEND="
+	app-text/asciidoc
+	app-text/xmlto
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-13.patch
+	"${FILESDIR}"/${P}-rendering.patch
+)
+
+src_configure() {
+	local myargs=(
+		--disable-bundled-libs
+		--without-ttfautohint
+	)
+
+	econf "${myargs[@]}"
+}

diff --git a/app-text/dvisvgm/files/dvisvgm-3.0.2-gcc-13.patch b/app-text/dvisvgm/files/dvisvgm-3.0.2-gcc-13.patch
new file mode 100644
index 000000000000..092c91aa31d4
--- /dev/null
+++ b/app-text/dvisvgm/files/dvisvgm-3.0.2-gcc-13.patch
@@ -0,0 +1,109 @@
+https://github.com/mgieseki/dvisvgm/commit/d5df85b403602c927fe56a1f692af91182a1facd
+
+From d5df85b403602c927fe56a1f692af91182a1facd Mon Sep 17 00:00:00 2001
+From: Martin Gieseking <martin.gieseking@uos.de>
+Date: Mon, 30 Jan 2023 10:51:15 +0100
+Subject: [PATCH] added missing includes of cstdint required for GCC 13
+
+--- a/src/BasicDVIReader.hpp
++++ b/src/BasicDVIReader.hpp
+@@ -21,6 +21,8 @@
+ #ifndef BASICDVIREADER_HPP
+ #define BASICDVIREADER_HPP
+ 
++#include <cstdint>
++
+ #include "Matrix.hpp"
+ #include "MessageException.hpp"
+ #include "StreamReader.hpp"
+--- a/src/Bitmap.hpp
++++ b/src/Bitmap.hpp
+@@ -21,6 +21,7 @@
+ #ifndef BITMAP_HPP
+ #define BITMAP_HPP
+ 
++#include <cstdint>
+ #include <ostream>
+ #include <vector>
+ 
+--- a/src/CMap.hpp
++++ b/src/CMap.hpp
+@@ -22,6 +22,7 @@
+ #define CMAP_HPP
+ 
+ #include <algorithm>
++#include <cstdint>
+ #include <ostream>
+ #include <vector>
+ #include "FontEncoding.hpp"
+--- a/src/Color.hpp
++++ b/src/Color.hpp
+@@ -21,6 +21,7 @@
+ #ifndef COLOR_HPP
+ #define COLOR_HPP
+ 
++#include <cstdint>
+ #include <string>
+ #include <valarray>
+ #include <vector>
+--- a/src/DVIReader.hpp
++++ b/src/DVIReader.hpp
+@@ -21,6 +21,7 @@
+ #ifndef DVIREADER_HPP
+ #define DVIREADER_HPP
+ 
++#include <cstdint>
+ #include <limits>
+ #include <map>
+ #include <stack>
+--- a/src/FileSystem.hpp
++++ b/src/FileSystem.hpp
+@@ -21,6 +21,7 @@
+ #ifndef FILESYSTEM_HPP
+ #define FILESYSTEM_HPP
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+--- a/src/InputBuffer.hpp
++++ b/src/InputBuffer.hpp
+@@ -22,6 +22,7 @@
+ #define INPUTBUFFER_HPP
+ 
+ #include <algorithm>
++#include <cstdint>
+ #include <cstring>
+ #include <istream>
+ #include <string>
+--- a/src/RangeMap.hpp
++++ b/src/RangeMap.hpp
+@@ -22,6 +22,7 @@
+ #define RANGEMAP_HPP
+ 
+ #include <algorithm>
++#include <cstdint>
+ #include <ostream>
+ #include <vector>
+ 
+--- a/src/Unicode.hpp
++++ b/src/Unicode.hpp
+@@ -21,6 +21,7 @@
+ #ifndef UNICODE_HPP
+ #define UNICODE_HPP
+ 
++#include <cstdint>
+ #include <string>
+ 
+ struct Unicode {
+--- a/src/ttf/TTFTable.hpp
++++ b/src/ttf/TTFTable.hpp
+@@ -19,6 +19,7 @@
+ *************************************************************************/
+ 
+ #pragma once
++#include <cstdint>
+ #include <ostream>
+ #include <sstream>
+ #include <vector>
+

diff --git a/app-text/dvisvgm/files/dvisvgm-3.0.2-rendering.patch b/app-text/dvisvgm/files/dvisvgm-3.0.2-rendering.patch
new file mode 100644
index 000000000000..c53e07d58cb4
--- /dev/null
+++ b/app-text/dvisvgm/files/dvisvgm-3.0.2-rendering.patch
@@ -0,0 +1,25 @@
+https://github.com/mgieseki/dvisvgm/issues/227
+https://github.com/mgieseki/dvisvgm/commit/62d695b0bf0220a209d143f32054d5a3c872c992
+
+From 62d695b0bf0220a209d143f32054d5a3c872c992 Mon Sep 17 00:00:00 2001
+From: Martin Gieseking <martin.gieseking@uos.de>
+Date: Sun, 5 Feb 2023 13:12:48 +0100
+Subject: [PATCH] popPageContext: reset initial char context by only one level
+ and don't rewind it back to the page element (fixes #227)
+
+--- a/src/SVGTree.cpp
++++ b/src/SVGTree.cpp
+@@ -330,11 +330,11 @@ void SVGTree::pushPageContext (unique_ptr<SVGElement> node) {
+ }
+ 
+ 
+-/** Pops the current context element and restored the previous one. */
++/** Pops the current context element and restores the previous one. */
+ void SVGTree::popPageContext () {
+ 	if (!_pageContextStack.empty())
+ 		_pageContextStack.pop();
+-	_charHandler->setInitialContextNode(_page);
++	_charHandler->setInitialContextNode(_pageContextStack.empty() ? _page : _pageContextStack.top());
+ }
+ 
+ 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/dvisvgm/, app-text/dvisvgm/files/
@ 2023-03-10  9:55 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-03-10  9:55 UTC (permalink / raw
  To: gentoo-commits

commit:     adc62cf3b2675c922d2c6b03c61e8d32b3c997cf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 09:41:49 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 09:55:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adc62cf3

app-text/dvisvgm: drop 3.0.1, 3.0.2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/dvisvgm/Manifest                          |   2 -
 app-text/dvisvgm/dvisvgm-3.0.1.ebuild              |  56 -----------
 app-text/dvisvgm/dvisvgm-3.0.2.ebuild              |  61 ------------
 app-text/dvisvgm/files/dvisvgm-3.0.2-gcc-13.patch  | 109 ---------------------
 .../dvisvgm/files/dvisvgm-3.0.2-rendering.patch    |  25 -----
 5 files changed, 253 deletions(-)

diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index bfac0fb069b4..a21011a35415 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -1,6 +1,4 @@
 DIST dvisvgm-2.12.tar.gz 3164951 BLAKE2B 249f1ee43444ac95ed512eac803ab073e1ec04a58266fc569a272014510ab373890fdc7be2207d2037742f4192e266eb214078c0bb448de953ffdf5c29deabba SHA512 3f0ca530f24a8866839d71093dc6fd84f2a0f984d06cdd189425aeeb7c7e7e3c9e283d1fe2e7e9ec79845f36c8bd4d973224a321b8ad39da229a3b4fd59b7008
 DIST dvisvgm-2.13.tar.gz 3174723 BLAKE2B bee6efd0fd32b1b0c116820df955a3b76cfd795acb75063f35bf2b6b15b6bacc8ddc60d9622d8554c80f7c2ab44c85c78a120d4e18fd7a0c902eabb70b6060fc SHA512 264643f9d9dcfa7e1d20df31c3514108ed45c88e0bd0f1ce88c37af22ae57447d624537720e902c5e5e799906d567999c9449fea411f755e75e4c4158e37de30
 DIST dvisvgm-2.14.tar.gz 3192670 BLAKE2B 16b290db680c57babba06d97250b26925223984af807695a5b24b2e134a0d41e0b7292efd47e6781e75c4790c3e6482d3447e8a5ad7e25b9b36526ba033d15d4 SHA512 874d2d3deed2b1c1cd3e459a53d43533e7fc19613ad2ade09fdf303cedfecd8091d944933c30a7107aad2e8901cc23f1debd4e36031a90b1ad8ba2f56d2a3ba6
-DIST dvisvgm-3.0.1.tar.gz 2897716 BLAKE2B 52574002b285191cbeb878f94440451beb10291fe5fadacffa59ed6da181c525053ffddd3cd3570d7357941825df4449c311e86bd25b530de505cbeae865e180 SHA512 1ddee12735883c814cdd3c647e902f8372dbe82693b9a599fb752509a184174e376d028c0fee5e11d23115ae94f34e04fb44fe1f8f20f4d599dc92229a2dd94d
-DIST dvisvgm-3.0.2.tar.gz 2897978 BLAKE2B f0263e4d9013b85cff275b77318bcc204ddc1f8f99deee21d5e0a20f7803938f6feb35b205d5d76867a67ec435354816e2010cd4ad1ad4038d3606b67fc9d8b3 SHA512 41c7b142f0760ffd629d1b487ff6b98cd7cbaaf8c5853ef054e7646dc09e61af80a2935eaeef65dae6aa33faf2f8875e7b952a8ffc6509a13d4dc2a0b57abd1f
 DIST dvisvgm-3.0.4.tar.gz 2970986 BLAKE2B 2a8cff58cc728c833c74a44af1139529eab433ec5cd8b82949dbad169a609e66069f38f18c046250da5c085756c1ef6d95247c133df1afefc92b1783d9dd5ecd SHA512 89105ecc14b974f0fc0a1684a3ce4c66444bc819d56dd43c517d6b547f618ab60a15abb18609c38ac120ac5990fcd0fa6599cb7b0af11c4f820b1f955943688e

diff --git a/app-text/dvisvgm/dvisvgm-3.0.1.ebuild b/app-text/dvisvgm/dvisvgm-3.0.1.ebuild
deleted file mode 100644
index f057d03f29d8..000000000000
--- a/app-text/dvisvgm/dvisvgm-3.0.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="https://dvisvgm.de/"
-SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
-
-# dvisvgm: GPL-3
-# Boost (tiny part, one header): Boost-1.0
-# md5: || ( public-domain BSD-1 )
-# clipper: Boost-1.0
-# variant: Boost-1.0
-LICENSE="GPL-3 Boost-1.0 || ( public-domain BSD-1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="test"
-
-# Tests don't work from ${WORKDIR}: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-RDEPEND="
-	>=app-arch/brotli-1.0.5:=
-	app-text/ghostscript-gpl:=
-	dev-libs/kpathsea:=
-	dev-libs/openssl:=
-	>=dev-libs/xxhash-0.8.1
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	>=media-libs/woff2-1.0.2
-	sys-libs/zlib
-	virtual/tex-base
-"
-DEPEND="
-	${RDEPEND}
-	test? ( >=dev-cpp/gtest-1.11 )
-"
-BDEPEND="
-	app-text/asciidoc
-	app-text/xmlto
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myargs=(
-		--disable-bundled-libs
-		--without-ttfautohint
-	)
-
-	econf "${myargs[@]}"
-}

diff --git a/app-text/dvisvgm/dvisvgm-3.0.2.ebuild b/app-text/dvisvgm/dvisvgm-3.0.2.ebuild
deleted file mode 100644
index 15bed4426cd2..000000000000
--- a/app-text/dvisvgm/dvisvgm-3.0.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="https://dvisvgm.de/"
-SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
-
-# dvisvgm: GPL-3
-# Boost (tiny part, one header): Boost-1.0
-# md5: || ( public-domain BSD-1 )
-# clipper: Boost-1.0
-# variant: Boost-1.0
-LICENSE="GPL-3 Boost-1.0 || ( public-domain BSD-1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="test"
-
-# Tests don't work from ${WORKDIR}: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-RDEPEND="
-	>=app-arch/brotli-1.0.5:=
-	app-text/ghostscript-gpl:=
-	dev-libs/kpathsea:=
-	dev-libs/openssl:=
-	>=dev-libs/xxhash-0.8.1
-	>=media-gfx/potrace-1.10-r1
-	media-libs/freetype:2
-	>=media-libs/woff2-1.0.2
-	sys-libs/zlib
-	virtual/tex-base
-"
-DEPEND="
-	${RDEPEND}
-	test? ( >=dev-cpp/gtest-1.11 )
-"
-BDEPEND="
-	app-text/asciidoc
-	app-text/xmlto
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-13.patch
-	"${FILESDIR}"/${P}-rendering.patch
-)
-
-src_configure() {
-	local myargs=(
-		--disable-bundled-libs
-		--without-ttfautohint
-	)
-
-	econf "${myargs[@]}"
-}

diff --git a/app-text/dvisvgm/files/dvisvgm-3.0.2-gcc-13.patch b/app-text/dvisvgm/files/dvisvgm-3.0.2-gcc-13.patch
deleted file mode 100644
index 092c91aa31d4..000000000000
--- a/app-text/dvisvgm/files/dvisvgm-3.0.2-gcc-13.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-https://github.com/mgieseki/dvisvgm/commit/d5df85b403602c927fe56a1f692af91182a1facd
-
-From d5df85b403602c927fe56a1f692af91182a1facd Mon Sep 17 00:00:00 2001
-From: Martin Gieseking <martin.gieseking@uos.de>
-Date: Mon, 30 Jan 2023 10:51:15 +0100
-Subject: [PATCH] added missing includes of cstdint required for GCC 13
-
---- a/src/BasicDVIReader.hpp
-+++ b/src/BasicDVIReader.hpp
-@@ -21,6 +21,8 @@
- #ifndef BASICDVIREADER_HPP
- #define BASICDVIREADER_HPP
- 
-+#include <cstdint>
-+
- #include "Matrix.hpp"
- #include "MessageException.hpp"
- #include "StreamReader.hpp"
---- a/src/Bitmap.hpp
-+++ b/src/Bitmap.hpp
-@@ -21,6 +21,7 @@
- #ifndef BITMAP_HPP
- #define BITMAP_HPP
- 
-+#include <cstdint>
- #include <ostream>
- #include <vector>
- 
---- a/src/CMap.hpp
-+++ b/src/CMap.hpp
-@@ -22,6 +22,7 @@
- #define CMAP_HPP
- 
- #include <algorithm>
-+#include <cstdint>
- #include <ostream>
- #include <vector>
- #include "FontEncoding.hpp"
---- a/src/Color.hpp
-+++ b/src/Color.hpp
-@@ -21,6 +21,7 @@
- #ifndef COLOR_HPP
- #define COLOR_HPP
- 
-+#include <cstdint>
- #include <string>
- #include <valarray>
- #include <vector>
---- a/src/DVIReader.hpp
-+++ b/src/DVIReader.hpp
-@@ -21,6 +21,7 @@
- #ifndef DVIREADER_HPP
- #define DVIREADER_HPP
- 
-+#include <cstdint>
- #include <limits>
- #include <map>
- #include <stack>
---- a/src/FileSystem.hpp
-+++ b/src/FileSystem.hpp
-@@ -21,6 +21,7 @@
- #ifndef FILESYSTEM_HPP
- #define FILESYSTEM_HPP
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
---- a/src/InputBuffer.hpp
-+++ b/src/InputBuffer.hpp
-@@ -22,6 +22,7 @@
- #define INPUTBUFFER_HPP
- 
- #include <algorithm>
-+#include <cstdint>
- #include <cstring>
- #include <istream>
- #include <string>
---- a/src/RangeMap.hpp
-+++ b/src/RangeMap.hpp
-@@ -22,6 +22,7 @@
- #define RANGEMAP_HPP
- 
- #include <algorithm>
-+#include <cstdint>
- #include <ostream>
- #include <vector>
- 
---- a/src/Unicode.hpp
-+++ b/src/Unicode.hpp
-@@ -21,6 +21,7 @@
- #ifndef UNICODE_HPP
- #define UNICODE_HPP
- 
-+#include <cstdint>
- #include <string>
- 
- struct Unicode {
---- a/src/ttf/TTFTable.hpp
-+++ b/src/ttf/TTFTable.hpp
-@@ -19,6 +19,7 @@
- *************************************************************************/
- 
- #pragma once
-+#include <cstdint>
- #include <ostream>
- #include <sstream>
- #include <vector>
-

diff --git a/app-text/dvisvgm/files/dvisvgm-3.0.2-rendering.patch b/app-text/dvisvgm/files/dvisvgm-3.0.2-rendering.patch
deleted file mode 100644
index c53e07d58cb4..000000000000
--- a/app-text/dvisvgm/files/dvisvgm-3.0.2-rendering.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/mgieseki/dvisvgm/issues/227
-https://github.com/mgieseki/dvisvgm/commit/62d695b0bf0220a209d143f32054d5a3c872c992
-
-From 62d695b0bf0220a209d143f32054d5a3c872c992 Mon Sep 17 00:00:00 2001
-From: Martin Gieseking <martin.gieseking@uos.de>
-Date: Sun, 5 Feb 2023 13:12:48 +0100
-Subject: [PATCH] popPageContext: reset initial char context by only one level
- and don't rewind it back to the page element (fixes #227)
-
---- a/src/SVGTree.cpp
-+++ b/src/SVGTree.cpp
-@@ -330,11 +330,11 @@ void SVGTree::pushPageContext (unique_ptr<SVGElement> node) {
- }
- 
- 
--/** Pops the current context element and restored the previous one. */
-+/** Pops the current context element and restores the previous one. */
- void SVGTree::popPageContext () {
- 	if (!_pageContextStack.empty())
- 		_pageContextStack.pop();
--	_charHandler->setInitialContextNode(_page);
-+	_charHandler->setInitialContextNode(_pageContextStack.empty() ? _page : _pageContextStack.top());
- }
- 
- 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/dvisvgm/, app-text/dvisvgm/files/
@ 2023-07-03 13:47 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-07-03 13:47 UTC (permalink / raw
  To: gentoo-commits

commit:     9f1ffa4a2a46aef7387495ebc440b52608ebb987
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  3 13:46:28 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul  3 13:46:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f1ffa4a

app-text/dvisvgm: fix build w/ gcc 13 (again)

Closes: https://bugs.gentoo.org/906250
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/dvisvgm/dvisvgm-3.0.4.ebuild            |  4 ++++
 app-text/dvisvgm/files/dvisvgm-3.0.4-gcc13.patch | 29 ++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/app-text/dvisvgm/dvisvgm-3.0.4.ebuild b/app-text/dvisvgm/dvisvgm-3.0.4.ebuild
index c94c72cd11ca..d583b7ecb4d2 100644
--- a/app-text/dvisvgm/dvisvgm-3.0.4.ebuild
+++ b/app-text/dvisvgm/dvisvgm-3.0.4.ebuild
@@ -40,6 +40,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc13.patch
+)
+
 src_configure() {
 	local myargs=(
 		--disable-bundled-libs

diff --git a/app-text/dvisvgm/files/dvisvgm-3.0.4-gcc13.patch b/app-text/dvisvgm/files/dvisvgm-3.0.4-gcc13.patch
new file mode 100644
index 000000000000..a6452baf6794
--- /dev/null
+++ b/app-text/dvisvgm/files/dvisvgm-3.0.4-gcc13.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/906250
+https://github.com/mgieseki/dvisvgm/commit/b16a8d1c452d809118ceade4d2e8c6f9dfce48ac
+
+From b16a8d1c452d809118ceade4d2e8c6f9dfce48ac Mon Sep 17 00:00:00 2001
+From: Martin Gieseking <martin.gieseking@uos.de>
+Date: Fri, 5 May 2023 22:22:00 +0200
+Subject: [PATCH] added missing includes
+
+--- a/src/DVIActions.hpp
++++ b/src/DVIActions.hpp
+@@ -21,6 +21,7 @@
+ #ifndef DVIACTIONS_HPP
+ #define DVIACTIONS_HPP
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+--- a/src/Pair.hpp
++++ b/src/Pair.hpp
+@@ -22,6 +22,7 @@
+ #define PAIR_HPP
+ 
+ #include <cmath>
++#include <cstdint>
+ #include <ostream>
+ #include "macros.hpp"
+ 
+


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/dvisvgm/, app-text/dvisvgm/files/
@ 2024-08-15  0:54 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-08-15  0:54 UTC (permalink / raw
  To: gentoo-commits

commit:     9fd11c29b85d3f32d8468e657486e5c0f2b7c618
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 15 00:53:35 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 15 00:53:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fd11c29

app-text/dvisvgm: add 3.4

Closes: https://bugs.gentoo.org/937694
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/dvisvgm/Manifest                          |  1 +
 app-text/dvisvgm/dvisvgm-3.4.ebuild                | 59 ++++++++++++++++++++++
 .../dvisvgm/files/dvisvgm-3.4-gcc15-cstdint.patch  | 59 ++++++++++++++++++++++
 3 files changed, 119 insertions(+)

diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 447d2f807ec5..3fb50a588468 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -4,3 +4,4 @@ DIST dvisvgm-3.1.2.tar.gz 2940106 BLAKE2B 05672e2f6b2248e0a28548dae52aa6f6d5f3c5
 DIST dvisvgm-3.1.tar.gz 2908747 BLAKE2B f7544d291fbabf1bb126c97077b15296369815ae0ae8baa2b23d5831d8a6788673af13e0d44c12028be1cef319f83117b0842693810fcc3e5c14263999b41d9e SHA512 8e019eb54f0ad4a5f0e6241e2a5223582da723c7692598278668c1220d7769f161895eb292be0a95771ea7b3e65e8fb83052b7b1f6a6432276fd013e00fd7e51
 DIST dvisvgm-3.2.tar.gz 2940355 BLAKE2B 51a00b948a7ecaa68cee78d484813622c449eb2876a326051f93bb62304bfd174c443cf2eb192bb7c46e28065fe53001ada283002d30949bf39a69270c387dd4 SHA512 718ce9cd1cc8c826859df74eccd8e05dfb1c42f0defb57cdc99910957d009044e0e8a1854ff7fcde739cb832b2559976d3025dbf4cfda9e4cdea85398558d730
 DIST dvisvgm-3.3.tar.gz 2949759 BLAKE2B 37e69aa87fb1b9e14e013d28ef17ecbd89ac5cbbec6206a2e4610a0dadb987cbfcfea72ff17e0150e8b4c20ab27c43a0619538709439dc0eea112ac43b7ec8c7 SHA512 d54121dd1dfeba94dc5ed787dcc55f5287d695d8e2e07cbdffd064e9d97e5368a2df4af794b13d1ef4ea579ea13d7a86c781de30f9d58f5fe3034e6e50b1f2e5
+DIST dvisvgm-3.4.tar.gz 2906583 BLAKE2B 30796beab5983e2828eb669f8c3fc67b4c9ac3527cc4f71544d7724ec9f161c2f7c4b9bee26bbd82a3c43759df2302eba7a42ab127a4c60705e4562ead380547 SHA512 7041ecd8d1085f2e022746e83c40eaca7e9d4e7ad8be285f8a107fb1519272e8c07b3ddaeda9a01adc8fbdbb5438b569276d401b5cb6ccfc8f83d2a4c88efe6a

diff --git a/app-text/dvisvgm/dvisvgm-3.4.ebuild b/app-text/dvisvgm/dvisvgm-3.4.ebuild
new file mode 100644
index 000000000000..5ccb6669e46d
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-3.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="https://dvisvgm.de/"
+SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
+
+# dvisvgm: GPL-3
+# Boost (tiny part, one header): Boost-1.0
+# md5: || ( public-domain BSD-1 )
+# clipper: Boost-1.0
+# variant: Boost-1.0
+LICENSE="GPL-3 Boost-1.0 || ( public-domain BSD-1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/brotli-1.0.5:=
+	app-text/ghostscript-gpl:=
+	dev-libs/kpathsea:=
+	>=dev-libs/xxhash-0.8.1
+	>=media-gfx/potrace-1.10-r1
+	media-libs/freetype:2
+	>=media-libs/woff2-1.0.2
+	sys-libs/zlib
+	virtual/tex-base
+"
+DEPEND="
+	${RDEPEND}
+	test? ( >=dev-cpp/gtest-1.11 )
+"
+BDEPEND="
+	app-text/asciidoc
+	app-text/xmlto
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4-gcc15-cstdint.patch
+)
+
+src_configure() {
+	# ODR violation but only reported with -fno-semantic-interposition?
+	filter-lto
+
+	local myargs=(
+		--disable-bundled-libs
+		--without-ttfautohint
+	)
+
+	econf "${myargs[@]}"
+}

diff --git a/app-text/dvisvgm/files/dvisvgm-3.4-gcc15-cstdint.patch b/app-text/dvisvgm/files/dvisvgm-3.4-gcc15-cstdint.patch
new file mode 100644
index 000000000000..ce3d7f472cbf
--- /dev/null
+++ b/app-text/dvisvgm/files/dvisvgm-3.4-gcc15-cstdint.patch
@@ -0,0 +1,59 @@
+https://github.com/mgieseki/dvisvgm/pull/273
+
+From 094a630bc8f49e233b2b21f34b6fdb3312d6ba2a Mon Sep 17 00:00:00 2001
+Message-ID: <094a630bc8f49e233b2b21f34b6fdb3312d6ba2a.1723683010.git.sam@gentoo.org>
+From: Sam James <sam@gentoo.org>
+Date: Thu, 15 Aug 2024 01:34:04 +0100
+Subject: [PATCH] Add missing `<cstdint>` includes
+
+`uint8_t`, `uint32_t` are used without including `<cstdint>`
+which fails to build w/ GCC 15 after a change in libstdc++ [0]
+
+[0] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=3a817a4a5a6d94da9127af3be9f84a74e3076ee2
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ src/Character.hpp    | 1 +
+ src/HashFunction.hpp | 1 +
+ src/utility.hpp      | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/src/Character.hpp b/src/Character.hpp
+index 0569205a..2b71c163 100644
+--- a/src/Character.hpp
++++ b/src/Character.hpp
+@@ -21,6 +21,7 @@
+ #ifndef CHARACTER_HPP
+ #define CHARACTER_HPP
+ 
++#include <cstdint>
+ 
+ class Character {
+ 	public:
+diff --git a/src/HashFunction.hpp b/src/HashFunction.hpp
+index 703a0bc0..7f5da89d 100644
+--- a/src/HashFunction.hpp
++++ b/src/HashFunction.hpp
+@@ -21,6 +21,7 @@
+ #ifndef HASHFUNCTION_HPP
+ #define HASHFUNCTION_HPP
+ 
++#include <cstdint>
+ #include <istream>
+ #include <memory>
+ #include <string>
+diff --git a/src/utility.hpp b/src/utility.hpp
+index bff301c4..75719480 100644
+--- a/src/utility.hpp
++++ b/src/utility.hpp
+@@ -25,6 +25,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <cstdint>
+ #include <iomanip>
+ #include <functional>
+ #include <memory>
+-- 
+2.45.2
+


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-08-15  0:54 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-10  9:55 [gentoo-commits] repo/gentoo:master commit in: app-text/dvisvgm/, app-text/dvisvgm/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-08-15  0:54 Sam James
2023-07-03 13:47 Sam James
2023-02-17 10:39 Sam James
2022-11-04 23:31 Sam James
2022-11-04  5:15 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox