Attachment #233218 for bug #263280

View | Details | Raw Unified | Return to bug 263280
Collapse All | Expand All

Lines 1-9 Link Here

(-)b/sysutils/barrier/Makefile (-4 / +10 lines)
1	PORTNAME= barrier	1	PORTNAME= barrier
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 2.3.3	3	DISTVERSION= 2.4.0
4	CATEGORIES= sysutils	4	CATEGORIES= sysutils
5		5
6	MAINTAINER= ports@FreeBSD.org	6	MAINTAINER= sec.research.2005@gmail.com
7	COMMENT= Mouse and keyboard sharing utility	7	COMMENT= Mouse and keyboard sharing utility
8		8
9	LICENSE= GPLv2	9	LICENSE= GPLv2
Lines 11-21 LICENSE_FILE= ${WRKSRC}/LICENSE Link Here
11		11
12	USES= cmake compiler:c++14-lang cpe localbase:ldflags pkgconfig ssl xorg	12	USES= cmake compiler:c++14-lang cpe localbase:ldflags pkgconfig ssl xorg
13	USE_GITHUB= yes	13	USE_GITHUB= yes
14	GH_ACCOUNT= debauchee	14	GH_ACCOUNT= debauchee gulrak:gulrak
		15	GH_PROJECT= filesystem:gulrak
		16	GH_TAGNAME= v1.5.12:gulrak
15	USE_XORG= ice sm x11 xext xi xinerama xrandr xtst	17	USE_XORG= ice sm x11 xext xi xinerama xrandr xtst
16	CPE_VENDOR= barrier_project	18	CPE_VENDOR= barrier_project
17		19
18	CMAKE_ARGS= -DBARRIER_BUILD_DATE=00000000	20	CMAKE_ARGS= -DBARRIER_BUILD_DATE=00000000 \
		21	-DBARRIER_BUILD_TESTS=OFF
19		22
20	CONFLICTS_INSTALL= clusterit # bin/barrier	23	CONFLICTS_INSTALL= clusterit # bin/barrier
21		24
Lines 33-38 GUI_USES= qt:5 Link Here
33	GUI_USE= QT=core,gui,network,widgets,buildtools_build,qmake_build	36	GUI_USE= QT=core,gui,network,widgets,buildtools_build,qmake_build
34	GUI_CMAKE_BOOL= BARRIER_BUILD_GUI	37	GUI_CMAKE_BOOL= BARRIER_BUILD_GUI
35		38
		39	post-extract:
		40	@${CP} -a ${WRKSRC_gulrak}/include ${WRKSRC}/ext/gulrak-filesystem/
		41
36	post-patch:	42	post-patch:
37	@${REINPLACE_CMD} -e 's\|"/etc/barrier/\|"${ETCDIR}/\|' \	43	@${REINPLACE_CMD} -e 's\|"/etc/barrier/\|"${ETCDIR}/\|' \
38	${WRKSRC}/src/lib/arch/unix/ArchDaemonUnix.h	44	${WRKSRC}/src/lib/arch/unix/ArchDaemonUnix.h

Lines 1-3 Link Here

(-)b/sysutils/barrier/distinfo (-3 / +5 lines)
1	TIMESTAMP = 1594973868	1	TIMESTAMP = 1649943232
2	SHA256 (debauchee-barrier-v2.3.3_GH0.tar.gz) = 259e75c150ca16d9db51870b026dc7aad56c410fa3d2f5fdccc19d4b6024bdc5	2	SHA256 (debauchee-barrier-v2.4.0_GH0.tar.gz) = 20046cae7a831d9bb3740b6f04feb9bded4c794c11586a70089080e94ae2fe77
3	SIZE (debauchee-barrier-v2.3.3_GH0.tar.gz) = 5465909	3	SIZE (debauchee-barrier-v2.4.0_GH0.tar.gz) = 5572043
		4	SHA256 (gulrak-filesystem-v1.5.12_GH0.tar.gz) = 7d62c5746c724d28da216d9e11827ba4e573df15ef40720292827a4dfd33f2e9
		5	SIZE (gulrak-filesystem-v1.5.12_GH0.tar.gz) = 209661




--- src/CMakeLists.txt.orig	2022-04-13 21:47:41 UTC
+++ src/CMakeLists.txt
@@ -20,8 +20,6 @@
 
 add_subdirectory(lib)
 add_subdirectory(cmd)
