2.9.7

3 files changed, 7 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 84789d353738..37b3cbbb66d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Nov 10 22:02:56 UTC 2017
+# Mon Jan  8 17:26:33 UTC 2018
 pkgbase = mingw-w64-libxml2
 	pkgdesc = XML parsing library, version 2 (mingw-w64)
-	pkgver = 2.9.6
+	pkgver = 2.9.7
 	pkgrel = 1
 	url = http://www.xmlsoft.org/
 	arch = any
@@ -15,10 +15,8 @@ pkgbase = mingw-w64-libxml2
 	options = !buildflags
 	options = !strip
 	options = staticlibs
-	source = http://xmlsoft.org/sources/libxml2-2.9.6.tar.gz
-	source = mingw32-libxml2-static-build-compile-fix.patch
-	sha256sums = 8b9038cca7240e881d462ea391882092dfdc6d4f483f72683e817be08df5ebbc
-	sha256sums = 0f86ded5d487ae7f38e1f039085c078d978af8d7aad6e05d5a4028d645d2115a
+	source = http://xmlsoft.org/sources/libxml2-2.9.7.tar.gz
+	sha256sums = f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c
 
 pkgname = mingw-w64-libxml2
 
diff --git a/PKGBUILD b/PKGBUILD
index d8abfeed8dae..9af9201daf27 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Filip Brcic <brcha@gna.org>
 
 pkgname=mingw-w64-libxml2
-pkgver=2.9.6
+pkgver=2.9.7
 pkgrel=1
 arch=('any')
 pkgdesc="XML parsing library, version 2 (mingw-w64)"
@@ -10,19 +10,14 @@ makedepends=('mingw-w64-configure')
 options=('!buildflags' '!strip' 'staticlibs')
 license=('LGPL')
 url="http://www.xmlsoft.org/"
-source=("http://xmlsoft.org/sources/libxml2-${pkgver}.tar.gz"
-        "mingw32-libxml2-static-build-compile-fix.patch")
-sha256sums=('8b9038cca7240e881d462ea391882092dfdc6d4f483f72683e817be08df5ebbc'
-            '0f86ded5d487ae7f38e1f039085c078d978af8d7aad6e05d5a4028d645d2115a')
+source=("http://xmlsoft.org/sources/libxml2-${pkgver}.tar.gz")
+sha256sums=('f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare () {
   cd "${srcdir}/libxml2-${pkgver}"
 
-  # fedora patch, purpose ?
-  patch -Np0 -i "${srcdir}"/mingw32-libxml2-static-build-compile-fix.patch
-
   # disable doc & examples
   sed -i "s| doc example | |g" Makefile.am
   autoreconf -vfi
diff --git a/mingw32-libxml2-static-build-compile-fix.patch b/mingw32-libxml2-static-build-compile-fix.patch
deleted file mode 100644
index d153092ed06f..000000000000
--- a/mingw32-libxml2-static-build-compile-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)