From nobody Fri Apr 15 20:01:42 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 894052DCB0A; Fri, 15 Apr 2022 20:01:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kg6fZ3QBBz4mx8; Fri, 15 Apr 2022 20:01:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650052902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Peurnn8UA60dJN7dNv1Gs16d3fAbNlnRPR1jH1N4Z1M=; b=RL1jhzi4uQwDvt561oaIC12h14d5bB8lseTstJJ/Un/lBSN+qQ5urnLynWsbHa7ltgPKsL JQUAioj1rJ8Gir3ypCKLJZqo86h310rv4RPEH3GRMvpZpfQNtvu2+Kw7tZFrBDuKAXxIcQ vndDQUuV4hzqVv0BRUWkHh6gOd2Mdz02K9uDSinm0WuNxp2QfcFpwhDPjTiiD8labq9HSc ixfnk6K1ca41TO/q8rn/qxaHENuSCBk+zWUekTeaMLWMOPHyVhSHrJYgSHIXeMXA2qzmwR tJUNb8SMg5sU+i/UN90uPBe54wx0fUCPr0MhgVz+xnwILJg7fb2gFCljVGbUXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 561751B9DA; Fri, 15 Apr 2022 20:01:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23FK1gq6021933; Fri, 15 Apr 2022 20:01:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23FK1g61021932; Fri, 15 Apr 2022 20:01:42 GMT (envelope-from git) Date: Fri, 15 Apr 2022 20:01:42 GMT Message-Id: <202204152001.23FK1g61021932@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 8ae93e0e14a0 - main - sysutils/barrier: Update to 2.4.0 and adopt port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ae93e0e14a0a7a1c983395b6512f31c699a064e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650052902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Peurnn8UA60dJN7dNv1Gs16d3fAbNlnRPR1jH1N4Z1M=; b=cUhc0QqE6JACn8tDEEIC9sadj4+3+JUhWvTW7QgSrA/YytJTl2VAufbBnUp1JFm2DEiN/z y8m1tyHWwkzs3bEBZIEcjgWJWmWVJh8gSXIUWSXfDw7S6bG4ZIRb4i3VEq6LFF3uio/CDG ZeDPV6/yjdPtsmXyg3Ihi5JZbSHnVecCZS6Big03+NKSad/BXvgb/6SlLWs9nF2CNWg5V4 2WElvAxyYvg1ZGkUDIf3VzcTypUDRob3kXrFpPLt6cgFKlmX7xQzo9ZTKyG1zdYnB0rLfJ MNQx6CSRnZmYceAjIsCdSYrGkTdQHDaVoEoWmwuii0+gFVQeAI6wQACDz3Okyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650052902; a=rsa-sha256; cv=none; b=gu0vaTmc5UrzGWYJtAGWyfXKhYaw7vAvm/jRQAPYtxEDIyBMPmg7WQais7vKS2rm/wBNc+ gsUPTOf1WA/zz445PeL5SuhuSI6U/bf9PRPUUwfpo5LDrpTR+yq8EjUv/tU4aM3f99C54w On10ZEeJ0nqHow4DluSya3acshZlOZL/ZgE0cnl/3icO4NBBHvlft4+HZZfpa4ALFaQrpw avqattrn3s5/hSLSC5zik1N9rfZeTQqODXXSk/AcrkVdgVhiYcGQTG4bTfeh7cgyd/99UD RzKe9QfAlSbBVk2K79pxXdFLQSH3QRKri+LFosgL5jFEdDJTgnvLqg5WkMm2Vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ae93e0e14a0a7a1c983395b6512f31c699a064e commit 8ae93e0e14a0a7a1c983395b6512f31c699a064e Author: Mostly BSD AuthorDate: 2022-04-14 14:32:05 +0000 Commit: Neel Chauhan CommitDate: 2022-04-15 20:01:17 +0000 sysutils/barrier: Update to 2.4.0 and adopt port Changes: https://github.com/debauchee/barrier PR: 263280 --- sysutils/barrier/Makefile | 14 ++++++--- sysutils/barrier/distinfo | 8 ++++-- sysutils/barrier/files/patch-src_CMakeLists.txt | 13 +++++---- .../barrier/files/patch-src_lib_barrier_KeyMap.h | 33 ---------------------- 4 files changed, 22 insertions(+), 46 deletions(-) diff --git a/sysutils/barrier/Makefile b/sysutils/barrier/Makefile index 9888725815c5..c1fff1d739df 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 65d08439c848..5d3e00af6869 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 1eef855cd592..7ee43b8df7d9 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 6c2f4a006fca..000000000000 --- 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 -- - 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