Update mingw-w64-cppunit to 1.14.0
This commit is contained in:
parent
95800bf137
commit
b873f93ca8
|
@ -0,0 +1,49 @@
|
|||
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
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
_name=cppunit
|
||||
pkgname=mingw-w64-cppunit
|
||||
pkgver=1.13.2
|
||||
pkgver=1.14.0
|
||||
pkgrel=1
|
||||
pkgdesc="A C++ unit testing framework (mingw-w64)"
|
||||
arch=('any')
|
||||
|
@ -16,11 +16,21 @@ license=('LGPL')
|
|||
depends=('mingw-w64-crt')
|
||||
makedepends=('mingw-w64-gcc' 'mingw-w64-configure')
|
||||
options=(!strip !buildflags !libtool staticlibs !emptydirs)
|
||||
source=("http://dev-www.libreoffice.org/src/${_name}-${pkgver}.tar.gz")
|
||||
md5sums=('d1c6bdd5a76c66d2c38331e2d287bc01')
|
||||
source=("https://dev-www.libreoffice.org/src/${_name}-${pkgver}.tar.gz"
|
||||
0001-Don-t-redefine-NOMINMAX.patch)
|
||||
sha256sums=('3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780'
|
||||
'68ae7a200a6bea8669268665c9a2b80c96a90fbf07273749184ce7a7f190cd40')
|
||||
|
||||
_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}"
|
||||
|
@ -36,7 +46,8 @@ package() {
|
|||
cd "${srcdir}/${_name}-${pkgver}/build-${_arch}"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
rm -rf "${pkgdir}/usr/${_arch}/share/"
|
||||
${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*.a
|
||||
${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
|
||||
find "${pkgdir}/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip --strip-all {} \;
|
||||
find "${pkgdir}/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
|
||||
find "${pkgdir}/usr/${_arch}" -name '*.a' -exec ${_arch}-strip -g {} \;
|
||||
done
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue