Author: epienbro
Update of /cvs/pkgs/rpms/mingw32-libxml2/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21253/devel
Modified Files: mingw32-libxml2.spec Added Files: mingw32-libxml2-static-build-compile-fix.patch Log Message: Re-added mingw32-libxml2-static-build-compile-fix.patch Looks like it's still needed after all
mingw32-libxml2-static-build-compile-fix.patch: threads.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Index: mingw32-libxml2-static-build-compile-fix.patch =================================================================== RCS file: mingw32-libxml2-static-build-compile-fix.patch diff -N mingw32-libxml2-static-build-compile-fix.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ mingw32-libxml2-static-build-compile-fix.patch 11 Sep 2009 17:15:00 -0000 1.3 @@ -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)
Index: mingw32-libxml2.spec =================================================================== RCS file: /cvs/pkgs/rpms/mingw32-libxml2/devel/mingw32-libxml2.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- mingw32-libxml2.spec 11 Sep 2009 16:37:19 -0000 1.9 +++ mingw32-libxml2.spec 11 Sep 2009 17:15:00 -0000 1.10 @@ -21,7 +21,8 @@ BuildRoot: %{_tmppath}/%{name}-%{ve
# 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
%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