-add_subdirectory(test)
 
-include(../cmake/gtest.cmake)
-
 if (BARRIER_BUILD_TESTS)
     add_subdirectory(test/integtests)
     add_subdirectory(test/unittests)




--- src/lib/barrier/KeyMap.h.orig	2020-07-17 08:20:18 UTC
+++ src/lib/barrier/KeyMap.h
@@ -24,8 +24,6 @@
 #include "common/stdset.h"
 #include "common/stdvector.h"
 
-#include <gtest/gtest_prod.h>
-
 namespace barrier {
 
 //! Key map
@@ -325,21 +323,6 @@ class KeyMap { (public)
     static bool            parseModifiers(String&, KeyModifierMask&);
 
     //@}
-
-private:
-    FRIEND_TEST(KeyMapTests,
-                findBestKey_requiredDown_matchExactFirstItem);
-    FRIEND_TEST(KeyMapTests,
-        findBestKey_requiredAndExtraSensitiveDown_matchExactFirstItem);
-    FRIEND_TEST(KeyMapTests,
-        findBestKey_requiredAndExtraSensitiveDown_matchExactSecondItem);
-    FRIEND_TEST(KeyMapTests,
-        findBestKey_extraSensitiveDown_matchExactSecondItem);
-    FRIEND_TEST(KeyMapTests,
-                findBestKey_noRequiredDown_matchOneRequiredChangeItem);
-    FRIEND_TEST(KeyMapTests,
-                findBestKey_onlyOneRequiredDown_matchTwoRequiredChangesItem);
-    FRIEND_TEST(KeyMapTests, findBestKey_noRequiredDown_cannotMatch);
 
 private:
     //! Ways to synthesize a key
- 

Return to bug 263280

Lines 1-10 Link Here

(-)b/sysutils/barrier/files/patch-src_CMakeLists.txt (-6 / +7 lines)
1	--- src/CMakeLists.txt.orig 2020-07-17 08:17:25 UTC	1	--- src/CMakeLists.txt.orig 2022-04-13 21:47:41 UTC
2	+++ src/CMakeLists.txt	2	+++ src/CMakeLists.txt
3	@@ -19,7 +19,6 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}/lib)	3	@@ -20,8 +20,6 @@
4
5	add_subdirectory(lib)	4	add_subdirectory(lib)
6	add_subdirectory(cmd)	5	add_subdirectory(cmd)
7	-add_subdirectory(test)
8		6
9	if (BARRIER_BUILD_GUI)	7	-include(../cmake/gtest.cmake)
10	add_subdirectory(gui)	8	-
		9	if (BARRIER_BUILD_TESTS)
		10	add_subdirectory(test/integtests)
		11	add_subdirectory(test/unittests)

Removed Link Here

(-)a/sysutils/barrier/files/patch-src_lib_barrier_KeyMap.h (-34 lines)
1	--- src/lib/barrier/KeyMap.h.orig 2020-07-17 08:20:18 UTC
2	+++ src/lib/barrier/KeyMap.h
3	@@ -24,8 +24,6 @@
4	#include "common/stdset.h"
5	#include "common/stdvector.h"
6
7	-#include <gtest/gtest_prod.h>
8	-
9	namespace barrier {
10
11	//! Key map
12	@@ -325,21 +323,6 @@ class KeyMap { (public)
13	static bool parseModifiers(String&, KeyModifierMask&);
14
15	//@}
16	-
17	-private:
18	- FRIEND_TEST(KeyMapTests,
19	- findBestKey_requiredDown_matchExactFirstItem);
20	- FRIEND_TEST(KeyMapTests,
21	- findBestKey_requiredAndExtraSensitiveDown_matchExactFirstItem);
22	- FRIEND_TEST(KeyMapTests,
23	- findBestKey_requiredAndExtraSensitiveDown_matchExactSecondItem);
24	- FRIEND_TEST(KeyMapTests,
25	- findBestKey_extraSensitiveDown_matchExactSecondItem);
26	- FRIEND_TEST(KeyMapTests,
27	- findBestKey_noRequiredDown_matchOneRequiredChangeItem);
28	- FRIEND_TEST(KeyMapTests,
29	- findBestKey_onlyOneRequiredDown_matchTwoRequiredChangesItem);
30	- FRIEND_TEST(KeyMapTests, findBestKey_noRequiredDown_cannotMatch);
31
32	private:
33	//! Ways to synthesize a key
34	-