commit: 1a4c97e245b76cd5798f2fa83a16b32d7d126f1e Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Tue May 3 22:45:32 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue May 3 23:00:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a4c97e2
dev-libs/libxml2: backport patches for 2.9.14 * 2.9.14 doesn't include most of our upstreamed fixes Closes: https://bugs.gentoo.org/842297 Signed-off-by: David Seifert <soap <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/25311 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/libxml2/Manifest | 1 + ...{libxml2-2.9.14.ebuild => libxml2-2.9.14-r1.ebuild} | 18 ++++++------------ profiles/package.mask | 5 ----- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest index ff7171e5e024..7ebdcda02b61 100644 --- a/dev-libs/libxml2/Manifest +++ b/dev-libs/libxml2/Manifest @@ -1,5 +1,6 @@ DIST libxml2-2.9.12-r5-patchset.tar.bz2 7231 BLAKE2B d9d0d56ebccbfe234a8af04cc5343c1a02d84fbd998c2373fd48be59cf92807a9417db650a6bb6ba309e101994c4ae2b28edda7bf635c7728eb8b8047d0d3391 SHA512 b2db0fe4595c1559d9f8dc836ee6eee469191f6c490fc95d25d9fa99a544e80858894cc35b6e4a6624a38d0309800540badc929e86ef29950c1107caa4656a14 DIST libxml2-2.9.13.tar.xz 3243336 BLAKE2B 845a8283cf1ff9fd9f7926cfe0042c042a9de5ed184520d8057f7b33312687d5ff28abdf30dd2674795d78dc80326203a907f9e22cd261805309403ecdd585f5 SHA512 fc51980cb9222bd3b5242f73d28b55fa15a80e68e52e1c45274f1eda11500ed385853209edb3b2a1f06b9de0be304c159a9bd898c7d84b0899eacb00723d98b5 +DIST libxml2-2.9.14-patches-r0.tar.bz2 8304 BLAKE2B 067faba5bfcbf81e2ef356925c0d3b4ef0aff7604db049366180b8217b781c60c2746be348c5e1a09de925e54fc69e3e431f7e2199ce326b6ff88ea9352ca45c SHA512 e97bada92a14ef0501a5f7be312d35d26eb52b648102d028dc11b3eef62ee0597540d0b474f54bd015a914a9cb7600d4dc34912b0ead5230136e945d80ae8428 DIST libxml2-2.9.14.tar.xz 3129968 BLAKE2B ab584503d5209e4aaf41ae6f44aed5e94c0ae29e28cfba39a9012568aa97515af861b47891b84d2a352a07357626ba50ddb1e344e911fa14ff2ce93c5beff1f1 SHA512 d08e6cafb289c499fdc5b3a12181e032a34f7a249bc66758859f964d3e71e19fd69be79921e1a9d8ab1e692d15b13f5fae95eeb10c3236974d89e218f5107606 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 diff --git a/dev-libs/libxml2/libxml2-2.9.14.ebuild b/dev-libs/libxml2/libxml2-2.9.14-r1.ebuild similarity index 93% rename from dev-libs/libxml2/libxml2-2.9.14.ebuild rename to dev-libs/libxml2/libxml2-2.9.14-r1.ebuild index 875d232e2d43..5a2c61cefdfd 100644 --- a/dev-libs/libxml2/libxml2-2.9.14.ebuild +++ b/dev-libs/libxml2/libxml2-2.9.14-r1.ebuild @@ -7,7 +7,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="xml" -inherit flag-o-matic python-r1 multilib-minimal +inherit autotools flag-o-matic python-r1 multilib-minimal XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"; XSTS_NAME_1="xmlschema2002-01-16" @@ -16,6 +16,8 @@ XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" XMLCONF_TARBALL="xmlts20130923.tar.gz" +PATCHSET_VERSION="2.9.14-patches-r0" + DESCRIPTION="XML C parser and toolkit" HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"; if [[ ${PV} == 9999 ]] ; then @@ -27,6 +29,7 @@ else fi SRC_URI+=" + https://dev.gentoo.org/~soap/distfiles/${PN}-${PATCHSET_VERSION}.tar.bz2 test? ( ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} @@ -58,9 +61,7 @@ MULTILIB_CHOST_TOOLS=( DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO ) -PATCHES=( - "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch -) +PATCHES=( "${WORKDIR}"/patches ) src_unpack() { if [[ ${PV} == 9999 ]] ; then @@ -90,14 +91,7 @@ src_unpack() { src_prepare() { default - - if [[ ${PV} == 9999 ]] ; then - eautoreconf - else - # Please do not remove, as else we get references to PORTAGE_TMPDIR - # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. - elibtoolize - fi + eautoreconf } multilib_src_configure() { diff --git a/profiles/package.mask b/profiles/package.mask index 2b1dfbb530ee..3c865cd49063 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,11 +33,6 @@ #--- END OF EXAMPLES --- -# Sam James <s...@gentoo.org> (2022-03-05) -# Python bindings broken. Will be fixed shortly. -# bug #842297 and friends. -=dev-libs/libxml2-2.9.14 - # Pacho Ramos <pa...@gentoo.org> (2022-05-03) # Waiting for keywording and adapting reverse deps. Bug #816135. >=sys-apps/xdg-desktop-portal-gtk-1.14.0
