rpms/mingw32-libxml2/F-11 mingw32-libxml2-static-build-compile-fix.patch, 1.2, 1.3 mingw32-libxml2.spec, 1.7, 1.8
epienbro
epienbro at fedoraproject.org
Fri Sep 11 17:15:00 UTC 2009
Author: epienbro
Update of /cvs/pkgs/rpms/mingw32-libxml2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21253/F-11
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/F-11/mingw32-libxml2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mingw32-libxml2.spec 11 Sep 2009 16:37:18 -0000 1.7
+++ mingw32-libxml2.spec 11 Sep 2009 17:15:00 -0000 1.8
@@ -20,7 +20,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
@@ -56,6 +57,7 @@ Static version of the MinGW Windows XML
%patch1000 -p1
%patch1001 -p0
+%patch1002 -p0
# Patched configure.in, so rebuild configure.
libtoolize --force --copy
@@ -130,7 +132,6 @@ rm -rf $RPM_BUILD_ROOT
* Fri Sep 11 2009 Erik van Pienbroek <epienbro at 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
More information about the fedora-extras-commits
mailing list