[packages/crossmingw32-libxml2] - updated to 2.14.5 (new soname; patched to still use pthreads due to old mingw)
qboosh
qboosh at pld-linux.org
Sat Jul 19 07:32:17 CEST 2025
commit fc03d1f2d72ea4aba21f072537316eefe8637267
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Jul 19 07:32:47 2025 +0200
- updated to 2.14.5 (new soname; patched to still use pthreads due to old mingw)
crossmingw32-libxml2.spec | 10 ++++----
libxml2-mingw32.patch | 61 +++++++++++++++++++++++++++++++++++++----------
2 files changed, 54 insertions(+), 17 deletions(-)
---
diff --git a/crossmingw32-libxml2.spec b/crossmingw32-libxml2.spec
index ed53abd..1661370 100644
--- a/crossmingw32-libxml2.spec
+++ b/crossmingw32-libxml2.spec
@@ -2,13 +2,13 @@
Summary: libXML library - cross MinGW32 version
Summary(pl.UTF-8): Biblioteka libXML wersja 2 - wersja skrośna dla MinGW32
Name: crossmingw32-%{realname}
-Version: 2.13.8
+Version: 2.14.5
Release: 1
License: MIT
Group: Development/Libraries
#Source0: ftp://xmlsoft.org/libxml2/%{realname}-%{version}.tar.gz
-Source0: https://download.gnome.org/sources/libxml2/2.13/%{realname}-%{version}.tar.xz
-# Source0-md5: 740751403c075e55812ecaaafe9d495f
+Source0: https://download.gnome.org/sources/libxml2/2.14/%{realname}-%{version}.tar.xz
+# Source0-md5: 59aac4e5d1d350ba2c4bddf1f7bc5098
Patch0: %{realname}-open.gz.patch
Patch1: %{realname}-largefile.patch
Patch2: %{realname}-mingw32.patch
@@ -132,7 +132,7 @@ install -d $RPM_BUILD_ROOT%{_dlldir}
%{__rm} $RPM_BUILD_ROOT%{_bindir}/{*.exe,xml2-config}
%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/cmake
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{aclocal,doc,gtk-doc,man}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{doc,gtk-doc,man}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -151,4 +151,4 @@ rm -rf $RPM_BUILD_ROOT
%files dll
%defattr(644,root,root,755)
-%{_dlldir}/libxml2-*.dll
+%{_dlldir}/libxml2-16.dll
diff --git a/libxml2-mingw32.patch b/libxml2-mingw32.patch
index 6f3522c..2d10285 100644
--- a/libxml2-mingw32.patch
+++ b/libxml2-mingw32.patch
@@ -1,14 +1,14 @@
---- libxml2-2.13.6/dict.c.orig 2025-02-18 14:57:38.000000000 +0100
-+++ libxml2-2.13.6/dict.c 2025-02-19 18:48:15.096195473 +0100
-@@ -927,7 +927,6 @@ xmlDictQLookup(xmlDictPtr dict, const xm
+--- libxml2-2.14.5/dict.c.orig 2025-07-15 15:08:05.000000000 +0200
++++ libxml2-2.14.5/dict.c 2025-07-18 22:07:59.800966576 +0200
+@@ -932,7 +932,6 @@ xmlDictQLookup(xmlDictPtr dict, const xm
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
- #include <bcrypt.h>
#else
- #if defined(HAVE_GETENTROPY)
- #ifdef HAVE_UNISTD_H
-@@ -955,7 +954,7 @@ xmlInitRandom(void) {
+ #if HAVE_DECL_GETENTROPY
+ /* POSIX 2024 */
+@@ -958,7 +957,7 @@ xmlInitRandom(void) {
xmlInitMutex(&xmlRngMutex);
{
@@ -16,15 +16,52 @@
+#ifdef TOONEW_WIN32
NTSTATUS status;
- status = BCryptGenRandom(NULL, (unsigned char *) globalRngState,
---- libxml2-2.13.1/configure.ac.orig 2024-06-19 12:13:03.000000000 +0200
-+++ libxml2-2.13.1/configure.ac 2024-06-19 21:49:19.486477127 +0200
-@@ -1083,7 +1083,7 @@ dnl
+ /*
+--- libxml2-2.14.5/configure.ac.orig 2025-07-15 15:08:05.000000000 +0200
++++ libxml2-2.14.5/configure.ac 2025-07-18 22:08:34.440778916 +0200
+@@ -1012,7 +1012,7 @@ dnl
dnl Crypto libraries
dnl
case "$host" in
- *-*-mingw*)
+ *-*-mingw*64*)
CRYPTO_LIBS="-lbcrypt"
- ;;
- esac
+ XML_PRIVATE_LIBS="${XML_PRIVATE_LIBS} ${CRYPTO_LIBS}"
+ XML_PC_LIBS="${XML_PC_LIBS} ${CRYPTO_LIBS}"
+--- libxml2-2.14.5/globals.c.orig 2025-07-15 15:08:05.000000000 +0200
++++ libxml2-2.14.5/globals.c 2025-07-18 22:16:50.544757957 +0200
+@@ -881,10 +881,12 @@ DllMain(ATTRIBUTE_UNUSED HINSTANCE hinst
+ case DLL_PROCESS_DETACH:
+ if (xmlFree == free)
+ xmlCleanupParser();
++#ifndef USE_TLS
+ if (globalkey != TLS_OUT_OF_INDEXES) {
+ TlsFree(globalkey);
+ globalkey = TLS_OUT_OF_INDEXES;
+ }
++#endif
+ break;
+ #endif
+ }
+--- libxml2-2.14.5/configure.ac.orig 2025-07-18 22:17:03.078023392 +0200
++++ libxml2-2.14.5/configure.ac 2025-07-18 22:37:00.341537258 +0200
+@@ -676,7 +676,7 @@ if test "$with_threads" = "no" ; then
+ echo Disabling multithreaded support
+ else
+ case $host_os in
+- *mingw*)
++ *mingw*64*)
+ dnl Default to native threads on Windows
+ WITH_THREADS="1"
+ ;;
+--- libxml2-2.14.5/include/private/threads.h.orig 2025-07-15 15:08:05.000000000 +0200
++++ libxml2-2.14.5/include/private/threads.h 2025-07-18 22:37:11.224811632 +0200
+@@ -4,7 +4,7 @@
+ #include <libxml/threads.h>
+
+ #ifdef LIBXML_THREAD_ENABLED
+- #ifdef _WIN32
++ #ifdef TOONEW_WIN32
+ #define WIN32_LEAN_AND_MEAN
+ #ifdef _WIN32_WINNT
+ #undef _WIN32_WINNT
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-libxml2.git/commitdiff/fc03d1f2d72ea4aba21f072537316eefe8637267
More information about the pld-cvs-commit
mailing list