upgpkg: gtest-py3 1.10.0-1

upstream release

updpkg 1.10.0

4 files changed, 8 insertions, 87 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 59f53845e4da..d5a2cd09335b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gtest-py3
 	pkgdesc = Google Test - C++ testing utility
-	pkgver = 1.8.1
+	pkgver = 1.10.0
 	pkgrel = 1
 	url = https://github.com/google/googletest
 	arch = x86_64
@@ -9,12 +9,8 @@ pkgbase = gtest-py3
 	makedepends = cmake
 	makedepends = gcc-libs
 	makedepends = sh
-	source = googletest-release-1.8.1.tar.gz::https://github.com/google/googletest/archive/release-1.8.1.tar.gz
-	source = gtest-1.8.1-libversion.patch
-	source = gtest-1.8.1-null-pointer.patch
-	sha512sums = e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
-	sha512sums = e9bd9d65f6e54f71be0026b84c6543a71f9e3d5c0da92eb7f01df3f5937871eff2b8177e3680fec8d733888327eda5f5f3caaf88a3263ada542cdd2b42475ac5
-	sha512sums = afa75f975d8aed453c901245dae753939958d8b72e3e5c52995efe7980f44de4fd1ea08f1b0a4cc927443d858de0a1fe34a919512ce05ae443bfb9600b08f029
+	source = googletest-release-1.10.0.tar.gz::https://github.com/google/googletest/archive/release-1.10.0.tar.gz
+	sha512sums = bd52abe938c3722adc2347afad52ea3a17ecc76730d8d16b065e165bc7477d762bce0997a427131866a89f1001e3f3315198204ffa5d643a9355f1f4d0d7b1a9
 
 pkgname = gtest-py3
 	pkgdesc = Google Test - C++ testing utility based on the xUnit framework (like JUnit)
diff --git a/PKGBUILD b/PKGBUILD
index 0d2726128cfc..6b53907313c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=gtest-py3
 pkgname=('gtest-py3' 'gmock-py3')
-pkgver=1.8.1
+pkgver=1.10.0
 pkgrel=1
 pkgdesc='Google Test - C++ testing utility'
 url='https://github.com/google/googletest'
@@ -10,26 +10,8 @@ arch=('x86_64')
 license=('BSD')
 makedepends=('python' 'cmake' 'gcc-libs' 'sh')
 _srcname=googletest-release-${pkgver}
