1 |
commit: 1bfa02837a5c52547e53386129cc905f31f6a87a |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 13 12:22:23 2022 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 13 12:23:15 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bfa0283 |
7 |
|
8 |
gnome-base/librsvg: Version bump to 2.54.2 |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
gnome-base/librsvg/Manifest | 1 + |
13 |
.../librsvg-2.54.2-build-Fix-gtk-doc-check.patch | 31 ++++++ |
14 |
gnome-base/librsvg/librsvg-2.54.2.ebuild | 113 +++++++++++++++++++++ |
15 |
3 files changed, 145 insertions(+) |
16 |
|
17 |
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest |
18 |
index 52fc031b8e2f..ca7dbcb3d00d 100644 |
19 |
--- a/gnome-base/librsvg/Manifest |
20 |
+++ b/gnome-base/librsvg/Manifest |
21 |
@@ -3,3 +3,4 @@ DIST librsvg-2.52.6.tar.xz 23662708 BLAKE2B 21108297aa4f87a852d0decb9cc7b8a5cdb5 |
22 |
DIST librsvg-2.52.7.tar.xz 23709632 BLAKE2B 4eb83d71b77b851c408ddba711fe39ed23863aa6466634020a19ffc30e00c12f7dea81f11fdc09eb53c0c72efb35adc4528568b3c27e5dc0e886426d145d347f SHA512 15c075d696ebba35555f93456be088e6398da5b7992119edc78f1ee1d376a70425248e36b138dc86234aec13cb139fded11d6d74523c44f9a49eb19c2151fcb7 |
23 |
DIST librsvg-2.54.0.tar.xz 23489972 BLAKE2B 04fcbb688b18e98dcbef81e84106a99280d45f242152a355ac6f202410c13b289b281bd10f9e77854997362b7d3e88832d3274d7d63ace8adc05613da99e2aab SHA512 3357ca8cf7537fe2792ee2d9a1719622656f3e1d7f30da062799a4b3ca8788cc07333a00e1c9da53a53da2b67a2aa5895a4c8fce35003da659fb7f98048b68eb |
24 |
DIST librsvg-2.54.1.tar.xz 28181768 BLAKE2B 86e1cf01febce55acadc9b05f5e08fda69423ab267ab8330bbf892d63f475d5ddd163099346f3cf1e63bf2807d847440cf48d8b24f3c32b3ab14a35c0c54d96e SHA512 d1ea8a49988fed1d7a2ba21540a6c10084cd78f8b6db3534882d086a09f3a0d96ec80c59b3744a6eeef8ae511f0b0152eaf18cc9a134f4b871a993418cae09a6 |
25 |
+DIST librsvg-2.54.2.tar.xz 28230460 BLAKE2B c206a1a1e8fa7ef88576d1ff4c1d32655f18fd2cd6a64601e2346ad54845b5ab0277234c6d34a8410546fa32a32280accec3baf806fa62a8adad1ce4dc42036b SHA512 9014f8c795b676351314d627eaec3f3c4fbe28b5d9197e2a4ab0388e307e77feb57b32aefe8908d0b6a58896ad2f8ce75da4e717646a42dd108bf4e393533ac0 |
26 |
|
27 |
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 |
28 |
new file mode 100644 |
29 |
index 000000000000..6231c6ad4b95 |
30 |
--- /dev/null |
31 |
+++ b/gnome-base/librsvg/files/librsvg-2.54.2-build-Fix-gtk-doc-check.patch |
32 |
@@ -0,0 +1,31 @@ |
33 |
+From 34fcf8a6055d6a72752bd931a280418ee4314fdd Mon Sep 17 00:00:00 2001 |
34 |
+From: David King <amigadave@×××××××××.com> |
35 |
+Date: Fri, 13 May 2022 10:07:05 +0100 |
36 |
+Subject: [PATCH] build: Fix gtk-doc check |
37 |
+ |
38 |
+https://gitlab.gnome.org/GNOME/librsvg/-/issues/866 |
39 |
+--- |
40 |
+ configure.ac | 4 ++-- |
41 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
42 |
+ |
43 |
+diff --git a/configure.ac b/configure.ac |
44 |
+index c3b1ff341..2d16e6d33 100644 |
45 |
+--- a/configure.ac |
46 |
++++ b/configure.ac |
47 |
+@@ -129,11 +129,11 @@ AC_ARG_ENABLE([gtk-doc], |
48 |
+ |
49 |
+ AS_IF([test "x$enable_gtk_doc" != xno], |
50 |
+ [AC_CHECK_TOOL(GI_DOCGEN, [gi-docgen], [no]) |
51 |
+- AS_IF([test "x$GI_DOCGEN" = no], |
52 |
++ AS_IF([test "x$GI_DOCGEN" = xno], |
53 |
+ [AS_CASE(["$enable_gtk_doc"], |
54 |
+ [yes], [AC_MSG_ERROR([gi-docgen not found - cannot build docs])], |
55 |
+ [auto], [AC_MSG_WARN([gi-docgen not found - not building docs])]) |
56 |
+- enable_gtk_doc=no] |
57 |
++ enable_gtk_doc=no], |
58 |
+ [enable_gtk_doc=yes])]) |
59 |
+ AM_CONDITIONAL(ENABLE_GTK_DOC, [test "x$enable_gtk_doc" = xyes]) |
60 |
+ |
61 |
+-- |
62 |
+GitLab |
63 |
+ |
64 |
|
65 |
diff --git a/gnome-base/librsvg/librsvg-2.54.2.ebuild b/gnome-base/librsvg/librsvg-2.54.2.ebuild |
66 |
new file mode 100644 |
67 |
index 000000000000..bea1316264e1 |
68 |
--- /dev/null |
69 |
+++ b/gnome-base/librsvg/librsvg-2.54.2.ebuild |
70 |
@@ -0,0 +1,113 @@ |
71 |
+# Copyright 1999-2022 Gentoo Authors |
72 |
+# Distributed under the terms of the GNU General Public License v2 |
73 |
+ |
74 |
+EAPI=6 |
75 |
+GNOME2_EAUTORECONF=yes # for patching configure.ac |
76 |
+PYTHON_COMPAT=( python3_{8..10} ) |
77 |
+ |
78 |
+inherit gnome2 multilib-minimal python-any-r1 rust-toolchain vala |
79 |
+ |
80 |
+DESCRIPTION="Scalable Vector Graphics (SVG) rendering library" |
81 |
+HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg" |
82 |
+ |
83 |
+LICENSE="LGPL-2+" |
84 |
+SLOT="2" |
85 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" |
86 |
+ |
87 |
+IUSE="gtk-doc +introspection +vala" |
88 |
+REQUIRED_USE=" |
89 |
+ gtk-doc? ( introspection ) |
90 |
+ vala? ( introspection ) |
91 |
+" |
92 |
+RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc. |
93 |
+ |
94 |
+RDEPEND=" |
95 |
+ >=x11-libs/cairo-1.16.0[glib,svg,${MULTILIB_USEDEP}] |
96 |
+ >=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}] |
97 |
+ >=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}] |
98 |
+ >=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}] |
99 |
+ >=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}] |
100 |
+ >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] |
101 |
+ >=x11-libs/pango-1.48.11[${MULTILIB_USEDEP}] |
102 |
+ |
103 |
+ introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) |
104 |
+" |
105 |
+DEPEND="${RDEPEND} |
106 |
+ >=virtual/rust-1.56[${MULTILIB_USEDEP}] |
107 |
+ ${PYTHON_DEPS} |
108 |
+ $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]') |
109 |
+ gtk-doc? ( dev-util/gi-docgen ) |
110 |
+ virtual/pkgconfig |
111 |
+ vala? ( $(vala_depend) ) |
112 |
+ |
113 |
+ dev-libs/gobject-introspection-common |
114 |
+ dev-libs/vala-common |
115 |
+" |
116 |
+# dev-libs/gobject-introspection-common, dev-libs/vala-common needed by eautoreconf |
117 |
+ |
118 |
+QA_FLAGS_IGNORED=" |
119 |
+ usr/bin/rsvg-convert |
120 |
+ usr/lib.*/librsvg.* |
121 |
+" |
122 |
+ |
123 |
+PATCHES=( |
124 |
+ "${FILESDIR}"/${P}-build-Fix-gtk-doc-check.patch |
125 |
+) |
126 |
+ |
127 |
+src_prepare() { |
128 |
+ use vala && vala_src_prepare |
129 |
+ gnome2_src_prepare |
130 |
+} |
131 |
+ |
132 |
+multilib_src_configure() { |
133 |
+ local myconf=( |
134 |
+ --disable-static |
135 |
+ --disable-debug |
136 |
+ $(multilib_native_use_enable gtk-doc) |
137 |
+ $(multilib_native_use_enable introspection) |
138 |
+ $(multilib_native_use_enable vala) |
139 |
+ --enable-pixbuf-loader |
140 |
+ ) |
141 |
+ |
142 |
+ if ! multilib_is_native_abi; then |
143 |
+ myconf+=( |
144 |
+ # Set the rust target, which can differ from CHOST |
145 |
+ RUST_TARGET="$(rust_abi)" |
146 |
+ # RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as |
147 |
+ # far as C parts and configure auto-detection are concerned as CHOST equals CBUILD |
148 |
+ cross_compiling=yes |
149 |
+ ) |
150 |
+ fi |
151 |
+ |
152 |
+ ECONF_SOURCE=${S} \ |
153 |
+ gnome2_src_configure "${myconf[@]}" |
154 |
+ |
155 |
+ if multilib_is_native_abi; then |
156 |
+ ln -s "${S}"/doc/html doc/html || die |
157 |
+ fi |
158 |
+} |
159 |
+ |
160 |
+multilib_src_compile() { |
161 |
+ gnome2_src_compile |
162 |
+} |
163 |
+ |
164 |
+multilib_src_install() { |
165 |
+ gnome2_src_install |
166 |
+} |
167 |
+ |
168 |
+multilib_src_install_all() { |
169 |
+ find "${ED}" -name '*.la' -delete || die |
170 |
+ |
171 |
+ if use gtk-doc; then |
172 |
+ mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die |
173 |
+ mv "${ED}"/usr/share/doc/${PF}/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die |
174 |
+ fi |
175 |
+} |
176 |
+ |
177 |
+pkg_postinst() { |
178 |
+ multilib_foreach_abi gnome2_pkg_postinst |
179 |
+} |
180 |
+ |
181 |
+pkg_postrm() { |
182 |
+ multilib_foreach_abi gnome2_pkg_postrm |
183 |
+} |