[arch-commits] Commit in gtest/repos/community-x86_64 (3 files)

Antonio Rojas arojas at gemini.archlinux.org
Mon Jul 4 20:35:15 UTC 2022


    Date: Monday, July 4, 2022 @ 20:35:15
  Author: arojas
Revision: 1244002

archrelease: copy trunk to community-x86_64

Added:
  gtest/repos/community-x86_64/PKGBUILD
    (from rev 1244001, gtest/trunk/PKGBUILD)
Deleted:
  gtest/repos/community-x86_64/PKGBUILD
  gtest/repos/community-x86_64/gtest-version.patch

---------------------+
 PKGBUILD            |  145 ++++++++++++++++++++++----------------------------
 gtest-version.patch |   22 -------
 2 files changed, 64 insertions(+), 103 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-04 20:35:05 UTC (rev 1244001)
+++ PKGBUILD	2022-07-04 20:35:15 UTC (rev 1244002)
@@ -1,81 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Alexandre Bique <bique.alexandre at gmail.com>
-# Contributor: Louis R. Marascio <lrm at fitnr.com>
-# Contributor: Cody Maloney <cmaloney at theoreticalchaos.com>
-# Contributor: acxz <akashpatel2008 at yahoo dot com>
-
-pkgname=gtest
-pkgver=1.11.0
-pkgrel=4
-pkgdesc='Google Test - C++ testing utility'
-url='https://github.com/google/googletest'
-arch=('x86_64')
-license=('BSD')
-depends=('gcc-libs' 'sh')
-makedepends=('python' 'cmake' 'gcc-libs' 'sh')
-optdepends=('python: gmock generator')
-conflicts=('gmock')
-replaces=('gmock')
-provides=('gmock')
-_srcname=googletest-release-${pkgver}
-source=(${_srcname}.tar.gz::https://github.com/google/googletest/archive/release-${pkgver}.tar.gz
-        gtest-gcc11-fix.patch::https://github.com/google/googletest/commit/d5ad28dbe14fca51038fb8c7610f11602b98f682.patch
-        gtest-version.patch)
-sha512sums=('6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28'
-            'd566b3e0a72a4bb8ee0290342006829802502e246267b543ff4e4a63506366e9b5251b78a5951a3abf81a91889856ef2188394fa4a9d51c057f7478395fc12f7'
-            'e3e6476d938f65e74a0aa5bbfe58136db937205c8a0536399f46d0096ee728566247b85c82e0067300e465fcbc455a9e0d99611410dece70180aa92170357fbf')
-
-prepare() {
-  cd ${_srcname}
-  cp ../gtest-version.patch gtest-version.patch
-  sed "s|__GOOGLETEST_VERSION__|${pkgver}|g" -i gtest-version.patch
-  patch -Np1 -i gtest-version.patch
-  patch -p1 < ../gtest-gcc11-fix.patch
-  rm googletest/include/gtest/gtest-matchers.h.orig
-}
-
-build() {
-  cmake -H${_srcname} -Bbuild \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DBUILD_SHARED_LIBS=ON \
-    -Dgtest_build_tests=ON
-  cmake --build build
-}
-
-check() {
-  cmake --build build --target test
-}
-
-package() {
-  DESTDIR="${pkgdir}" cmake --build build --target install
-
-  # Shouldn't be present
-  find "${pkgdir}" -name '*.pump' -printf 'Removing %P\n' -delete
-
-  cd ${_srcname}
-  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -Dm 644 README.md CONTRIBUTORS -t "${pkgdir}/usr/share/doc/${pkgname}"
-
-  cd googletest
-  install -Dm 755 scripts/gtest-config.in -t "${pkgdir}/usr/bin"
-  install -Dm 644 cmake/* -t "${pkgdir}/usr/src/googletest/cmake"
-  install -Dm 644 src/* -t "${pkgdir}/usr/src/googletest/src"
-  install -Dm 644 CMakeLists.txt -t "${pkgdir}/usr/src/googletest"
-
-  cd ../googlemock
-  install -Dm 644 cmake/* -t "${pkgdir}/usr/src/gmock/cmake"
-  install -Dm 644 src/* -t "${pkgdir}/usr/src/gmock/src"
-  install -Dm 644 CMakeLists.txt -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"
-
-  sed -i 's|src/||' "${pkgdir}/usr/src/gmock/src/gmock-all.cc"
-
-  python -m compileall -d /usr/share/gmock "${pkgdir}/usr/share/gmock"
-  python -O -m compileall -d /usr/share/gmock "${pkgdir}/usr/share/gmock"
-}
-
-# vim: ts=2 sw=2 et:

Copied: gtest/repos/community-x86_64/PKGBUILD (from rev 1244001, gtest/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-07-04 20:35:15 UTC (rev 1244002)
@@ -0,0 +1,64 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Alexandre Bique <bique.alexandre at gmail.com>
+# Contributor: Louis R. Marascio <lrm at fitnr.com>
+# Contributor: Cody Maloney <cmaloney at theoreticalchaos.com>
+# Contributor: acxz <akashpatel2008 at yahoo dot com>
+
+pkgname=gtest
+pkgver=1.12.0
+pkgrel=1
+pkgdesc='Google Test - C++ testing utility'
+url='https://github.com/google/googletest'
+arch=('x86_64')
+license=('BSD')
+depends=('gcc-libs' 'sh')
+makedepends=('python' 'cmake' 'gcc-libs' 'sh')
+optdepends=('python: gmock generator')
+conflicts=('gmock')
+replaces=('gmock')
+provides=('gmock')
+_srcname=googletest-release-${pkgver}
+source=(${_srcname}.tar.gz::https://github.com/google/googletest/archive/release-${pkgver}.tar.gz)
+sha512sums=('6216e76a8c988b6b3739f3988c85f369eef2a8036c4412621a0d3d04ceeada00d35e487363be0a265035ac78f1a5065e1fe054a285c43df23b6abcc69f8bfe3d')
+
+build() {
+  cmake -H${_srcname} -Bbuild \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_SHARED_LIBS=ON \
+    -Dgtest_build_tests=ON
+  cmake --build build
+}
+
+check() {
+  cmake --build build --target test
+}
+
+package() {
+  DESTDIR="${pkgdir}" cmake --build build --target install
+
+  # Shouldn't be present
+  find "${pkgdir}" -name '*.pump' -printf 'Removing %P\n' -delete
+
+  cd ${_srcname}
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -Dm 644 README.md CONTRIBUTORS -t "${pkgdir}/usr/share/doc/${pkgname}"
+
+  cd googletest
+  install -Dm 644 cmake/* -t "${pkgdir}/usr/src/googletest/cmake"
+  install -Dm 644 src/* -t "${pkgdir}/usr/src/googletest/src"
+  install -Dm 644 CMakeLists.txt -t "${pkgdir}/usr/src/googletest"
+
+  cd ../googlemock
+  install -Dm 644 cmake/* -t "${pkgdir}/usr/src/gmock/cmake"
+  install -Dm 644 src/* -t "${pkgdir}/usr/src/gmock/src"
+  install -Dm 644 CMakeLists.txt -t "${pkgdir}/usr/src/gmock"
+
+  sed -i 's|src/||' "${pkgdir}/usr/src/gmock/src/gmock-all.cc"
+
+  python -m compileall -d /usr/share/gmock "${pkgdir}/usr/share/gmock"
+  python -O -m compileall -d /usr/share/gmock "${pkgdir}/usr/share/gmock"
+}
+
+# vim: ts=2 sw=2 et:

Deleted: gtest-version.patch
===================================================================
--- gtest-version.patch	2022-07-04 20:35:05 UTC (rev 1244001)
+++ gtest-version.patch	2022-07-04 20:35:15 UTC (rev 1244002)
@@ -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 @@
-   project(gmock CXX C)
- else()
-   cmake_policy(SET CMP0048 NEW)
-+  set(GOOGLETEST_VERSION __GOOGLETEST_VERSION__)
-   project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
- endif()
- cmake_minimum_required(VERSION 2.6.4)
-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:
- 
-+set(GOOGLETEST_VERSION __GOOGLETEST_VERSION__)
- if (CMAKE_VERSION VERSION_LESS 3.0)
-   project(gtest CXX C)
-   set(PROJECT_VERSION ${GOOGLETEST_VERSION})



More information about the arch-commits mailing list