Use gmock and gtest shared libraries instead of the googletest git submodule

Add vte3 dependency

2 files changed, 20 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f0e58292a301..2b38afa93fad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,12 @@
 pkgbase = cherrytree-git
 	pkgdesc = Hierarchical note-taking application, git version
-	pkgver = 0.99.48.r25.g8ac825c2
+	pkgver = 0.99.51.r2.gd54dd23e
 	pkgrel = 1
 	url = https://github.com/giuspen/cherrytree
 	arch = x86_64
 	license = GPL3
+	checkdepends = gmock
+	checkdepends = gtest
 	makedepends = cmake
 	makedepends = git
 	makedepends = python
@@ -14,12 +16,11 @@ pkgbase = cherrytree-git
 	depends = gtksourceviewmm
 	depends = libxml++2.6
 	depends = uchardet
+	depends = vte3
 	optdepends = xorg-xhost: allow chroot access to X server for running tests
 	provides = cherrytree
 	conflicts = cherrytree
 	source = git+https://github.com/giuspen/cherrytree.git
-	source = git+https://github.com/google/googletest.git
-	sha256sums = SKIP
-	sha256sums = SKIP
+	sha512sums = SKIP
 
 pkgname = cherrytree-git
diff --git a/PKGBUILD b/PKGBUILD
index a04a6449af7a..660007442dba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,47 +2,41 @@
 
 pkgname=cherrytree-git
 _pkgname="${pkgname%%-git}"
-pkgver=0.99.48.r25.g8ac825c2
+pkgver=0.99.51.r2.gd54dd23e
 pkgrel=1
 pkgdesc="Hierarchical note-taking application, git version"
 arch=('x86_64')
 url="https://github.com/giuspen/${_pkgname}"
 license=('GPL3')
 depends=('fmt'
-	 'gspell'
-	 'gtksourceviewmm'
-	 'libxml++2.6'
-	 'uchardet')
-optdepends=('xorg-xhost: allow chroot access to X server for running tests')
+		 'gspell'
+		 'gtksourceviewmm'
+		 'libxml++2.6'
+		 'uchardet'
+		 'vte3')
 makedepends=('cmake'
-	     'git'
-	     'python'
-	     'spdlog')
+			 'git'
+			 'python'
+			 'spdlog')
+checkdepends=('gmock'
+              'gtest')
+optdepends=('xorg-xhost: allow chroot access to X server for running tests')
 provides=("${_pkgname}")
 conflicts=("${_pkgname}")
-source=("git+https://github.com/giuspen/${_pkgname}.git"
-	"git+https://github.com/google/googletest.git")
-sha256sums=('SKIP'
-            'SKIP')
+source=("git+https://github.com/giuspen/${_pkgname}.git")
+sha512sums=('SKIP')
 
 pkgver() {
   cd "${_pkgname}"
   git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare() {
-  cd "${_pkgname}"
-  git submodule init
-  git config submodule.googletest.url "${srcdir}/googletest"
-  git submodule update
-}
-
 build() {
   cmake \
 	-B "${_pkgname}/build" \
 	-S "${_pkgname}" \
-	-DINSTALL_GTEST:BOOL='OFF' \
 	-DAUTO_RUN_TESTING:BOOL='OFF' \
+	-DUSE_SHARED_GTEST_GMOCK:BOOL='ON' \
 	-Wno-dev
   make -C "${_pkgname}/build"
 }