Attachment 233218 Details for Bug 263280 – Patch

[patch] Patch

0001-sysutils-barrier-Update-to-2.4.0.patch (text/plain), 4.67 KB, created by sec.research.2005 on 2022-04-14 14:34:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: sec.research.2005

Created: 2022-04-14 14:34:33 UTC

Size: 4.67 KB

patch

obsolete

>From a0a4e9f99b96b2b2b93195e8c36d7ef38ec40799 Mon Sep 17 00:00:00 2001
>From: Mostly BSD <sec.research.2005@gmail.comaa>
>Date: Thu, 14 Apr 2022 09:32:05 -0500
>Subject: [PATCH] sysutils/barrier: Update to 2.4.0
>
>---
> sysutils/barrier/Makefile                     | 14 +++++---
> sysutils/barrier/distinfo                     |  8 +++--
> .../barrier/files/patch-src_CMakeLists.txt    | 13 ++++----
> .../files/patch-src_lib_barrier_KeyMap.h      | 33 -------------------
> 4 files changed, 22 insertions(+), 46 deletions(-)
> delete mode 100644 sysutils/barrier/files/patch-src_lib_barrier_KeyMap.h
>
>diff --git a/sysutils/barrier/Makefile b/sysutils/barrier/Makefile
>index 988872581..c1fff1d73 100644
>--- a/sysutils/barrier/Makefile
>+++ b/sysutils/barrier/Makefile
>@@ -1,9 +1,9 @@
> PORTNAME=	barrier
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	2.3.3
>+DISTVERSION=	2.4.0
> CATEGORIES=	sysutils
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	sec.research.2005@gmail.com
> COMMENT=	Mouse and keyboard sharing utility
> 
> LICENSE=	GPLv2
>@@ -11,11 +11,14 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> USES=		cmake compiler:c++14-lang cpe localbase:ldflags pkgconfig ssl xorg
> USE_GITHUB=	yes
>-GH_ACCOUNT=	debauchee
>+GH_ACCOUNT=	debauchee gulrak:gulrak
>+GH_PROJECT=	filesystem:gulrak
>+GH_TAGNAME= v1.5.12:gulrak
> USE_XORG=	ice sm x11 xext xi xinerama xrandr xtst
> CPE_VENDOR=	barrier_project
> 
>-CMAKE_ARGS=	-DBARRIER_BUILD_DATE=00000000
>+CMAKE_ARGS=	-DBARRIER_BUILD_DATE=00000000 \
>+						-DBARRIER_BUILD_TESTS=OFF
> 
> CONFLICTS_INSTALL=	clusterit # bin/barrier
> 
>@@ -33,6 +36,9 @@ GUI_USES=		qt:5
> GUI_USE=		QT=core,gui,network,widgets,buildtools_build,qmake_build
> GUI_CMAKE_BOOL=		BARRIER_BUILD_GUI
> 
>+post-extract:
>+	@${CP} -a ${WRKSRC_gulrak}/include ${WRKSRC}/ext/gulrak-filesystem/
>+
> post-patch:
> 	@${REINPLACE_CMD} -e 's|"/etc/barrier/|"${ETCDIR}/|' \
> 		${WRKSRC}/src/lib/arch/unix/ArchDaemonUnix.h
>diff --git a/sysutils/barrier/distinfo b/sysutils/barrier/distinfo
>index 65d08439c..5d3e00af6 100644
>--- a/sysutils/barrier/distinfo
>+++ b/sysutils/barrier/distinfo
>@@ -1,3 +1,5 @@
>-TIMESTAMP = 1594973868
>-SHA256 (debauchee-barrier-v2.3.3_GH0.tar.gz) = 259e75c150ca16d9db51870b026dc7aad56c410fa3d2f5fdccc19d4b6024bdc5
>-SIZE (debauchee-barrier-v2.3.3_GH0.tar.gz) = 5465909
>+TIMESTAMP = 1649943232
>+SHA256 (debauchee-barrier-v2.4.0_GH0.tar.gz) = 20046cae7a831d9bb3740b6f04feb9bded4c794c11586a70089080e94ae2fe77
>+SIZE (debauchee-barrier-v2.4.0_GH0.tar.gz) = 5572043
>+SHA256 (gulrak-filesystem-v1.5.12_GH0.tar.gz) = 7d62c5746c724d28da216d9e11827ba4e573df15ef40720292827a4dfd33f2e9
>+SIZE (gulrak-filesystem-v1.5.12_GH0.tar.gz) = 209661
>diff --git a/sysutils/barrier/files/patch-src_CMakeLists.txt b/sysutils/barrier/files/patch-src_CMakeLists.txt
>index 1eef855cd..7ee43b8df 100644
>--- a/sysutils/barrier/files/patch-src_CMakeLists.txt
>+++ b/sysutils/barrier/files/patch-src_CMakeLists.txt
>@@ -1,10 +1,11 @@
>---- src/CMakeLists.txt.orig	2020-07-17 08:17:25 UTC
>+--- src/CMakeLists.txt.orig	2022-04-13 21:47:41 UTC
> +++ src/CMakeLists.txt
>-@@ -19,7 +19,6 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}/lib)
>- 
>+@@ -20,8 +20,6 @@
>  add_subdirectory(lib)
>  add_subdirectory(cmd)
>--add_subdirectory(test)
>  
>- if (BARRIER_BUILD_GUI)
>-     add_subdirectory(gui)
>+-include(../cmake/gtest.cmake)
>+-
>+ if (BARRIER_BUILD_TESTS)
>+     add_subdirectory(test/integtests)
>+     add_subdirectory(test/unittests)
>diff --git a/sysutils/barrier/files/patch-src_lib_barrier_KeyMap.h b/sysutils/barrier/files/patch-src_lib_barrier_KeyMap.h
>deleted file mode 100644
>index 6c2f4a006..000000000
>--- a/sysutils/barrier/files/patch-src_lib_barrier_KeyMap.h
>+++ /dev/null
>@@ -1,33 +0,0 @@
>---- 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
>-- 
>2.35.1
>

Actions: View | Diff

Attachments on bug 263280: 233218 | 233219