diff --git a/mingw-w64-libxml2/0032-cmake-relocation.patch b/mingw-w64-libxml2/0032-cmake-relocation.patch new file mode 100644 index 0000000000..e32b9f1a67 --- /dev/null +++ b/mingw-w64-libxml2/0032-cmake-relocation.patch @@ -0,0 +1,27 @@ +--- libxml2-2.14.5/libxml2-config.cmake.in.orig 2025-07-15 15:08:05.000000000 +0200 ++++ libxml2-2.14.5/libxml2-config.cmake.in 2025-08-03 13:10:52.000699100 +0200 +@@ -24,17 +24,20 @@ + # LibXml2::LibXml2 - the LibXml2 library + # LibXml2::xmllint - the xmllint command-line executable + ++get_filename_component(_LIBXML2_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) ++get_filename_component(_LIBXML2_PREFIX "${_LIBXML2_PREFIX}/../../../" REALPATH) ++ + set(LIBXML2_VERSION_MAJOR @LIBXML_MAJOR_VERSION@) + set(LIBXML2_VERSION_MINOR @LIBXML_MINOR_VERSION@) + set(LIBXML2_VERSION_MICRO @LIBXML_MICRO_VERSION@) + set(LIBXML2_VERSION_STRING "@VERSION@") + set(LIBXML2_DEFINITIONS "@XML_CFLAGS@") +-set(LIBXML2_INCLUDE_DIR @INSTALL_INCLUDEDIR@/libxml2) +-set(LIBXML2_LIBRARY_DIR @INSTALL_LIBDIR@) ++set(LIBXML2_INCLUDE_DIR "${_LIBXML2_PREFIX}/include/libxml2") ++set(LIBXML2_LIBRARY_DIR "${_LIBXML2_PREFIX}/lib") + + find_library(LIBXML2_LIBRARY NAMES xml2 HINTS ${LIBXML2_LIBRARY_DIR} NO_DEFAULT_PATH) +-find_program(LIBXML2_XMLCATALOG_EXECUTABLE NAMES xmlcatalog HINTS @INSTALL_BINDIR@ NO_DEFAULT_PATH) +-find_program(LIBXML2_XMLLINT_EXECUTABLE NAMES xmllint HINTS @INSTALL_BINDIR@ NO_DEFAULT_PATH) ++find_program(LIBXML2_XMLCATALOG_EXECUTABLE NAMES xmlcatalog HINTS "${_LIBXML2_PREFIX}/bin" NO_DEFAULT_PATH) ++find_program(LIBXML2_XMLLINT_EXECUTABLE NAMES xmllint HINTS "${_LIBXML2_PREFIX}/bin" NO_DEFAULT_PATH) + + set(LIBXML2_LIBRARIES ${LIBXML2_LIBRARY}) + set(LIBXML2_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR}) diff --git a/mingw-w64-libxml2/PKGBUILD b/mingw-w64-libxml2/PKGBUILD index a6ecc6fe3c..48f9a2abbf 100644 --- a/mingw-w64-libxml2/PKGBUILD +++ b/mingw-w64-libxml2/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-docs") pkgver=2.14.5 -pkgrel=1 +pkgrel=2 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') pkgdesc="XML parsing library, version 2 (mingw-w64)" @@ -30,6 +30,7 @@ source=("https://download.gnome.org/sources/libxml2/${pkgver%.*}/${_realname}-${ 0027-decoding-segfault.patch 0029-xml2-config-win-paths.patch 0031-apply-msvc-relocation.patch + 0032-cmake-relocation.patch https://gitlab.gnome.org/GNOME/libxml2/-/commit/160bff50635620ce765f9578e69c48aa3f0448f5.patch https://gitlab.gnome.org/GNOME/libxml2/-/commit/8ec61c10fa11c1c1a86afb1b530dce6315f4e72b.patch) sha256sums=('03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b' @@ -38,6 +39,7 @@ sha256sums=('03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b' '0391a4b267ba7251ca74ff2e98bf4c0332a14b618e8147a9341ec5617e45d9d9' '278b4531da3d2aabda080c412c5122b471202dd6df67768b38bb0c31c7a0e508' 'bd28c2b20290f787d28cc9986253b5e0157e729a7cd2fd4cfaa07cde736d1ef2' + 'd2bd68da35aa68197f1b0ebed2c01685a7f4c780430840784a861a540d05b130' '7eb566ec77ff8f2c4b587b3dd635a953b9e553c9ef9ddaa89bfe161cbbb785ee' '9250282925893decc6fde2dceab2a3cde4626d7a4c5d79dede93e9e8af382c7d') @@ -62,7 +64,8 @@ prepare() { cd "${srcdir}/${_realname}-${pkgver}" apply_patch_with_msg \ - 0031-apply-msvc-relocation.patch + 0031-apply-msvc-relocation.patch \ + 0032-cmake-relocation.patch # https://gitlab.gnome.org/GNOME/libxml2/-/issues/64 # https://gitlab.gnome.org/GNOME/libxml2/-/merge_requests/15