commit: 1bfa02837a5c52547e53386129cc905f31f6a87a Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Fri May 13 12:22:23 2022 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Fri May 13 12:23:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bfa0283
gnome-base/librsvg: Version bump to 2.54.2 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> gnome-base/librsvg/Manifest | 1 + .../librsvg-2.54.2-build-Fix-gtk-doc-check.patch | 31 ++++++ gnome-base/librsvg/librsvg-2.54.2.ebuild | 113 +++++++++++++++++++++ 3 files changed, 145 insertions(+) diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest index 52fc031b8e2f..ca7dbcb3d00d 100644 --- a/gnome-base/librsvg/Manifest +++ b/gnome-base/librsvg/Manifest @@ -3,3 +3,4 @@ DIST librsvg-2.52.6.tar.xz 23662708 BLAKE2B 21108297aa4f87a852d0decb9cc7b8a5cdb5 DIST librsvg-2.52.7.tar.xz 23709632 BLAKE2B 4eb83d71b77b851c408ddba711fe39ed23863aa6466634020a19ffc30e00c12f7dea81f11fdc09eb53c0c72efb35adc4528568b3c27e5dc0e886426d145d347f SHA512 15c075d696ebba35555f93456be088e6398da5b7992119edc78f1ee1d376a70425248e36b138dc86234aec13cb139fded11d6d74523c44f9a49eb19c2151fcb7 DIST librsvg-2.54.0.tar.xz 23489972 BLAKE2B 04fcbb688b18e98dcbef81e84106a99280d45f242152a355ac6f202410c13b289b281bd10f9e77854997362b7d3e88832d3274d7d63ace8adc05613da99e2aab SHA512 3357ca8cf7537fe2792ee2d9a1719622656f3e1d7f30da062799a4b3ca8788cc07333a00e1c9da53a53da2b67a2aa5895a4c8fce35003da659fb7f98048b68eb DIST librsvg-2.54.1.tar.xz 28181768 BLAKE2B 86e1cf01febce55acadc9b05f5e08fda69423ab267ab8330bbf892d63f475d5ddd163099346f3cf1e63bf2807d847440cf48d8b24f3c32b3ab14a35c0c54d96e SHA512 d1ea8a49988fed1d7a2ba21540a6c10084cd78f8b6db3534882d086a09f3a0d96ec80c59b3744a6eeef8ae511f0b0152eaf18cc9a134f4b871a993418cae09a6 +DIST librsvg-2.54.2.tar.xz 28230460 BLAKE2B c206a1a1e8fa7ef88576d1ff4c1d32655f18fd2cd6a64601e2346ad54845b5ab0277234c6d34a8410546fa32a32280accec3baf806fa62a8adad1ce4dc42036b SHA512 9014f8c795b676351314d627eaec3f3c4fbe28b5d9197e2a4ab0388e307e77feb57b32aefe8908d0b6a58896ad2f8ce75da4e717646a42dd108bf4e393533ac0 diff --git a/gnome-base/librsvg/files/librsvg-2.54.2-build-Fix-gtk-doc-check.patch b/gnome-base/librsvg/files/librsvg-2.54.2-build-Fix-gtk-doc-check.patch new file mode 100644 index 000000000000..6231c6ad4b95 --- /dev/null +++ b/gnome-base/librsvg/files/librsvg-2.54.2-build-Fix-gtk-doc-check.patch @@ -0,0 +1,31 @@ +From 34fcf8a6055d6a72752bd931a280418ee4314fdd Mon Sep 17 00:00:00 2001 +From: David King <amigad...@amigadave.com> +Date: Fri, 13 May 2022 10:07:05 +0100 +Subject: [PATCH] build: Fix gtk-doc check + +https://gitlab.gnome.org/GNOME/librsvg/-/issues/866 +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c3b1ff341..2d16e6d33 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -129,11 +129,11 @@ AC_ARG_ENABLE([gtk-doc], + + AS_IF([test "x$enable_gtk_doc" != xno], + [AC_CHECK_TOOL(GI_DOCGEN, [gi-docgen], [no]) +- AS_IF([test "x$GI_DOCGEN" = no], ++ AS_IF([test "x$GI_DOCGEN" = xno], + [AS_CASE(["$enable_gtk_doc"], + [yes], [AC_MSG_ERROR([gi-docgen not found - cannot build docs])], + [auto], [AC_MSG_WARN([gi-docgen not found - not building docs])]) +- enable_gtk_doc=no] ++ enable_gtk_doc=no], + [enable_gtk_doc=yes])]) + AM_CONDITIONAL(ENABLE_GTK_DOC, [test "x$enable_gtk_doc" = xyes]) + +-- +GitLab + diff --git a/gnome-base/librsvg/librsvg-2.54.2.ebuild b/gnome-base/librsvg/librsvg-2.54.2.ebuild new file mode 100644 index 000000000000..bea1316264e1 --- /dev/null +++ b/gnome-base/librsvg/librsvg-2.54.2.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_EAUTORECONF=yes # for patching configure.ac +PYTHON_COMPAT=( python3_{8..10} ) + +inherit gnome2 multilib-minimal python-any-r1 rust-toolchain vala + +DESCRIPTION="Scalable Vector Graphics (SVG) rendering library" +HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"; + +LICENSE="LGPL-2+" +SLOT="2" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" + +IUSE="gtk-doc +introspection +vala" +REQUIRED_USE=" + gtk-doc? ( introspection ) + vala? ( introspection ) +" +RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc. + +RDEPEND=" + >=x11-libs/cairo-1.16.0[glib,svg,${MULTILIB_USEDEP}] + >=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}] + >=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}] + >=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] + >=x11-libs/pango-1.48.11[${MULTILIB_USEDEP}] + + introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) +" +DEPEND="${RDEPEND} + >=virtual/rust-1.56[${MULTILIB_USEDEP}] + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]') + gtk-doc? ( dev-util/gi-docgen ) + virtual/pkgconfig + vala? ( $(vala_depend) ) + + dev-libs/gobject-introspection-common + dev-libs/vala-common +" +# dev-libs/gobject-introspection-common, dev-libs/vala-common needed by eautoreconf + +QA_FLAGS_IGNORED=" + usr/bin/rsvg-convert + usr/lib.*/librsvg.* +" + +PATCHES=( + "${FILESDIR}"/${P}-build-Fix-gtk-doc-check.patch +) + +src_prepare() { + use vala && vala_src_prepare + gnome2_src_prepare +} + +multilib_src_configure() { + local myconf=( + --disable-static + --disable-debug + $(multilib_native_use_enable gtk-doc) + $(multilib_native_use_enable introspection) + $(multilib_native_use_enable vala) + --enable-pixbuf-loader + ) + + if ! multilib_is_native_abi; then + myconf+=( + # Set the rust target, which can differ from CHOST + RUST_TARGET="$(rust_abi)" + # RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as + # far as C parts and configure auto-detection are concerned as CHOST equals CBUILD + cross_compiling=yes + ) + fi + + 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() { + gnome2_src_compile +} + +multilib_src_install() { + gnome2_src_install +} + +multilib_src_install_all() { + find "${ED}" -name '*.la' -delete || die + + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die + mv "${ED}"/usr/share/doc/${PF}/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die + fi +} + +pkg_postinst() { + multilib_foreach_abi gnome2_pkg_postinst +} + +pkg_postrm() { + multilib_foreach_abi gnome2_pkg_postrm +}
