From 392d8ce83e2ee67635c32b7a2bb41d0e18f6956a Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Wed, 16 Feb 2022 21:47:07 +0530 Subject: [PATCH] catch: update to 2.13.8 * Remove upstream 0001-fix-pkgconfig.patch file. * Use correct usptream URL. --- mingw-w64-catch/.gitignore | 2 -- mingw-w64-catch/0001-fix-pkgconfig.patch | 10 ---------- mingw-w64-catch/PKGBUILD | 18 ++++++++---------- 3 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 mingw-w64-catch/.gitignore delete mode 100644 mingw-w64-catch/0001-fix-pkgconfig.patch diff --git a/mingw-w64-catch/.gitignore b/mingw-w64-catch/.gitignore deleted file mode 100644 index d155f60450..0000000000 --- a/mingw-w64-catch/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -catch.hpp -LICENSE_1_0.txt diff --git a/mingw-w64-catch/0001-fix-pkgconfig.patch b/mingw-w64-catch/0001-fix-pkgconfig.patch deleted file mode 100644 index abe6339c48..0000000000 --- a/mingw-w64-catch/0001-fix-pkgconfig.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -Naur Catch2-2.13.7.orig/CMake/catch2.pc.in Catch2-2.13.7/CMake/catch2.pc.in ---- Catch2-2.13.7.orig/CMake/catch2.pc.in 2021-07-28 20:30:51.000000000 +0200 -+++ Catch2-2.13.7/CMake/catch2.pc.in 2021-08-19 18:26:47.240779600 +0200 -@@ -1,3 +1,6 @@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${prefix}/lib - includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ - - Name: Catch2 diff --git a/mingw-w64-catch/PKGBUILD b/mingw-w64-catch/PKGBUILD index 18980f00c2..0b70573b90 100644 --- a/mingw-w64-catch/PKGBUILD +++ b/mingw-w64-catch/PKGBUILD @@ -3,24 +3,22 @@ _realname=catch pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2.13.7 -pkgrel=2 +pkgver=2.13.8 +pkgrel=1 pkgdesc="A modern, C++-native, header-only, test framework for unit-tests, TDD and BDD using C++11 and later (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') -url='https://github.com/philsquared/Catch' +url='https://github.com/catchorg/Catch2' makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-python") license=('custom') -source=(${_realname}-${pkgver}.tar.gz::https://github.com/catchorg/Catch2/archive/v${pkgver}.tar.gz - 0001-fix-pkgconfig.patch) -sha256sums=('3cdb4138a072e4c0290034fe22d9f0a80d3bcfb8d7a8a5c49ad75d3a5da24fae' - '1788632dfa4cd9ea4668ca1b879be719c42b3b0502527377641c6a9a7322edd9') - +source=(${_realname}-${pkgver}.tar.gz::https://github.com/catchorg/Catch2/archive/v${pkgver}.tar.gz) +sha256sums=('b9b592bd743c09f13ee4bf35fc30eeee2748963184f6bea836b146e6cc2a585a') + prepare() { - cd "${srcdir}"/Catch2-${pkgver} - patch -p1 -i "${srcdir}"/0001-fix-pkgconfig.patch + cd "${srcdir}"/Catch2-${pkgver} + } build() {