Re-added mingw32-libxml2-static-build-compile-fix.patch Looks like it's

still needed after all
epel9
epienbro 16 years ago
parent 256ef9f386
commit b2ef773d9a

@ -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)

@ -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 <epienbro@fedoraproject.org> - 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

Loading…
Cancel
Save