Update version.

2 files changed, 28 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 90fdf6e5b36e..f72e0a84b4f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-pugixml
 	pkgdesc = Light-weight, simple and fast XML parser for C++ with XPath support (mingw-w64)
-	pkgver = 1.11
+	pkgver = 1.12.1
 	pkgrel = 1
 	url = http://pugixml.org/
 	arch = any
@@ -10,8 +10,7 @@ pkgbase = mingw-w64-pugixml
 	options = !buildflags
 	options = staticlibs
 	options = !strip
-	source = http://github.com/zeux/pugixml/releases/download/v1.11/pugixml-1.11.tar.gz
-	sha256sums = 26913d3e63b9c07431401cf826df17ed832a20d19333d043991e611d23beaa2c
+	source = http://github.com/zeux/pugixml/releases/download/v1.12.1/pugixml-1.12.1.tar.gz
+	sha256sums = dcf671a919cc4051210f08ffd3edf9e4247f79ad583c61577a13ee93af33afc7
 
 pkgname = mingw-w64-pugixml
-
diff --git a/PKGBUILD b/PKGBUILD
index 0acade06a1b2..0619fed9ed99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,43 @@
-pkgname=mingw-w64-pugixml
-pkgver=1.11
-_majordotminor=${pkgver}
+# Maintainer: Patrick Northon <northon_patrick3@yahoo.ca>
+
+_pkgname=pugixml
+pkgname=mingw-w64-${_pkgname}
+_majordotminor=1.12
+pkgver=${_majordotminor}.1
 pkgrel=1
-pkgdesc="Light-weight, simple and fast XML parser for C++ with XPath support (mingw-w64)"
+pkgdesc='Light-weight, simple and fast XML parser for C++ with XPath support (mingw-w64)'
 arch=('any')
-url="http://pugixml.org/"
+url='http://pugixml.org/'
 license=('MIT')
 depends=('mingw-w64-crt')
 makedepends=('mingw-w64-cmake')
 options=('!buildflags' 'staticlibs' '!strip')
-source=("http://github.com/zeux/pugixml/releases/download/v${pkgver}/pugixml-${pkgver}.tar.gz")
-sha256sums=('26913d3e63b9c07431401cf826df17ed832a20d19333d043991e611d23beaa2c')
+source=("http://github.com/zeux/${_pkgname}/releases/download/v${pkgver}/${_pkgname}-${pkgver}.tar.gz")
+sha256sums=('dcf671a919cc4051210f08ffd3edf9e4247f79ad583c61577a13ee93af33afc7')
 
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+_srcdir="${_pkgname}-${_majordotminor}"
+_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
+_flags=( -Wno-dev -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS_RELEASE='-O2 -DNDEBUG' )
 
 build() {
-  cd "${srcdir}/pugixml-${_majordotminor}"
   for _arch in ${_architectures}; do
-
-    mkdir -p build-${_arch}-static && pushd build-${_arch}-static
-    ${_arch}-cmake \
-      -DLIB_INSTALL_DIR=lib \
-      -DBUILD_SHARED_LIBS=OFF \
-      ..
-    make
-    popd
-
-    mkdir -p build-${_arch} && pushd build-${_arch}
-    ${_arch}-cmake \
-      -DLIB_INSTALL_DIR=lib \
-      ..
-    make
-    popd
+		${_arch}-cmake -S "${_srcdir}" -B "build-${_arch}" "${_flags[@]}" \
+      -DPUGIXML_BUILD_TESTS=OFF -DPUGIXML_BUILD_SHARED_AND_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=ON
+		cmake --build "build-${_arch}"
   done
 }
 
+#check() {
+#	for _arch in ${_architectures}; do
+#		${_arch}-cmake -S "${_srcdir}" -B "build-${_arch}" "${_flags[@]}" -DPUGIXML_BUILD_TESTS=ON
+#		cmake --build "build-${_arch}"
+#		cmake --build "build-${_arch}" --target test
+#	done
+#}
+
 package() {
   for _arch in ${_architectures}; do
-    cd "${srcdir}/pugixml-${_majordotminor}/build-${_arch}-static"
-    make install DESTDIR="$pkgdir"
-    
-    cd "${srcdir}/pugixml-${_majordotminor}/build-${_arch}"
-    make install DESTDIR="$pkgdir"
+    DESTDIR="${pkgdir}" cmake --install "build-${_arch}"
 
     ${_arch}-strip --strip-unneeded "${pkgdir}"/usr/${_arch}/bin/*.dll
     ${_arch}-strip -g "${pkgdir}"/usr/${_arch}/lib/*.a