1 |
commit: 5dd398f1e5a3acda39f669bd9d94a6f9d715ac59 |
2 |
Author: Michal Privoznik <mprivozn <AT> redhat <DOT> com> |
3 |
AuthorDate: Tue May 25 12:58:19 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 25 13:23:53 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dd398f1 |
7 |
|
8 |
dev-libs/libxml2: add new upstream patch to fix lxml regression |
9 |
|
10 |
A regression was introduced by the previous upstream patch (which we |
11 |
added to Gentoo in 6d220e09b25048d28d6598f8a6ffb62f0fbe92b4). |
12 |
|
13 |
Bug: https://bugs.gentoo.org/790737 |
14 |
Signed-off-by: Michal Privoznik <mprivozn <AT> redhat.com> |
15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
16 |
|
17 |
dev-libs/libxml2/Manifest | 1 + |
18 |
dev-libs/libxml2/libxml2-2.9.12-r2.ebuild | 249 ++++++++++++++++++++++++++++++ |
19 |
2 files changed, 250 insertions(+) |
20 |
|
21 |
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest |
22 |
index 8aa7d9f74fc..116882cc1d5 100644 |
23 |
--- a/dev-libs/libxml2/Manifest |
24 |
+++ b/dev-libs/libxml2/Manifest |
25 |
@@ -1,6 +1,7 @@ |
26 |
DIST libxml2-2.9.10-r1-patchset.tar.xz 72088 BLAKE2B 4d5f8aed35d6c0232089e09f22a77cbd25cbd2007c1330538e1c7acc4398ec3ef9023289129677cf5499dbacde4c2f28850ae81acab351d02625d3452aedaede SHA512 a63032d1e85128f637c2b54356aab06a17e31eb1f5facd8fdf88463eb21df6a1d9fd8cc751fa94b8d322fa4f796be4e1d9aa071cbd0826ab31fae46525fde952 |
27 |
DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f1aecf40cf66752fcec5720855d31cea9941d52963badd8c18ea1770485f1c11da6213149458336ce0273418f421 SHA512 0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed |
28 |
DIST libxml2-2.9.12-r1-patchset.tar.bz2 5497 BLAKE2B fda8ad166c89209abaf8f94a5dfbff84e5a6c89cca36350a2f0b9b8db42c6f348b6cb8c7738a35aed8421ca994cc6ad76c3aa02a8a9899fa969b493ca1761b01 SHA512 469befb393430d2532e27f9ed834e0ab5473fc371c89582c3b1434ab1c370140f132d4acf315f7c2b9d1841ab3e78ef04069cca78d66917269b5112ab42127df |
29 |
+DIST libxml2-2.9.12-r2-patchset.tar.bz2 5939 BLAKE2B e518a174385a121ca5545d0a51c2a2b4ddd21b1e7996e2806f368588b27d60e8318ab50ebfb90c3ee57ccece4f1c37e05c1daeed4203a4e9cb5a056ba530ad2b SHA512 06b96ab8426cd560c1147998965b5e718bee08536549a278269f6535ff1460ed97d83067ed0e8a4d834145a5e5a6caa912cf8aa5a33a360e4b1bc9d9135bfb04 |
30 |
DIST libxml2-2.9.12.tar.gz 5681632 BLAKE2B ab93633140e9fd119d3a48ed829a91213c3d7956a00d181203f5188fb0ed0d3a7150d3128fe986b13efadf6fe484393262a3de575527f38f74aa6c0067a6d934 SHA512 df1c6486e80f0fcf3c506f3599bcfb94b620c00d0b5d26831bc983daa78d58ec58b5057b1ec7c1a26c694f40199c6234ee2a6dcabf65abfa10c447cb5705abbd |
31 |
DIST libxml2-2.9.12.tar.gz.asc 488 BLAKE2B 48ec86ec373d94de73bdb52141fc77fccd0ca296a35ed97aa3479ecdcf82b15422dd7d751359b5b1ca477e24b8eee9226784cfbfd861236e10eed2519e7959bf SHA512 69ca6ab7170cad467724e19eff99a3544966a26069e78a7b7cc27ae93a9077b11cc8dad2536bd0b27c3b45f4ea7520c813fe5a018cd65f103059f7f75147a656 |
32 |
DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d |
33 |
|
34 |
diff --git a/dev-libs/libxml2/libxml2-2.9.12-r2.ebuild b/dev-libs/libxml2/libxml2-2.9.12-r2.ebuild |
35 |
new file mode 100644 |
36 |
index 00000000000..a5854997740 |
37 |
--- /dev/null |
38 |
+++ b/dev-libs/libxml2/libxml2-2.9.12-r2.ebuild |
39 |
@@ -0,0 +1,249 @@ |
40 |
+# Copyright 1999-2021 Gentoo Authors |
41 |
+# Distributed under the terms of the GNU General Public License v2 |
42 |
+ |
43 |
+EAPI=7 |
44 |
+ |
45 |
+# Note: Please bump in sync with dev-libs/libxslt |
46 |
+ |
47 |
+PATCHSET_VERSION="2.9.12-r2-patchset" |
48 |
+ |
49 |
+PYTHON_COMPAT=( python3_{7,8,9} ) |
50 |
+PYTHON_REQ_USE="xml" |
51 |
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielveillard.asc |
52 |
+inherit autotools flag-o-matic prefix python-r1 multilib-minimal verify-sig |
53 |
+ |
54 |
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" |
55 |
+XSTS_NAME_1="xmlschema2002-01-16" |
56 |
+XSTS_NAME_2="xmlschema2004-01-14" |
57 |
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" |
58 |
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" |
59 |
+XMLCONF_TARBALL="xmlts20130923.tar.gz" |
60 |
+DESCRIPTION="XML C parser and toolkit" |
61 |
+HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2" |
62 |
+SRC_URI=" |
63 |
+ ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz |
64 |
+ https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${PATCHSET_VERSION}.tar.bz2 |
65 |
+ test? ( |
66 |
+ ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} |
67 |
+ ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} |
68 |
+ https://www.w3.org/XML/Test/${XMLCONF_TARBALL} |
69 |
+ ) |
70 |
+ verify-sig? ( ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz.asc ) |
71 |
+" |
72 |
+S="${WORKDIR}/${PN}-${PV%_rc*}" |
73 |
+ |
74 |
+LICENSE="MIT" |
75 |
+SLOT="2" |
76 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
77 |
+IUSE="debug examples icu ipv6 lzma +python readline static-libs test" |
78 |
+RESTRICT="!test? ( test )" |
79 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
80 |
+ |
81 |
+BDEPEND=" |
82 |
+ dev-util/gtk-doc-am |
83 |
+ virtual/pkgconfig |
84 |
+ verify-sig? ( app-crypt/openpgp-keys-danielveillard ) |
85 |
+" |
86 |
+RDEPEND=" |
87 |
+ >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] |
88 |
+ icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) |
89 |
+ lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) |
90 |
+ python? ( ${PYTHON_DEPS} ) |
91 |
+ readline? ( sys-libs/readline:= ) |
92 |
+" |
93 |
+DEPEND="${RDEPEND}" |
94 |
+ |
95 |
+MULTILIB_CHOST_TOOLS=( |
96 |
+ /usr/bin/xml2-config |
97 |
+) |
98 |
+ |
99 |
+DOCS=( AUTHORS ChangeLog NEWS README TODO TODO_SCHEMAS ) |
100 |
+ |
101 |
+PATCHES=( |
102 |
+ ## Gentoo |
103 |
+ # Patches needed for prefix support |
104 |
+ "${WORKDIR}"/${PN}-2.7.1-catalog_path.patch |
105 |
+ |
106 |
+ # Fix python detection, bug #567066 |
107 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=760458 |
108 |
+ "${WORKDIR}"/${PN}-2.9.2-python-ABIFLAG.patch |
109 |
+ |
110 |
+ # Fix python tests when building out of tree #565576 |
111 |
+ "${WORKDIR}"/${PN}-2.9.8-out-of-tree-test.patch |
112 |
+ |
113 |
+ # bug #745162 |
114 |
+ "${WORKDIR}"/${PN}-2.9.8-python3-unicode-errors.patch |
115 |
+ |
116 |
+ # Avoid failure on missing fuzz.h when running tests |
117 |
+ "${WORKDIR}"/${PN}-2.9.11-disable-fuzz-tests.patch |
118 |
+ |
119 |
+ ## Upstream |
120 |
+ # Fix lxml compatibility |
121 |
+ "${WORKDIR}"/${PN}-2.9.12-fix-lxml-compatibility.patch |
122 |
+) |
123 |
+ |
124 |
+src_unpack() { |
125 |
+ local tarname=${P/_rc/-rc}.tar.gz |
126 |
+ |
127 |
+ if use verify-sig ; then |
128 |
+ verify-sig_verify_detached "${DISTDIR}"/${tarname}{,.asc} |
129 |
+ fi |
130 |
+ |
131 |
+ # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR}, |
132 |
+ # as they are needed as tarballs in ${S}/xstc instead and not unpacked |
133 |
+ unpack ${tarname} ${PN}-${PATCHSET_VERSION}.tar.bz2 |
134 |
+ |
135 |
+ cd "${S}" || die |
136 |
+ |
137 |
+ if use test ; then |
138 |
+ cp "${DISTDIR}/${XSTS_TARBALL_1}" \ |
139 |
+ "${DISTDIR}/${XSTS_TARBALL_2}" \ |
140 |
+ "${S}"/xstc/ \ |
141 |
+ || die "Failed to install test tarballs" |
142 |
+ unpack ${XMLCONF_TARBALL} |
143 |
+ fi |
144 |
+} |
145 |
+ |
146 |
+src_prepare() { |
147 |
+ default |
148 |
+ |
149 |
+ eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c |
150 |
+ |
151 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
152 |
+ # Avoid final linking arguments for python modules |
153 |
+ sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die |
154 |
+ # gcc-apple doesn't grok -Wno-array-bounds |
155 |
+ sed -i -e 's/-Wno-array-bounds//' configure.ac || die |
156 |
+ fi |
157 |
+ |
158 |
+ # Please do not remove, as else we get references to PORTAGE_TMPDIR |
159 |
+ # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. |
160 |
+ # We now need to run eautoreconf at the end to prevent maintainer mode. |
161 |
+ #elibtoolize |
162 |
+ eautoreconf |
163 |
+} |
164 |
+ |
165 |
+multilib_src_configure() { |
166 |
+ # Filter seemingly problematic CFLAGS (#26320) |
167 |
+ filter-flags -fprefetch-loop-arrays -funroll-loops |
168 |
+ |
169 |
+ # Notes: |
170 |
+ # 1) USE zlib support breaks gnome2 |
171 |
+ # (libgnomeprint for instance fails to compile with |
172 |
+ # fresh install, and existing) - <azarah@g.o> (22 Dec 2002). |
173 |
+ # |
174 |
+ # 2) The meaning of the 'debug' USE flag does not apply to the --with-debug |
175 |
+ # switch (enabling the libxml2 debug module). See bug #100898. |
176 |
+ # |
177 |
+ # 3) --with-mem-debug causes unusual segmentation faults (bug #105120). |
178 |
+ |
179 |
+ libxml2_configure() { |
180 |
+ ECONF_SOURCE="${S}" econf \ |
181 |
+ --with-html-subdir=${PF}/html \ |
182 |
+ $(use_with debug run-debug) \ |
183 |
+ $(use_with icu) \ |
184 |
+ $(use_with lzma) \ |
185 |
+ $(use_enable ipv6) \ |
186 |
+ $(use_enable static-libs static) \ |
187 |
+ $(multilib_native_use_with readline) \ |
188 |
+ $(multilib_native_use_with readline history) \ |
189 |
+ "$@" |
190 |
+ } |
191 |
+ |
192 |
+ libxml2_py_configure() { |
193 |
+ # Ensure python build dirs exist |
194 |
+ mkdir -p "${BUILD_DIR}" || die |
195 |
+ |
196 |
+ # Odd build system, also see bug #582130 |
197 |
+ run_in_build_dir libxml2_configure \ |
198 |
+ "--with-python=${EPYTHON}" \ |
199 |
+ "--with-python-install-dir=$(python_get_sitedir)" |
200 |
+ } |
201 |
+ |
202 |
+ # Build python bindings separately |
203 |
+ libxml2_configure --without-python |
204 |
+ |
205 |
+ if multilib_is_native_abi && use python ; then |
206 |
+ python_foreach_impl libxml2_py_configure |
207 |
+ fi |
208 |
+} |
209 |
+ |
210 |
+libxml2_py_emake() { |
211 |
+ pushd "${BUILD_DIR}/python" > /dev/null || die |
212 |
+ |
213 |
+ emake "$@" |
214 |
+ |
215 |
+ popd > /dev/null || die |
216 |
+} |
217 |
+ |
218 |
+multilib_src_compile() { |
219 |
+ default |
220 |
+ |
221 |
+ if multilib_is_native_abi && use python ; then |
222 |
+ local native_builddir="${BUILD_DIR}" |
223 |
+ |
224 |
+ python_foreach_impl libxml2_py_emake \ |
225 |
+ top_builddir="${native_builddir}" \ |
226 |
+ all |
227 |
+ fi |
228 |
+} |
229 |
+ |
230 |
+multilib_src_test() { |
231 |
+ ln -s "${S}"/xmlconf || die |
232 |
+ |
233 |
+ emake check |
234 |
+ |
235 |
+ if multilib_is_native_abi && use python ; then |
236 |
+ python_foreach_impl libxml2_py_emake test |
237 |
+ fi |
238 |
+} |
239 |
+ |
240 |
+multilib_src_install() { |
241 |
+ emake \ |
242 |
+ DESTDIR="${D}" \ |
243 |
+ EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \ |
244 |
+ install |
245 |
+ |
246 |
+ if multilib_is_native_abi && use python ; then |
247 |
+ python_foreach_impl libxml2_py_emake \ |
248 |
+ DESTDIR="${D}" \ |
249 |
+ docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ |
250 |
+ exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ |
251 |
+ install |
252 |
+ |
253 |
+ python_foreach_impl python_optimize |
254 |
+ fi |
255 |
+} |
256 |
+ |
257 |
+multilib_src_install_all() { |
258 |
+ rm -rf "${ED}"/usr/share/doc/${P} |
259 |
+ |
260 |
+ einstalldocs |
261 |
+ |
262 |
+ if ! use examples ; then |
263 |
+ rm -rf "${ED}"/usr/share/doc/${PF}/examples |
264 |
+ rm -rf "${ED}"/usr/share/doc/${PF}/python/examples |
265 |
+ fi |
266 |
+ |
267 |
+ find "${D}" -name '*.la' -delete || die |
268 |
+} |
269 |
+ |
270 |
+pkg_postinst() { |
271 |
+ # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not |
272 |
+ # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. |
273 |
+ if [[ -n "${ROOT}" ]]; then |
274 |
+ elog "Skipping XML catalog creation for stage building (bug #208887)." |
275 |
+ else |
276 |
+ # Need an XML catalog, so no-one writes to a non-existent one |
277 |
+ CATALOG="${EROOT}/etc/xml/catalog" |
278 |
+ |
279 |
+ # We don't want to clobber an existing catalog though, |
280 |
+ # only ensure that one is there |
281 |
+ # <obz@g.o> |
282 |
+ if [[ ! -e "${CATALOG}" ]]; then |
283 |
+ [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml" |
284 |
+ "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" |
285 |
+ einfo "Created XML catalog in ${CATALOG}" |
286 |
+ fi |
287 |
+ fi |
288 |
+} |