Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] update barrier to 2.3.3
@ 2020-08-19 19:59 butonic
  2020-08-19 20:03 ` butonic
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: butonic @ 2020-08-19 19:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 586 bytes --]

There is a new pull request by butonic against master on the void-packages repository

https://github.com/butonic/void-packages patch-1
https://github.com/void-linux/void-packages/pull/24367

update barrier to 2.3.3
Upstream moved to a git submodule for gtest and gmock. I took https://github.com/void-linux/void-packages/blob/master/srcpkgs/wabt/template as an example how to download and move gtest to the proper location.

This works for me locally. Let me know if anything needs changing.

A patch file from https://github.com/void-linux/void-packages/pull/24367.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-24367.patch --]
[-- Type: text/x-diff, Size: 2214 bytes --]

From e6db927a9448e34030334e71ddf34203d93eb352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 19 Aug 2020 21:58:52 +0200
Subject: [PATCH] update barrier to 2.3.3

Upstream moved to a git submodule for gtest and gmock. I took https://github.com/void-linux/void-packages/blob/master/srcpkgs/wabt/template as an example how to download and move gtest to the proper location.

This works for me locally. Let me know if anything needs changing.
---
 srcpkgs/barrier/template | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index cf448673315..56f071fe29b 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
 # Template file for 'barrier'
 pkgname=barrier
-version=2.3.2
-revision=2
+version=2.3.3
+revision=1
 build_style=cmake
 configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -11,8 +11,29 @@ 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"
-distfiles="https://github.com/debauchee/barrier/archive/v${version}.tar.gz"
-checksum=6b92a70c5f4d625065842d133386982ec2ad1db2a809af47e46ab8ce2acd39b5
+_gmock_commit=7d33fee11ec480beae4c28ad09ca56d974140a72
+_gtest_commit=800f5422ac9d9e0ad59cd860a2ef3a679588acb4
+distfiles="https://github.com/debauchee/barrier/archive/
+v${version}.tar.gz
+ https://github.com/google/googlemock/archive/${_gmock_c
+ommit}.tar.gz
+ https://github.com/google/googletest/archive/${_gtest_c
+ommit}.tar.gz"
+checksum="259e75c150ca16d9db51870b026dc7aad56c410fa3d2f5
+fdccc19d4b6024bdc5
+ f4191fd64e8a961c06b7cc90a2bbf3774bd315254884675a900f8f3
+4fc2c4c81
+ 57bc26ac31e1bc47a12e4ae99a0f6e17506ba10f0f82ae16aa52cc7
+cc215a3b0"
+
+pre_configure() {
+        # move submodule to proper location
+        rmdir ext/gmock
+        rmdir ext/gtest
+
+        mv -v ../googlemock-${_gmock_commit} ext/gmock
+        mv -v ../googletest-${_gtest_commit} ext/gtest
+}
 
 do_install() {
 	vbin build/bin/barrier

^ permalink raw reply	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-08-20 18:32 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-19 19:59 [PR PATCH] update barrier to 2.3.3 butonic
2020-08-19 20:03 ` butonic
2020-08-19 20:16 ` [PR PATCH] [Updated] " butonic
2020-08-19 20:26 ` [PR REVIEW] " Johnnynator
2020-08-19 20:26 ` Johnnynator
2020-08-19 20:26 ` Johnnynator
2020-08-19 20:27 ` [PR PATCH] [Updated] " butonic
2020-08-19 20:31 ` [PR REVIEW] " butonic
2020-08-19 20:35 ` [PR PATCH] [Updated] " butonic
2020-08-20 18:32 ` Johnnynator
2020-08-20 18:32 ` [PR PATCH] [Merged]: " Johnnynator

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).