Update to 1.15.0

3 files changed, 8 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 444f4a21b542..cd7149781f21 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = mingw-w64-cppunit
 	pkgdesc = A C++ unit testing framework (mingw-w64)
-	pkgver = 1.14.0
+	pkgver = 1.15.0
 	pkgrel = 1
-	url = http://www.freedesktop.org/wiki/Software/cppunit
+	url = https://www.freedesktop.org/wiki/Software/cppunit
 	arch = any
 	license = LGPL
 	makedepends = mingw-w64-gcc
@@ -13,10 +13,8 @@ pkgbase = mingw-w64-cppunit
 	options = !libtool
 	options = staticlibs
 	options = !emptydirs
-	source = https://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz
-	source = 0001-Don-t-redefine-NOMINMAX.patch
-	sha256sums = 3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780
-	sha256sums = 68ae7a200a6bea8669268665c9a2b80c96a90fbf07273749184ce7a7f190cd40
+	source = https://dev-www.libreoffice.org/src/cppunit-1.15.0.tar.gz
+	sha256sums = 1c61dfdb430e04ebb411e4b80fbd49fe7e63a1be0209a76d7c07501f02834922
 
 pkgname = mingw-w64-cppunit
 
diff --git a/0001-Don-t-redefine-NOMINMAX.patch b/0001-Don-t-redefine-NOMINMAX.patch
deleted file mode 100644
index c0c55ba2f74b..000000000000
--- a/0001-Don-t-redefine-NOMINMAX.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 8ff5b7fbc0a2e1e97c3812602d449b0e547962c0 Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Mon, 11 Jun 2018 20:14:42 +0200
-Subject: [PATCH] Don't redefine NOMINMAX
-
-In file included from ../../../src/cppunit/PlugInManager.cpp:8:
-../../../include/cppunit/plugin/TestPlugIn.h:149: error: "NOMINMAX" redefined [-Werror]
- #define NOMINMAX
-
-In file included from /usr/i686-w64-mingw32/include/c++/8.1.0/i686-w64-mingw32/bits/c++config.h:508,
-                 from /usr/i686-w64-mingw32/include/c++/8.1.0/bits/stl_algobase.h:59,
-                 from /usr/i686-w64-mingw32/include/c++/8.1.0/bits/stl_tree.h:63,
-                 from /usr/i686-w64-mingw32/include/c++/8.1.0/set:60,
-                 from ../../../include/cppunit/extensions/TestFactoryRegistry.h:11,
-                 from ../../../src/cppunit/PlugInManager.cpp:6:
-/usr/i686-w64-mingw32/include/c++/8.1.0/i686-w64-mingw32/bits/os_defines.h:45: note: this is the location of the previous definition
- #define NOMINMAX 1
----
- include/cppunit/plugin/TestPlugIn.h        | 1 -
- src/cppunit/Win32DynamicLibraryManager.cpp | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/include/cppunit/plugin/TestPlugIn.h b/include/cppunit/plugin/TestPlugIn.h
-index 52b5b35..ab00c5c 100644
---- a/include/cppunit/plugin/TestPlugIn.h
-+++ b/include/cppunit/plugin/TestPlugIn.h
-@@ -146,7 +146,6 @@ typedef CppUnitTestPlugIn *(*TestPlugInSignature)();
- #define NOUSER
- #define NOKERNEL
- #define NOSOUND
--#define NOMINMAX
- #define BLENDFUNCTION void    // for mingw & gcc
- #include <windows.h>
- #endif
-diff --git a/src/cppunit/Win32DynamicLibraryManager.cpp b/src/cppunit/Win32DynamicLibraryManager.cpp
-index acadf46..f8009c0 100644
---- a/src/cppunit/Win32DynamicLibraryManager.cpp
-+++ b/src/cppunit/Win32DynamicLibraryManager.cpp
-@@ -8,7 +8,6 @@
- #define NOUSER
- #define NOKERNEL
- #define NOSOUND
--#define NOMINMAX
- #define BLENDFUNCTION void    // for mingw & gcc  
- #include <windows.h>
- 
--- 
-2.17.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 146042e75e20..5bcf3dbce7b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,30 +7,20 @@
 
 _name=cppunit
 pkgname=mingw-w64-cppunit
-pkgver=1.14.0
+pkgver=1.15.0
 pkgrel=1
 pkgdesc="A C++ unit testing framework (mingw-w64)"
 arch=('any')
-url="http://www.freedesktop.org/wiki/Software/cppunit"
+url="https://www.freedesktop.org/wiki/Software/cppunit"
 license=('LGPL')
 depends=('mingw-w64-crt')
 makedepends=('mingw-w64-gcc' 'mingw-w64-configure')
 options=(!strip !buildflags !libtool staticlibs !emptydirs)
-source=("https://dev-www.libreoffice.org/src/${_name}-${pkgver}.tar.gz"
-        0001-Don-t-redefine-NOMINMAX.patch)
-sha256sums=('3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780'
-            '68ae7a200a6bea8669268665c9a2b80c96a90fbf07273749184ce7a7f190cd40')
+source=("https://dev-www.libreoffice.org/src/${_name}-${pkgver}.tar.gz")
+sha256sums=('1c61dfdb430e04ebb411e4b80fbd49fe7e63a1be0209a76d7c07501f02834922')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
-prepare() {
-  cd "${srcdir}/${_name}-${pkgver}"
-  for patch in "$srcdir/"*.patch; do
-    msg2 "Applying patch $patch"
-    patch -p1 -i "$patch"
-  done
-}
-
 build() {
   for _arch in ${_architectures}; do
     mkdir -p "${srcdir}/${_name}-${pkgver}/build-${_arch}"