commit: 4e2c74f54601f8e14951b87b7f8b83583cde22a0
parent b6d6653f422c3c46daf8eafc422ccffca84ff704
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Thu, 11 Apr 2024 16:08:11 +0200
gnome-base/librsvg: Fix xmlError function pointer type
Diffstat:
3 files changed, 128 insertions(+), 93 deletions(-)
diff --git a/gnome-base/librsvg/files/librsvg-2.40.21-xmlError-function-pointer-type.patch b/gnome-base/librsvg/files/librsvg-2.40.21-xmlError-function-pointer-type.patch
@@ -0,0 +1,34 @@
+From fb59a892c4a2b900b929acbf05578d831749e3ba Mon Sep 17 00:00:00 2001
+From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
+Date: Thu, 11 Apr 2024 15:54:07 +0200
+Subject: [PATCH] rsvg-css: Fix xmlError function pointer type
+
+---
+ rsvg-css.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/rsvg-css.c b/rsvg-css.c
+index 5b359a20..95073cf2 100644
+--- a/rsvg-css.c
++++ b/rsvg-css.c
+@@ -839,7 +839,7 @@ rsvg_css_parse_overflow (const char *str, gboolean * inherit)
+ }
+
+ static void
+-rsvg_xml_noerror (void *data, xmlErrorPtr error)
++rsvg_xml_noerror (void *data, const struct _xmlError *error)
+ {
+ }
+
+@@ -863,7 +863,7 @@ rsvg_css_parse_xml_attribute_string (const char *attribute_string)
+
+ memset (&handler, 0, sizeof (handler));
+ xmlSAX2InitDefaultSAXHandler (&handler, 0);
+- handler.serror = rsvg_xml_noerror;
++ handler.serror = &rsvg_xml_noerror;
+ parser = xmlCreatePushParserCtxt (&handler, NULL, tag, strlen (tag) + 1, NULL);
+ parser->options |= XML_PARSE_NONET;
+
+--
+2.43.2
+
diff --git a/gnome-base/librsvg/librsvg-2.40.21-r1.ebuild b/gnome-base/librsvg/librsvg-2.40.21-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2 multilib-minimal vala
+
+DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~arm ~hppa ~ia64 ~loong ~mips ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+
+IUSE="+introspection tools +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
+ >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.38.0[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
+ tools? ( >=x11-libs/gtk+-3.10.0:3 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-libs/gobject-introspection-common
+ dev-libs/vala-common
+ dev-util/glib-utils
+ >=dev-util/gtk-doc-am-1.13
+ virtual/pkgconfig
+ x11-libs/gdk-pixbuf
+ vala? ( $(vala_depend) )
+"
+# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
+
+RESTRICT="test" # Lots of issues due to freetype changes and more; ever since newer tests got backported into 2.40.19
+
+PATCHES=(
+ # https://bugzilla.gnome.org/show_bug.cgi?id=653323
+ "${FILESDIR}/${PN}-2.40.12-gtk-optional.patch"
+ "${FILESDIR}/librsvg-2.40.21-xmlError-function-pointer-type.patch"
+)
+
+src_prepare() {
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --disable-static
+ --disable-tools # only useful for librsvg developers
+ $(multilib_native_use_enable introspection)
+ $(multilib_native_use_with tools gtk3)
+ $(multilib_native_use_enable vala)
+ --enable-pixbuf-loader
+ )
+
+ # -Bsymbolic is not supported by the Darwin toolchain
+ [[ ${CHOST} == *-darwin* ]] && myconf+=( --disable-Bsymbolic )
+
+ ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/doc/html doc/html || die
+ fi
+}
+
+multilib_src_compile() {
+ # causes segfault if set, see bug #411765
+ unset __GL_NO_DSO_FINALIZER
+ gnome2_src_compile
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+pkg_postinst() {
+ # causes segfault if set, see bug 375615
+ unset __GL_NO_DSO_FINALIZER
+ multilib_foreach_abi gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ # causes segfault if set, see bug 375615
+ unset __GL_NO_DSO_FINALIZER
+ multilib_foreach_abi gnome2_pkg_postrm
+}
diff --git a/gnome-base/librsvg/librsvg-2.40.21.ebuild b/gnome-base/librsvg/librsvg-2.40.21.ebuild
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 multilib-minimal vala
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="~alpha ~arm ~hppa ~ia64 ~loong ~mips ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-IUSE="+introspection tools +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
- >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
- >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
- >=x11-libs/pango-1.38.0[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
- tools? ( >=x11-libs/gtk+-3.10.0:3 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-libs/gobject-introspection-common
- dev-libs/vala-common
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.13
- virtual/pkgconfig
- x11-libs/gdk-pixbuf
- vala? ( $(vala_depend) )
-"
-# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
-
-RESTRICT="test" # Lots of issues due to freetype changes and more; ever since newer tests got backported into 2.40.19
-
-PATCHES=(
- # https://bugzilla.gnome.org/show_bug.cgi?id=653323
- "${FILESDIR}/${PN}-2.40.12-gtk-optional.patch"
-)
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- local myconf=(
- --disable-static
- --disable-tools # only useful for librsvg developers
- $(multilib_native_use_enable introspection)
- $(multilib_native_use_with tools gtk3)
- $(multilib_native_use_enable vala)
- --enable-pixbuf-loader
- )
-
- # -Bsymbolic is not supported by the Darwin toolchain
- [[ ${CHOST} == *-darwin* ]] && myconf+=( --disable-Bsymbolic )
-
- ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-
- if multilib_is_native_abi; then
- ln -s "${S}"/doc/html doc/html || die
- fi
-}
-
-multilib_src_compile() {
- # causes segfault if set, see bug #411765
- unset __GL_NO_DSO_FINALIZER
- gnome2_src_compile
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
-
-pkg_postinst() {
- # causes segfault if set, see bug 375615
- unset __GL_NO_DSO_FINALIZER
- multilib_foreach_abi gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- # causes segfault if set, see bug 375615
- unset __GL_NO_DSO_FINALIZER
- multilib_foreach_abi gnome2_pkg_postrm
-}
