diff --git a/gtest/.SRCINFO b/gtest/.SRCINFO index 0630b72481..f263d9c316 100644 --- a/gtest/.SRCINFO +++ b/gtest/.SRCINFO @@ -1,23 +1,19 @@ pkgbase = gtest pkgdesc = Google Test - C++ testing utility - pkgver = 1.14.0 - pkgrel = 2 + pkgver = 1.15.2 + pkgrel = 1 url = https://github.com/google/googletest arch = x86_64 - license = BSD - makedepends = python + license = BSD-3-Clause makedepends = cmake - makedepends = gcc-libs - makedepends = sh + makedepends = python depends = gcc-libs - depends = sh + depends = glibc optdepends = python: gmock generator provides = gmock conflicts = gmock replaces = gmock - source = googletest-1.14.0.tar.gz::https://github.com/google/googletest/archive/v1.14.0.tar.gz - source = gtest-version.patch - sha512sums = 765c326ccc1b87a01027385e69238266e356361cd4ee3e18e3c9d137a5d11fa5d657c164d02dd1be8fe693c8e10f2b580588dbfa57d27f070e2750f50d3e662c - sha512sums = 8d426a1759a9931db5f8431d83d163fd1bc986be27f85c24222d69a18224451c5a745a29f783e55c83af1882bd0bbc2504f91668c38d6622810bb65888897799 + source = googletest-1.15.2.tar.gz::https://github.com/google/googletest/archive/v1.15.2.tar.gz + sha512sums = 9046841044a2bf7edfd96854ad9c44ffae4fcb9fb59a075b367507c0762a98eb32cb6968d46663228272e26321e96f4dd287c95baa22c6af9bad902b8b6ede4e pkgname = gtest diff --git a/gtest/PKGBUILD b/gtest/PKGBUILD index 2cd840478e..9822bea28e 100644 --- a/gtest/PKGBUILD +++ b/gtest/PKGBUILD @@ -8,35 +8,36 @@ # Contributor: acxz pkgname=gtest -pkgver=1.14.0 -pkgrel=2 +pkgver=1.15.2 +pkgrel=1 pkgdesc='Google Test - C++ testing utility' url='https://github.com/google/googletest' arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) -license=('BSD') -depends=('gcc-libs' 'sh') -makedepends=('python' 'cmake' 'gcc-libs' 'sh') +license=('BSD-3-Clause') +depends=( + 'gcc-libs' + 'glibc' +) +makedepends=( + 'cmake' + 'python' +) optdepends=('python: gmock generator') conflicts=('gmock') replaces=('gmock') provides=('gmock') _srcname=googletest-${pkgver} -source=(${_srcname}.tar.gz::https://github.com/google/googletest/archive/v${pkgver}.tar.gz - gtest-version.patch) -sha512sums=('765c326ccc1b87a01027385e69238266e356361cd4ee3e18e3c9d137a5d11fa5d657c164d02dd1be8fe693c8e10f2b580588dbfa57d27f070e2750f50d3e662c' - '8d426a1759a9931db5f8431d83d163fd1bc986be27f85c24222d69a18224451c5a745a29f783e55c83af1882bd0bbc2504f91668c38d6622810bb65888897799') - -prepare() { - cd ${_srcname} - sed "s|__GOOGLETEST_VERSION__|${pkgver}|g" -i ../gtest-version.patch - patch -Np1 -i ../gtest-version.patch -} +source=("${_srcname}.tar.gz::https://github.com/google/googletest/archive/v${pkgver}.tar.gz") +sha512sums=('9046841044a2bf7edfd96854ad9c44ffae4fcb9fb59a075b367507c0762a98eb32cb6968d46663228272e26321e96f4dd287c95baa22c6af9bad902b8b6ede4e') build() { cmake -H${_srcname} -Bbuild \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=None \ + -Wno-dev \ -DBUILD_SHARED_LIBS=ON \ - -Dgtest_build_tests=ON + -Dgtest_build_tests=ON \ + -DGOOGLETEST_VERSION=$pkgver cmake --build build } @@ -45,7 +46,7 @@ check() { } package() { - DESTDIR="${pkgdir}" cmake --build build --target install + DESTDIR="${pkgdir}" cmake --install build # Shouldn't be present find "${pkgdir}" -name '*.pump' -printf 'Removing %P\n' -delete diff --git a/gtest/gtest-version.patch b/gtest/gtest-version.patch deleted file mode 100644 index ceff755715..0000000000 --- a/gtest/gtest-version.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --unified --recursive --text googletest-release-1.11.0.orig/googlemock/CMakeLists.txt googletest-release-1.11.0/googlemock/CMakeLists.txt ---- googletest-release-1.11.0.orig/googlemock/CMakeLists.txt 2020-11-13 14:33:36.022632459 -0500 -+++ googletest-release-1.11.0/googlemock/CMakeLists.txt 2020-11-13 14:35:01.806861990 -0500 -@@ -40,6 +40,7 @@ - # ${gmock_BINARY_DIR}. - # Language "C" is required for find_package(Threads). - cmake_minimum_required(VERSION 3.13) -+ set(GOOGLETEST_VERSION __GOOGLETEST_VERSION__) - project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C) - - if (COMMAND set_up_hermetic_build) -diff --unified --recursive --text googletest-release-1.11.0.orig/googletest/CMakeLists.txt googletest-release-1.11.0/googletest/CMakeLists.txt ---- googletest-release-1.11.0.orig/googletest/CMakeLists.txt 2020-11-13 14:33:36.039299268 -0500 -+++ googletest-release-1.11.0/googletest/CMakeLists.txt 2020-11-13 14:37:10.274915300 -0500 -@@ -46,6 +46,7 @@ - # Project version: - - cmake_minimum_required(VERSION 3.13) -+set(GOOGLETEST_VERSION __GOOGLETEST_VERSION__) - project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C) - - if (POLICY CMP0063) # Visibility