From bbfe7f20c3d3e1ec4c54f8a0fafddef7fa580725 Mon Sep 17 00:00:00 2001
From: Mehdi Chinoune <mehdi.chinoune@hotmail.com>
Date: Thu, 23 Jun 2022 22:24:52 +0100
Subject: [PATCH] gtest: update to 1.12.0

---
 mingw-w64-gtest/PKGBUILD | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/mingw-w64-gtest/PKGBUILD b/mingw-w64-gtest/PKGBUILD
index e7c302c461..b32b3a080e 100644
--- a/mingw-w64-gtest/PKGBUILD
+++ b/mingw-w64-gtest/PKGBUILD
@@ -3,21 +3,21 @@
 _realname=googletest
 pkgbase="mingw-w64-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-gtest")
-pkgver=1.11.0
-pkgrel=6
+pkgver=1.12.0
+pkgrel=1
 pkgdesc="Google Testing and Mocking Framework (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://github.com/google/googletest"
 license=('spdx:BSD-3-Clause')
-depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
-         "${MINGW_PACKAGE_PREFIX}-python")
+depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+             "${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-python")
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/google/googletest/archive/release-${pkgver}.tar.gz"
         01-fix-pkgconfig-files.patch)
-sha256sums=('b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5'
+sha256sums=('2a4f11dce6188b256f3650061525d0fe352069e5c162452818efbbf8d0b5fe1c'
             '7112f4bebfa4bd6658c5c886242d0dff820d00ff9204edb667ff64618107f84a')
 
 prepare() {
@@ -42,7 +42,7 @@ build() {
       -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
       ${extra_config} \
       -DBUILD_SHARED_LIBS=OFF \
-      -DCMAKE_SKIP_RPATH=ON \
+      -DPython_EXECUTABLE=${MINGW_PREFIX}/bin/python.exe \
       ../googletest-release-${pkgver}
 
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
@@ -56,13 +56,10 @@ build() {
       -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
       ${extra_config} \
       -DBUILD_SHARED_LIBS=ON \
-      -DCMAKE_SKIP_RPATH=ON \
+      -DPython_EXECUTABLE=${MINGW_PREFIX}/bin/python.exe \
       ../googletest-release-${pkgver}
 
   ${MINGW_PREFIX}/bin/cmake.exe --build ./
-
-  ${MINGW_PREFIX}/bin/python ../googletest-release-${pkgver}/googlemock/scripts/fuse_gmock_files.py ../googletest-release-${pkgver}/googlemock fused-gmock-src
-  ${MINGW_PREFIX}/bin/python ../googletest-release-${pkgver}/googletest/scripts/fuse_gtest_files.py ../googletest-release-${pkgver}/googletest fused-gtest-src
 }
 
 package() {
@@ -72,15 +69,9 @@ package() {
   cd "${srcdir}/build-${MSYSTEM}-shared"
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install ./
 
-  mkdir -p "${pkgdir}"/${MINGW_PREFIX}/src/{gmock,gtest}/{cmake,src}
-  install -m 0644 fused-gtest-src/gtest/* "${pkgdir}"${MINGW_PREFIX}/src/gtest/src/
-  install -m 0644 fused-gmock-src/gmock/* "${pkgdir}"${MINGW_PREFIX}/src/gmock/src/
-  install -m 0644 fused-gmock-src/*.cc "${pkgdir}"${MINGW_PREFIX}/src/gmock/src/
+  mkdir -p "${pkgdir}"/${MINGW_PREFIX}/src/gtest/cmake
   install -m 0644 ${srcdir}/googletest-release-${pkgver}/googletest/cmake/* "${pkgdir}"${MINGW_PREFIX}/src/gtest/cmake/
-  
-  install -Dm 644 ${srcdir}/googletest-release-${pkgver}/googlemock/scripts/generator/{*.py,LICENSE,README*} -t "${pkgdir}${MINGW_PREFIX}/share/gmock/generator"
-  install -Dm 644 ${srcdir}/googletest-release-${pkgver}/googlemock/scripts/generator/cpp/* -t "${pkgdir}${MINGW_PREFIX}/share/gmock/generator/cpp"
-  
+
   install -Dm 0644 ${srcdir}/googletest-release-${pkgver}/LICENSE "${pkgdir}"${MINGW_PREFIX}/share/licenses/gtest/LICENSE
   install -Dm 0644 ${srcdir}/googletest-release-${pkgver}/LICENSE "${pkgdir}"${MINGW_PREFIX}/share/licenses/gmock/LICENSE
 }