Date: Fri, 17 Jul 2020 09:53:09 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542420 - in head/sysutils/barrier: . files Message-ID: <202007170953.06H9r9Ug078307@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Fri Jul 17 09:53:08 2020 New Revision: 542420 URL: https://svnweb.freebsd.org/changeset/ports/542420 Log: sysutils/barrier: Update to v2.3.3 Changes: https://github.com/debauchee/barrier/releases/tag/v2.3.3 Added: head/sysutils/barrier/files/patch-src_CMakeLists.txt (contents, props changed) head/sysutils/barrier/files/patch-src_lib_barrier_KeyMap.h (contents, props changed) Modified: head/sysutils/barrier/Makefile head/sysutils/barrier/distinfo head/sysutils/barrier/files/patch-CMakeLists.txt head/sysutils/barrier/files/patch-cmake_Version.cmake head/sysutils/barrier/pkg-plist Modified: head/sysutils/barrier/Makefile ============================================================================== --- head/sysutils/barrier/Makefile Fri Jul 17 09:46:00 2020 (r542419) +++ head/sysutils/barrier/Makefile Fri Jul 17 09:53:08 2020 (r542420) @@ -2,7 +2,7 @@ PORTNAME= barrier DISTVERSIONPREFIX= v -DISTVERSION= 2.3.2 +DISTVERSION= 2.3.3 CATEGORIES= sysutils MAINTAINER= tobik@FreeBSD.org @@ -22,6 +22,8 @@ MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= EXAMPLES GUI OPTIONS_DEFAULT= GUI +# no GUI option on 11.x with base SSL since qt5-network is not available +OPTIONS_EXCLUDE= ${${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} == base:?GUI:} OPTIONS_SUB= yes GUI_DESC= Build configuration utility (requires Qt 5) @@ -42,7 +44,7 @@ post-install: cd ${INSTALL_WRKSRC}/bin && \ ${INSTALL_PROGRAM} barrierc barriers ${STAGEDIR}${PREFIX}/bin cd ${WRKSRC}/doc && \ - ${INSTALL_MAN} barrierc.1 barriers.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} barrierc.1 barriers.1 ${STAGEDIR}${PREFIX}/share/man/man1 @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/doc/barrier.conf.example-basic \ ${STAGEDIR}${ETCDIR}/barrier.conf.sample Modified: head/sysutils/barrier/distinfo ============================================================================== --- head/sysutils/barrier/distinfo Fri Jul 17 09:46:00 2020 (r542419) +++ head/sysutils/barrier/distinfo Fri Jul 17 09:53:08 2020 (r542420) @@ -1,3 +1,3 @@ -TIMESTAMP = 1570257369 -SHA256 (debauchee-barrier-v2.3.2_GH0.tar.gz) = 6b92a70c5f4d625065842d133386982ec2ad1db2a809af47e46ab8ce2acd39b5 -SIZE (debauchee-barrier-v2.3.2_GH0.tar.gz) = 7244128 +TIMESTAMP = 1594973868 +SHA256 (debauchee-barrier-v2.3.3_GH0.tar.gz) = 259e75c150ca16d9db51870b026dc7aad56c410fa3d2f5fdccc19d4b6024bdc5 +SIZE (debauchee-barrier-v2.3.3_GH0.tar.gz) = 5465909 Modified: head/sysutils/barrier/files/patch-CMakeLists.txt ============================================================================== --- head/sysutils/barrier/files/patch-CMakeLists.txt Fri Jul 17 09:46:00 2020 (r542419) +++ head/sysutils/barrier/files/patch-CMakeLists.txt Fri Jul 17 09:53:08 2020 (r542420) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2018-09-08 23:09:56 UTC +--- CMakeLists.txt.orig 2020-07-14 17:37:45 UTC +++ CMakeLists.txt -@@ -333,7 +333,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +@@ -341,7 +341,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ) endif() @@ -9,7 +9,7 @@ set (OPENSSL_LIBS ssl crypto) else() find_library (lib_ssl ssl) -@@ -403,7 +403,7 @@ endif() +@@ -417,7 +417,7 @@ endif() # # Linux installation # Modified: head/sysutils/barrier/files/patch-cmake_Version.cmake ============================================================================== --- head/sysutils/barrier/files/patch-cmake_Version.cmake Fri Jul 17 09:46:00 2020 (r542419) +++ head/sysutils/barrier/files/patch-cmake_Version.cmake Fri Jul 17 09:53:08 2020 (r542420) @@ -1,6 +1,6 @@ ---- cmake/Version.cmake.orig 2019-05-16 15:32:09 UTC +--- cmake/Version.cmake.orig 2020-07-14 17:37:45 UTC +++ cmake/Version.cmake -@@ -69,7 +69,6 @@ else() +@@ -70,7 +70,6 @@ else() set (BARRIER_BUILD_NUMBER 1) endif() Added: head/sysutils/barrier/files/patch-src_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/barrier/files/patch-src_CMakeLists.txt Fri Jul 17 09:53:08 2020 (r542420) @@ -0,0 +1,10 @@ +--- src/CMakeLists.txt.orig 2020-07-17 08:17:25 UTC ++++ src/CMakeLists.txt +@@ -19,7 +19,6 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}/lib) + + add_subdirectory(lib) + add_subdirectory(cmd) +-add_subdirectory(test) + + if (BARRIER_BUILD_GUI) + add_subdirectory(gui) Added: head/sysutils/barrier/files/patch-src_lib_barrier_KeyMap.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/barrier/files/patch-src_lib_barrier_KeyMap.h Fri Jul 17 09:53:08 2020 (r542420) @@ -0,0 +1,33 @@ +--- 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 Modified: head/sysutils/barrier/pkg-plist ============================================================================== --- head/sysutils/barrier/pkg-plist Fri Jul 17 09:46:00 2020 (r542419) +++ head/sysutils/barrier/pkg-plist Fri Jul 17 09:53:08 2020 (r542420) @@ -2,10 +2,10 @@ bin/barrierc bin/barriers @sample %%ETCDIR%%/barrier.conf.sample -man/man1/barrierc.1.gz -man/man1/barriers.1.gz %%GUI%%share/applications/barrier.desktop %%PORTEXAMPLES%%%%EXAMPLESDIR%%/barrier.conf.example %%PORTEXAMPLES%%%%EXAMPLESDIR%%/barrier.conf.example-advanced %%PORTEXAMPLES%%%%EXAMPLESDIR%%/barrier.conf.example-basic %%GUI%%share/icons/hicolor/scalable/apps/barrier.svg +share/man/man1/barrierc.1.gz +share/man/man1/barriers.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007170953.06H9r9Ug078307>