From b2ef773d9a92f507605e3fa6bb52c91a0119d16c Mon Sep 17 00:00:00 2001 From: epienbro Date: Fri, 11 Sep 2009 17:15:00 +0000 Subject: [PATCH] Re-added mingw32-libxml2-static-build-compile-fix.patch Looks like it's still needed after all --- mingw32-libxml2-static-build-compile-fix.patch | 11 +++++++++++ mingw32-libxml2.spec | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 mingw32-libxml2-static-build-compile-fix.patch diff --git a/mingw32-libxml2-static-build-compile-fix.patch b/mingw32-libxml2-static-build-compile-fix.patch new file mode 100644 index 0000000..d153092 --- /dev/null +++ b/mingw32-libxml2-static-build-compile-fix.patch @@ -0,0 +1,11 @@ +--- threads.c.orig 2009-09-10 17:03:39.000000000 +0200 ++++ threads.c 2009-09-11 19:00:59.660192916 +0200 +@@ -993,7 +993,7 @@ + #elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL)) + #if defined(LIBXML_STATIC_FOR_DLL) + BOOL XMLCALL +-xmlDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) ++xmlDllMain(void *hinstDLL, unsigned long fdwReason, void *lpvReserved) + #else + BOOL WINAPI + DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) diff --git a/mingw32-libxml2.spec b/mingw32-libxml2.spec index c553298..e3b900e 100644 --- a/mingw32-libxml2.spec +++ b/mingw32-libxml2.spec @@ -21,7 +21,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # MinGW-specific patches. Patch1000: mingw32-libxml2-2.7.2-with-modules.patch -Patch1001: mingw32-libxml2-win32-pthreads-compatibility.patch +Patch1001: mingw32-libxml2-static-build-compile-fix.patch +Patch1002: mingw32-libxml2-win32-pthreads-compatibility.patch BuildArch: noarch @@ -60,6 +61,7 @@ Static version of the MinGW Windows XML processing library. %patch1000 -p1 %patch1001 -p0 +%patch1002 -p0 # Patched configure.in, so rebuild configure. libtoolize --force --copy @@ -134,7 +136,6 @@ rm -rf $RPM_BUILD_ROOT * Fri Sep 11 2009 Erik van Pienbroek - 2.7.4-1 - Update to 2.7.4 - Drop upstreamed libxml2-2.7.3-ficora-parse.patch patch -- Drop upstreamed mingw32-libxml2-static-build-compile-fix.patch patch - Added a new patch to fix compatibility with the w32 port of pthreads - Use %%global instead of %%define - Automatically generate debuginfo subpackage