From 5ba569d54b477c563c87dc9fb3999ae710ff1162 Mon Sep 17 00:00:00 2001
From: Jonathan Larsson <jonathan.larsson@dom.se>
Date: Mon, 8 Nov 2021 14:16:03 +0100
Subject: [PATCH] barrier: version update to 2.4.0

---
 srcpkgs/barrier/template | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index f36a9914585c..ae4df560fae4 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
-version=2.3.3
-revision=2
+version=2.4.0
+revision=1
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -11,22 +11,24 @@ short_desc="Open-source KVM software based on Synergy"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://github.com/debauchee/barrier"
-_gmock_commit=7d33fee11ec480beae4c28ad09ca56d974140a72
-_gtest_commit=800f5422ac9d9e0ad59cd860a2ef3a679588acb4
-distfiles="https://github.com/debauchee/barrier/archive/v${version}.tar.gz
- https://github.com/google/googlemock/archive/${_gmock_commit}.tar.gz
- https://github.com/google/googletest/archive/${_gtest_commit}.tar.gz"
-checksum="259e75c150ca16d9db51870b026dc7aad56c410fa3d2f5fdccc19d4b6024bdc5
- f4191fd64e8a961c06b7cc90a2bbf3774bd315254884675a900f8f34fc2c4c81
- 57bc26ac31e1bc47a12e4ae99a0f6e17506ba10f0f82ae16aa52cc7cc215a3b0"
+_gtest_commit=bf0701daa9f5b30e5882e2f8f9a5280bcba87e77
+_ghc_commit=a07ddedeae722c09e819895e1c31ae500e9abad6
+distfiles="https://github.com/google/googletest/archive/${_gtest_commit}.tar.gz
+ https://github.com/gulrak/filesystem/archive/${_ghc_commit}.tar.gz
+ https://github.com/debauchee/barrier/archive/v${version}.tar.gz"
+checksum="b44b5d37b62e7e54887f07f9862e7dce537aa9922e80995007bcffe6ab9058d4
+ a0311bf91e6b4a7dbeb40be076d4b8e28f54f5034c9b9c5ce3ccd55c9b7a8819
+ 20046cae7a831d9bb3740b6f04feb9bded4c794c11586a70089080e94ae2fe77"
 
 pre_configure() {
 	# move submodule to proper location
 	rmdir ext/gmock
 	rmdir ext/gtest
+	rmdir ext/gulrak-filesystem
 
-	mv -v ../googlemock-${_gmock_commit} ext/gmock
-	mv -v ../googletest-${_gtest_commit} ext/gtest
+	cp -rv ../googletest-${_gtest_commit}/googlemock ext/gmock
+	mv -v ../googletest-${_gtest_commit}/googletest ext/gtest
+	mv -v ../filesystem-${_ghc_commit}/include/ghc src/lib/ghc
 }
 
 do_install() {