-source=(${_srcname}.tar.gz::https://github.com/google/googletest/archive/release-${pkgver}.tar.gz
-        gtest-1.8.1-libversion.patch
-        gtest-1.8.1-null-pointer.patch)
-sha512sums=('e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7'
-            'e9bd9d65f6e54f71be0026b84c6543a71f9e3d5c0da92eb7f01df3f5937871eff2b8177e3680fec8d733888327eda5f5f3caaf88a3263ada542cdd2b42475ac5'
-            'afa75f975d8aed453c901245dae753939958d8b72e3e5c52995efe7980f44de4fd1ea08f1b0a4cc927443d858de0a1fe34a919512ce05ae443bfb9600b08f029')
-
-prepare() {
-  cd ${_srcname}
-  cp ../gtest-1.8.1-libversion.patch gtest-1.8.1-libversion.patch
-  sed "s|__GOOGLETEST_VERSION__|${pkgver}|g" -i gtest-1.8.1-libversion.patch
-  # https://src.fedoraproject.org/rpms/gtest/tree/master
-  patch -Np1 -i gtest-1.8.1-libversion.patch
-  patch -Np1 -i ../gtest-1.8.1-null-pointer.patch
-
-  # fixup version as they are never correct
-  sed -E "s|(GOOGLETEST_VERSION) [0-9\\.]+|\\1 ${pkgver}|" -i CMakeLists.txt
-  sed -E "s|^( +)\\[[0-9\\.]+\\],$|\\1[${pkgver}],|" -i {googletest,googlemock,.}/configure.ac
-  sed -E "s|(GTEST_MIN_VERSION)=\"1.8.0\"|\\1=\"${pkgver}\"|" -i googlemock/configure.ac
-}
+source=(${_srcname}.tar.gz::https://github.com/google/googletest/archive/release-${pkgver}.tar.gz)
+sha512sums=('bd52abe938c3722adc2347afad52ea3a17ecc76730d8d16b065e165bc7477d762bce0997a427131866a89f1001e3f3315198204ffa5d643a9355f1f4d0d7b1a9')
 
 build() {
   mkdir -p build
@@ -39,14 +21,6 @@ build() {
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DBUILD_SHARED_LIBS=ON \
   cmake build
-
-  # Only for g{test,mock}-config
-  cd ${_srcname}/googletest
-  autoreconf -fvi
-  ./configure --prefix=/usr
-  cd ../googlemock
-  autoreconf -fvi
-  ./configure --prefix=/usr
 }
 
 package_gtest-py3() {
@@ -68,9 +42,7 @@ package_gtest-py3() {
 
   cd ${_srcname}/googletest
   install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -Dm 644 README.md CHANGES CONTRIBUTORS -t "${pkgdir}/usr/share/doc/${pkgname}"
-  install -Dm 755 scripts/gtest-config -t "${pkgdir}/usr/bin"
-  install -Dm 644 m4/gtest.m4 -t "${pkgdir}/usr/share/aclocal"
+  install -Dm 644 README.md CONTRIBUTORS -t "${pkgdir}/usr/share/doc/${pkgname}"
   install -Dm 644 cmake/* -t "${pkgdir}/usr/src/gtest/cmake"
   install -Dm 644 src/* -t "${pkgdir}/usr/src/gtest/src"
   install -Dm 644 CMakeLists.txt -t "${pkgdir}/usr/src/gtest"
@@ -86,8 +58,7 @@ package_gmock-py3() {
 
   cd ${_srcname}/googlemock
   install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -Dm 644 README.md CHANGES CONTRIBUTORS -t "${pkgdir}/usr/share/doc/${pkgname}"
-  install -Dm 755 scripts/gmock-config -t "${pkgdir}/usr/bin"
+  install -Dm 644 README.md CONTRIBUTORS -t "${pkgdir}/usr/share/doc/${pkgname}"
   install -Dm 644 src/* -t "${pkgdir}/usr/src/gmock"
   install -Dm 644 scripts/generator/{*.py,LICENSE,README*} -t "${pkgdir}/usr/share/gmock/generator"
   install -Dm 644 scripts/generator/cpp/* -t "${pkgdir}/usr/share/gmock/generator/cpp"
diff --git a/gtest-1.8.1-libversion.patch b/gtest-1.8.1-libversion.patch
deleted file mode 100644
index a9c2c5f68492..000000000000
--- a/gtest-1.8.1-libversion.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
-index 8a8de1f..3d86a59 100644
---- a/googlemock/CMakeLists.txt
-+++ b/googlemock/CMakeLists.txt
-@@ -109,8 +109,10 @@ if (MSVC)
- else()
-   cxx_library(gmock "${cxx_strict}" src/gmock-all.cc)
-   target_link_libraries(gmock PUBLIC gtest)
-+  set_target_properties(gmock PROPERTIES VERSION __GOOGLETEST_VERSION__)
-   cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc)
-   target_link_libraries(gmock_main PUBLIC gmock)
-+  set_target_properties(gmock_main PROPERTIES VERSION __GOOGLETEST_VERSION__)
- endif()
- # If the CMake version supports it, attach header directory information
- # to the targets for when we are part of a parent build (ie being pulled
-diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
-index 9ee7940..8099130 100644
---- a/googletest/CMakeLists.txt
-+++ b/googletest/CMakeLists.txt
-@@ -131,7 +131,9 @@ endif()
- # are used for other targets, to ensure that gtest can be compiled by a user
- # aggressive about warnings.
- cxx_library(gtest "${cxx_strict}" src/gtest-all.cc)
-+set_target_properties(gtest PROPERTIES VERSION __GOOGLETEST_VERSION__)
- cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
-+set_target_properties(gtest_main PROPERTIES VERSION __GOOGLETEST_VERSION__)
- # If the CMake version supports it, attach header directory information
- # to the targets for when we are part of a parent build (ie being pulled
- # in via add_subdirectory() rather than being a standalone build).
diff --git a/gtest-1.8.1-null-pointer.patch b/gtest-1.8.1-null-pointer.patch
deleted file mode 100644
index d062baca40c8..000000000000
--- a/gtest-1.8.1-null-pointer.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
-index 96b07c6..4af3e5a 100644
---- a/googletest/src/gtest.cc
-+++ b/googletest/src/gtest.cc
-@@ -2693,10 +2693,12 @@ void TestInfo::Run() {
-     test->Run();
-   }
- 
-+  if (test != NULL) {
-     // Deletes the test object.
-     impl->os_stack_trace_getter()->UponLeavingGTest();
-     internal::HandleExceptionsInMethodIfSupported(
-         test, &Test::DeleteSelf_, "the test fixture's destructor");
-+  }
- 
-   result_.set_elapsed_time(internal::GetTimeInMillis() - start);
-