From cc6f212f787360ca08f425e2e612901540ca9f3b Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 24 Dec 2019 13:55:15 +0100 Subject: [PATCH] Update cppunit packages to 1.15.0 --- cppunit/android-aarch64/PKGBUILD | 9 +++++---- cppunit/android-armv7a-eabi/PKGBUILD | 9 +++++---- cppunit/android-x86-64/PKGBUILD | 9 +++++---- cppunit/mingw-w64/PKGBUILD | 18 ++++-------------- 4 files changed, 19 insertions(+), 26 deletions(-) diff --git a/cppunit/android-aarch64/PKGBUILD b/cppunit/android-aarch64/PKGBUILD index aa12ae89..666d99db 100644 --- a/cppunit/android-aarch64/PKGBUILD +++ b/cppunit/android-aarch64/PKGBUILD @@ -21,18 +21,18 @@ _android_clang_toolchain_path=$_android_ndk_path/toolchains/llvm/prebuilt/linux- _install_prefix=/opt/android-libs/$_pkg_arch pkgname=android-$_pkg_arch-$_pkgname -pkgver=1.14.0 +pkgver=1.15.0 pkgrel=1 pkgdesc="A C++ unit testing framework (Android, $_android_arch)" arch=('any') -url="http://www.freedesktop.org/wiki/Software/cppunit" +url="https://www.freedesktop.org/wiki/Software/cppunit" license=('LGPL') depends=('android-ndk') conflicts=("android-$_pkgname-$_android_arch") replaces=("android-$_pkgname-$_android_arch") options=(!strip !buildflags !libtool staticlibs !emptydirs) source=("https://dev-www.libreoffice.org/src/${_pkgname}-${pkgver}.tar.gz") -sha256sums=('3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780') +sha256sums=('1c61dfdb430e04ebb411e4b80fbd49fe7e63a1be0209a76d7c07501f02834922') build() { # configure flags @@ -53,7 +53,8 @@ build() { -O3 \ -fPIC \ -DCPPUNIT_HAVE_LIBDL=1 \ - -Wno-unused-command-line-argument" + -Wno-unused-command-line-argument \ + -Wno-defaulted-function-deleted" local ld_flags=" \ $_android_ndk_path/sources/cxx-stl/llvm-libc++/libs/$_android_arch/libc++_shared.so \ -nostdlib++" diff --git a/cppunit/android-armv7a-eabi/PKGBUILD b/cppunit/android-armv7a-eabi/PKGBUILD index 1c09a7eb..b30c0010 100644 --- a/cppunit/android-armv7a-eabi/PKGBUILD +++ b/cppunit/android-armv7a-eabi/PKGBUILD @@ -21,18 +21,18 @@ _android_clang_toolchain_path=$_android_ndk_path/toolchains/llvm/prebuilt/linux- _install_prefix=/opt/android-libs/$_pkg_arch pkgname=android-$_pkg_arch-$_pkgname -pkgver=1.14.0 +pkgver=1.15.0 pkgrel=1 pkgdesc="A C++ unit testing framework (Android, $_android_arch)" arch=('any') -url="http://www.freedesktop.org/wiki/Software/cppunit" +url="https://www.freedesktop.org/wiki/Software/cppunit" license=('LGPL') depends=('android-ndk') conflicts=("android-$_pkgname-$_android_arch") replaces=("android-$_pkgname-$_android_arch") options=(!strip !buildflags !libtool staticlibs !emptydirs) source=("https://dev-www.libreoffice.org/src/${_pkgname}-${pkgver}.tar.gz") -sha256sums=('3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780') +sha256sums=('1c61dfdb430e04ebb411e4b80fbd49fe7e63a1be0209a76d7c07501f02834922') build() { # configure flags @@ -53,7 +53,8 @@ build() { -O3 \ -fPIC \ -DCPPUNIT_HAVE_LIBDL=1 \ - -Wno-unused-command-line-argument" + -Wno-unused-command-line-argument \ + -Wno-defaulted-function-deleted" local ld_flags=" \ $_android_ndk_path/sources/cxx-stl/llvm-libc++/libs/$_android_arch/libc++_shared.so \ -nostdlib++" diff --git a/cppunit/android-x86-64/PKGBUILD b/cppunit/android-x86-64/PKGBUILD index fb630bef..e72965bd 100644 --- a/cppunit/android-x86-64/PKGBUILD +++ b/cppunit/android-x86-64/PKGBUILD @@ -21,18 +21,18 @@ _android_clang_toolchain_path=$_android_ndk_path/toolchains/llvm/prebuilt/linux- _install_prefix=/opt/android-libs/$_pkg_arch pkgname=android-$_pkg_arch-$_pkgname -pkgver=1.14.0 +pkgver=1.15.0 pkgrel=1 pkgdesc="A C++ unit testing framework (Android, $_android_arch)" arch=('any') -url="http://www.freedesktop.org/wiki/Software/cppunit" +url="https://www.freedesktop.org/wiki/Software/cppunit" license=('LGPL') depends=('android-ndk') conflicts=("android-$_pkgname-$_android_arch") replaces=("android-$_pkgname-$_android_arch") options=(!strip !buildflags !libtool staticlibs !emptydirs) source=("https://dev-www.libreoffice.org/src/${_pkgname}-${pkgver}.tar.gz") -sha256sums=('3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780') +sha256sums=('1c61dfdb430e04ebb411e4b80fbd49fe7e63a1be0209a76d7c07501f02834922') build() { # configure flags @@ -53,7 +53,8 @@ build() { -O3 \ -fPIC \ -DCPPUNIT_HAVE_LIBDL=1 \ - -Wno-unused-command-line-argument" + -Wno-unused-command-line-argument \ + -Wno-defaulted-function-deleted" local ld_flags=" \ $_android_ndk_path/sources/cxx-stl/llvm-libc++/libs/$_android_arch/libc++_shared.so \ -nostdlib++" diff --git a/cppunit/mingw-w64/PKGBUILD b/cppunit/mingw-w64/PKGBUILD index 146042e7..5bcf3dbc 100644 --- a/cppunit/mingw-w64/PKGBUILD +++ b/cppunit/mingw-w64/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}"