libxml2: Update to 2.14.5

Since clang depends on libxml2 indirectly we keep an old 2.13 DLL
around, so we can rebuild everything.

Can be droppped again once that's done.

for libxml2: enable all legacy features like html/lzma to reduce
the fallout. We can look into that once the rebuild is done.

0030-pkgconfig-add-Cflags-private.patch: fixed upstream
This commit is contained in:
Christoph Reiter 2025-07-19 08:19:24 +02:00
parent 307796e6b9
commit 202ef72aaa
2 changed files with 43 additions and 21 deletions

View File

@ -1,7 +0,0 @@
--- a/libxml-2.0.pc.in
+++ b/libxml-2.0.pc.in
@@ -11,3 +11,4 @@
Libs: -L${libdir} -lxml2
Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@
+Cflags.private: -DLIBXML_STATIC

View File

@ -5,8 +5,8 @@ _realname=libxml2
pkgbase=mingw-w64-${_realname} pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-docs") "${MINGW_PACKAGE_PREFIX}-${_realname}-docs")
pkgver=2.13.8 pkgver=2.14.5
pkgrel=3 pkgrel=1
arch=('any') arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
pkgdesc="XML parsing library, version 2 (mingw-w64)" pkgdesc="XML parsing library, version 2 (mingw-w64)"
@ -25,21 +25,21 @@ msys2_references=(
) )
install=${_realname}-${MSYSTEM}.install install=${_realname}-${MSYSTEM}.install
source=("https://download.gnome.org/sources/libxml2/${pkgver%.*}/${_realname}-${pkgver}.tar.xz" source=("https://download.gnome.org/sources/libxml2/${pkgver%.*}/${_realname}-${pkgver}.tar.xz"
"https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.8.tar.xz"
https://www.w3.org/XML/Test/xmlts20130923.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz
0027-decoding-segfault.patch 0027-decoding-segfault.patch
0029-xml2-config-win-paths.patch 0029-xml2-config-win-paths.patch
0030-pkgconfig-add-Cflags-private.patch
0031-apply-msvc-relocation.patch 0031-apply-msvc-relocation.patch
https://gitlab.gnome.org/GNOME/libxml2/-/commit/2491c632a44d8bbfa58ce84bc0c18a40cd1121be.patch https://gitlab.gnome.org/GNOME/libxml2/-/commit/160bff50635620ce765f9578e69c48aa3f0448f5.patch
https://gitlab.gnome.org/GNOME/libxml2/-/commit/043e0421c017dbb6db695e3ba6024633e1a45cbb.patch) https://gitlab.gnome.org/GNOME/libxml2/-/commit/8ec61c10fa11c1c1a86afb1b530dce6315f4e72b.patch)
sha256sums=('277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a' sha256sums=('03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b'
'277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a'
'9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f' '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f'
'0391a4b267ba7251ca74ff2e98bf4c0332a14b618e8147a9341ec5617e45d9d9' '0391a4b267ba7251ca74ff2e98bf4c0332a14b618e8147a9341ec5617e45d9d9'
'278b4531da3d2aabda080c412c5122b471202dd6df67768b38bb0c31c7a0e508' '278b4531da3d2aabda080c412c5122b471202dd6df67768b38bb0c31c7a0e508'
'06c0afaf1b8dec10d6f23dec983026cddf992528ffbc1cc50418302fabf9dee0'
'bd28c2b20290f787d28cc9986253b5e0157e729a7cd2fd4cfaa07cde736d1ef2' 'bd28c2b20290f787d28cc9986253b5e0157e729a7cd2fd4cfaa07cde736d1ef2'
'fcd43ddab9cf62973e35cac9724034a90d0b553a8fdd70ef2165b18b0f786d74' '7eb566ec77ff8f2c4b587b3dd635a953b9e553c9ef9ddaa89bfe161cbbb785ee'
'7916c4981f77e4d035f344f3fe2eb53d31916e8235ba6eee73f776dd4e2f665e') '9250282925893decc6fde2dceab2a3cde4626d7a4c5d79dede93e9e8af382c7d')
# Helper macros to help make tasks easier # # Helper macros to help make tasks easier #
apply_patch_with_msg() { apply_patch_with_msg() {
@ -52,10 +52,16 @@ apply_patch_with_msg() {
# =========================================== # # =========================================== #
prepare() { prepare() {
cd ${_realname}-${pkgver} cd "${_realname}-2.13.8"
apply_patch_with_msg \
0031-apply-msvc-relocation.patch
NOCONFIGURE=1 ./autogen.sh
cd "${srcdir}/${_realname}-${pkgver}"
apply_patch_with_msg \ apply_patch_with_msg \
0030-pkgconfig-add-Cflags-private.patch \
0031-apply-msvc-relocation.patch 0031-apply-msvc-relocation.patch
# https://gitlab.gnome.org/GNOME/libxml2/-/issues/64 # https://gitlab.gnome.org/GNOME/libxml2/-/issues/64
@ -71,16 +77,32 @@ prepare() {
# https://gitlab.gnome.org/GNOME/libxml2/-/issues/951 # https://gitlab.gnome.org/GNOME/libxml2/-/issues/951
# https://github.com/msys2/MINGW-packages/issues/24888 # https://github.com/msys2/MINGW-packages/issues/24888
apply_patch_with_msg \ apply_patch_with_msg \
043e0421c017dbb6db695e3ba6024633e1a45cbb.patch 160bff50635620ce765f9578e69c48aa3f0448f5.patch
# more backports, because why not # https://gitlab.gnome.org/GNOME/libxml2/-/issues/961
apply_patch_with_msg \ apply_patch_with_msg \
2491c632a44d8bbfa58ce84bc0c18a40cd1121be.patch 8ec61c10fa11c1c1a86afb1b530dce6315f4e72b.patch
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
} }
build() { build() {
# 2.13 build
msg2 "Building 2.13 for ${MSYSTEM}"
mkdir -p "${srcdir}"/build-2.13-${MSYSTEM} && cd "${srcdir}"/build-2.13-${MSYSTEM}
../${_realname}-2.13.8/configure \
--prefix=${MINGW_PREFIX} \
--host=${MINGW_CHOST} \
--target=${MINGW_CHOST} \
--build="${MINGW_CHOST}" \
--without-python \
--with-modules \
--with-legacy \
--disable-static \
--enable-shared \
--with-threads=win32
make
# Static build # Static build
msg2 "Building static for ${MSYSTEM}" msg2 "Building static for ${MSYSTEM}"
mkdir -p "${srcdir}"/build-static-${MSYSTEM} && cd "${srcdir}"/build-static-${MSYSTEM} mkdir -p "${srcdir}"/build-static-${MSYSTEM} && cd "${srcdir}"/build-static-${MSYSTEM}
@ -92,6 +114,8 @@ build() {
--without-python \ --without-python \
--with-modules \ --with-modules \
--with-legacy \ --with-legacy \
--with-http \
--with-lzma \
--enable-static \ --enable-static \
--disable-shared \ --disable-shared \
--with-threads=win32 \ --with-threads=win32 \
@ -109,6 +133,8 @@ build() {
--with-python=${MINGW_PREFIX}/bin/python \ --with-python=${MINGW_PREFIX}/bin/python \
--with-modules \ --with-modules \
--with-legacy \ --with-legacy \
--with-http \
--with-lzma \
--disable-static \ --disable-static \
--enable-shared \ --enable-shared \
--with-threads=win32 --with-threads=win32
@ -126,6 +152,9 @@ check() {
} }
package_libxml2() { package_libxml2() {
# Install 2.13
make -C "${srcdir}"/build-2.13-${MSYSTEM} install-libLTLIBRARIES DESTDIR="${pkgdir}"
# First install shared # First install shared
make -C "${srcdir}"/build-shared-${MSYSTEM} install DESTDIR="${pkgdir}" make -C "${srcdir}"/build-shared-${MSYSTEM} install DESTDIR="${pkgdir}"