pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Add barrier v2.1.1
Module Name: pkgsrc-wip
Committed By: coypu <coypu%sdf.org@localhost>
Pushed By: coypu
Date: Thu Aug 2 14:26:25 2018 +0300
Changeset: 20c42bbb39f6cbf70fbca39df3682852831f6291
Added Files:
barrier/DESCR
barrier/Makefile
barrier/PLIST
barrier/distinfo
barrier/patches/patch-CMakeLists.txt
barrier/patches/patch-src_gui_CMakeLists.txt
barrier/patches/patch-src_gui_src_ActionDialog.cpp
barrier/patches/patch-src_gui_src_ScreenSetupView.cpp
barrier/patches/patch-src_lib_arch_CMakeLists.txt
barrier/patches/patch-tools_gmock-1.6.0_configure
barrier/patches/patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h
barrier/patches/patch-tools_gtest-1.6.0_configure
barrier/patches/patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h
Log Message:
Add barrier v2.1.1
Barrier is KVM software forked from Symless's synergy 1.9 codebase.
Synergy was a commercialized reimplementation of the original CosmoSynergy
written by Chris Schoeneman.
Whereas synergy has moved beyond its goals from the 1.x era, barrier aims
to maintain that simplicity. Barrier will let you use your keyboard and
mouse from machine A to control machine B (or more). It's that simple.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=20c42bbb39f6cbf70fbca39df3682852831f6291
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
barrier/DESCR | 7 ++
barrier/Makefile | 55 +++++++++++
barrier/PLIST | 12 +++
barrier/distinfo | 15 +++
barrier/patches/patch-CMakeLists.txt | 102 +++++++++++++++++++++
barrier/patches/patch-src_gui_CMakeLists.txt | 14 +++
barrier/patches/patch-src_gui_src_ActionDialog.cpp | 12 +++
.../patches/patch-src_gui_src_ScreenSetupView.cpp | 12 +++
barrier/patches/patch-src_lib_arch_CMakeLists.txt | 13 +++
barrier/patches/patch-tools_gmock-1.6.0_configure | 24 +++++
...gmock-1.6.0_include_gmock_internal_gmock-port.h | 19 ++++
barrier/patches/patch-tools_gtest-1.6.0_configure | 15 +++
...gtest-1.6.0_include_gtest_internal_gtest-port.h | 21 +++++
13 files changed, 321 insertions(+)
diffs:
diff --git a/barrier/DESCR b/barrier/DESCR
new file mode 100644
index 0000000000..1aac90ce46
--- /dev/null
+++ b/barrier/DESCR
@@ -0,0 +1,7 @@
+Barrier is KVM software forked from Symless's synergy 1.9 codebase.
+Synergy was a commercialized reimplementation of the original CosmoSynergy
+written by Chris Schoeneman.
+
+Whereas synergy has moved beyond its goals from the 1.x era, barrier aims
+to maintain that simplicity. Barrier will let you use your keyboard and
+mouse from machine A to control machine B (or more). It's that simple.
diff --git a/barrier/Makefile b/barrier/Makefile
new file mode 100644
index 0000000000..12b3105d56
--- /dev/null
+++ b/barrier/Makefile
@@ -0,0 +1,55 @@
+# $NetBSD$
+
+GITHUB_PROJECT= barrier
+DISTNAME= v2.1.1
+PKGNAME= ${GITHUB_PROJECT}-${DISTNAME}
+CATEGORIES= net
+MASTER_SITES= ${MASTER_SITE_GITHUB:=debauchee/}
+DIST_SUBDIR= ${GITHUB_PROJECT}
+
+MAINTAINER= maya%NetBSD.org@localhost
+HOMEPAGE= https://github.com/debauchee/barrier/
+COMMENT= Let a user share a mouse and keyboard among computers
+LICENSE= gnu-gpl-v2
+
+WRKSRC= ${WRKDIR}/barrier-2.1.1
+USE_LANGUAGES= c c++11
+# Main configuration is CMake, but subdirectories are GNU configure.
+# We need to set GNU_CONFIGURE=yes for config.{guess,sub} overrides to kick in.
+# We override the do-configure target to prevent pkgsrc from running both
+# configuration mechanisms.
+USE_CMAKE= yes
+USE_CMAKE= yes
+GNU_CONFIGURE= yes
+
+CONFIG_SUB_OVERRIDE+= ext/gmock/build-aux/config.sub
+CONFIG_SUB_OVERRIDE+= ext/gtest/build-aux/config.sub
+CONFIG_GUESS_OVERRIDE+= ext/gmock/build-aux/config.guess
+CONFIG_GUESS_OVERRIDE+= ext/gtest/build-aux/config.guess
+
+USE_X11= yes
+
+.PHONY: do-configure
+do-configure: do-configure-cmake
+
+
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/${PKGBASE}
+
+EXAMPLES= MacReadme.txt org.barrier-foss.org.barrierc.plist \
+ org.barrier-foss.org.barriers.plist barrier.conf.example \
+ barrier.conf.example-advanced barrier.conf.example-basic
+
+do-install:
+.for p in barrierc barriers
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/${p} ${DESTDIR}${PREFIX}/bin/${p}
+ ${INSTALL_MAN} ${WRKSRC}/doc/${p}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${p}.1
+.endfor
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/barrier ${DESTDIR}${PREFIX}/bin/barrier
+.for f in ${EXAMPLES}
+ ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}
+.endfor
+
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../net/mDNSResponder/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/barrier/PLIST b/barrier/PLIST
new file mode 100644
index 0000000000..2e8e705bf6
--- /dev/null
+++ b/barrier/PLIST
@@ -0,0 +1,12 @@
+@comment $NetBSD$
+bin/barrier
+bin/barrierc
+bin/barriers
+man/man1/barrierc.1
+man/man1/barriers.1
+share/examples/barrier/MacReadme.txt
+share/examples/barrier/barrier.conf.example
+share/examples/barrier/barrier.conf.example-advanced
+share/examples/barrier/barrier.conf.example-basic
+share/examples/barrier/org.barrier-foss.org.barrierc.plist
+share/examples/barrier/org.barrier-foss.org.barriers.plist
diff --git a/barrier/distinfo b/barrier/distinfo
new file mode 100644
index 0000000000..910f71cc19
--- /dev/null
+++ b/barrier/distinfo
@@ -0,0 +1,15 @@
+$NetBSD$
+
+SHA1 (barrier/v2.1.1.tar.gz) = 99390e36f995321d2c9ad4ca2ee26e26dca88b8b
+RMD160 (barrier/v2.1.1.tar.gz) = 4b6e8bbe9ee7e7f8aad4d21602220720050e283b
+SHA512 (barrier/v2.1.1.tar.gz) = 668a19ba5fc2570e4eaf268f0754b894bce30008226f4cd36e182b748cbb08179d8867c7f882446f5f267c9064e12ea0dc7575e49996b4ba72bfcf396054edd8
+Size (barrier/v2.1.1.tar.gz) = 7229581 bytes
+SHA1 (patch-CMakeLists.txt) = 6066cb3d74d135a8a9e817f9f6cfe7e432e885ba
+SHA1 (patch-src_gui_CMakeLists.txt) = 6bf7547878c8d9d3e697e0407fa12e0545f4a2cf
+SHA1 (patch-src_gui_src_ActionDialog.cpp) = 017eeec39d195f2216d68f122fc471988a772442
+SHA1 (patch-src_gui_src_ScreenSetupView.cpp) = ed7be508ecfa6ce19f25072ec4559caf147f56a9
+SHA1 (patch-src_lib_arch_CMakeLists.txt) = 8d098c9e1a7fe4865acff32b9c1b38bd5e592342
+SHA1 (patch-tools_gmock-1.6.0_configure) = 0a3a23076b15858b79a8b3c2a9144ddaaad7ebe3
+SHA1 (patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h) = 70d0f775e952a67b2680c480f757e60eb183e5be
+SHA1 (patch-tools_gtest-1.6.0_configure) = df73a2566790e23501795af54f9c17324e7a6c83
+SHA1 (patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h) = ee496a203a5372a06a83a3d73d6d87b1b0c58157
diff --git a/barrier/patches/patch-CMakeLists.txt b/barrier/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..f8c060f498
--- /dev/null
+++ b/barrier/patches/patch-CMakeLists.txt
@@ -0,0 +1,102 @@
+$NetBSD$
+
+--- CMakeLists.txt.orig 2018-05-16 02:48:18.000000000 +0000
++++ CMakeLists.txt
+@@ -163,6 +163,8 @@ if (UNIX)
+ link_directories("/usr/local/lib")
+ endif()
+
++ find_package(X11 REQUIRED)
++
+ set (XKBlib "X11/Xlib.h;X11/XKBlib.h")
+ set (CMAKE_EXTRA_INCLUDE_FILES "${XKBlib};X11/extensions/Xrandr.h")
+ check_type_size ("XRRNotifyEvent" X11_EXTENSIONS_XRANDR_H)
+@@ -178,27 +180,17 @@ if (UNIX)
+ check_include_files ("X11/extensions/XInput2.h" HAVE_XI2)
+ check_include_files ("dns_sd.h" HAVE_DNSSD)
+
+- if (HAVE_X11_EXTENSIONS_DPMS_H)
++ if (X11_dpms_FOUND)
+ # Assume that function prototypes declared, when include exists.
+ set (HAVE_DPMS_PROTOTYPES 1)
+ endif()
+
+- if (NOT HAVE_X11_XKBLIB_H)
+- message (FATAL_ERROR "Missing header: " ${XKBlib})
+- endif()
+-
++ check_include_files ("dns_sd.h" HAVE_DNSSD)
+ if (NOT HAVE_DNSSD)
+ message (FATAL_ERROR "Missing header: dns_sd.h")
+ endif()
+
+- check_library_exists ("SM;ICE" IceConnectionNumber "" HAVE_ICE)
+- check_library_exists ("Xext;X11" DPMSQueryExtension "" HAVE_Xext)
+- check_library_exists ("Xtst;Xext;X11" XTestQueryExtension "" HAVE_Xtst)
+- check_library_exists ("Xinerama" XineramaQueryExtension "" HAVE_Xinerama)
+- check_library_exists ("Xi" XISelectEvents "" HAVE_Xi)
+- check_library_exists ("Xrandr" XRRQueryExtension "" HAVE_Xrandr)
+-
+- if (HAVE_ICE)
++ if (X11_ICE_FOUND)
+
+ # Assume we have SM if we have ICE.
+ set (HAVE_SM 1)
+@@ -206,39 +198,39 @@ if (UNIX)
+
+ endif()
+
+- if (HAVE_Xtst)
++ if (X11_XTest_FOUND)
+
+- # Xtxt depends on X11.
+- set (HAVE_X11 1)
+- list (APPEND libs Xtst X11)
++ message ("APPENDING ${X11_XTest_LIB}")
++ list (APPEND libs ${X11_XTest_LIB} X11)
+
+ else()
+
+- message (FATAL_ERROR "Missing library: Xtst")
++ message (FATAL_ERROR "Missing library: Xtest")
+
+ endif()
+
+- if (HAVE_Xext)
+- list (APPEND libs Xext)
++ if (X11_Xext_FOUND)
++ message ("APPENDING ${X11_Xext_LIB}")
++ list (APPEND libs ${X11_Xext_LIB})
+ endif()
+
+- if (HAVE_Xinerama)
+- list (APPEND libs Xinerama)
+- else (HAVE_Xinerama)
+- if (HAVE_X11_EXTENSIONS_XINERAMA_H)
+- set (HAVE_X11_EXTENSIONS_XINERAMA_H 0)
+- message (WARNING "Old Xinerama implementation detected, disabled")
+- endif()
++ if (X11_Xinerama_FOUND)
++ list (APPEND libs ${X11_Xinerama_LIB})
++ else (X11_Xinerama_FOUND)
++ set (HAVE_X11_EXTENSIONS_XINERAMA_H 0)
++ message (WARNING "No Xinerama implementation detected, disabled")
+ endif()
+
+- if (HAVE_Xrandr)
+- list (APPEND libs Xrandr)
++ if (X11_Xrandr_FOUND)
++ message ("APPENDING ${X11_Xrandr_LIB}")
++ list (APPEND libs ${X11_Xrandr_LIB})
+ endif()
+
+ # this was outside of the linux scope,
+ # not sure why, moving it back inside.
+- if (HAVE_Xi)
+- list (APPEND libs Xi)
++ if (X11_Xi_FOUND)
++ message ("APPENDING ${X11_Xi_FOUND}")
++ list (APPEND libs ${X11_Xi_LIB})
+ endif()
+
+ endif()
diff --git a/barrier/patches/patch-src_gui_CMakeLists.txt b/barrier/patches/patch-src_gui_CMakeLists.txt
new file mode 100644
index 0000000000..e5f030ff86
--- /dev/null
+++ b/barrier/patches/patch-src_gui_CMakeLists.txt
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/gui/CMakeLists.txt.orig 2018-05-16 02:48:18.000000000 +0000
++++ src/gui/CMakeLists.txt
+@@ -36,8 +36,7 @@ if (WIN32)
+ elseif (APPLE)
+ find_library(APPSERVICES_LIB ApplicationServices)
+ target_link_libraries(barrier ${APPSERVICES_LIB})
+-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR
+- ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
++else()
+ target_link_libraries (barrier dns_sd)
+ endif()
+
diff --git a/barrier/patches/patch-src_gui_src_ActionDialog.cpp b/barrier/patches/patch-src_gui_src_ActionDialog.cpp
new file mode 100644
index 0000000000..be217ac3dc
--- /dev/null
+++ b/barrier/patches/patch-src_gui_src_ActionDialog.cpp
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/gui/src/ActionDialog.cpp.orig 2018-05-16 02:48:18.000000000 +0000
++++ src/gui/src/ActionDialog.cpp
+@@ -23,6 +23,7 @@
+ #include "ServerConfig.h"
+ #include "KeySequence.h"
+
++#include <QButtonGroup>
+ #include <QtCore>
+ #include <QtGui>
+
diff --git a/barrier/patches/patch-src_gui_src_ScreenSetupView.cpp b/barrier/patches/patch-src_gui_src_ScreenSetupView.cpp
new file mode 100644
index 0000000000..edde58ecf0
--- /dev/null
+++ b/barrier/patches/patch-src_gui_src_ScreenSetupView.cpp
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/gui/src/ScreenSetupView.cpp.orig 2018-05-16 02:48:18.000000000 +0000
++++ src/gui/src/ScreenSetupView.cpp
+@@ -22,6 +22,7 @@
+
+ #include <QtCore>
+ #include <QtGui>
++#include <QHeaderView>
+
+ ScreenSetupView::ScreenSetupView(QWidget* parent) :
+ QTableView(parent)
diff --git a/barrier/patches/patch-src_lib_arch_CMakeLists.txt b/barrier/patches/patch-src_lib_arch_CMakeLists.txt
new file mode 100644
index 0000000000..fa1e53631b
--- /dev/null
+++ b/barrier/patches/patch-src_lib_arch_CMakeLists.txt
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/lib/arch/CMakeLists.txt.orig 2018-05-16 02:48:18.000000000 +0000
++++ src/lib/arch/CMakeLists.txt
+@@ -41,7 +41,5 @@ add_library(arch STATIC ${sources})
+
+ if (UNIX)
+ target_link_libraries(arch ${libs})
+- if (NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+- target_link_libraries(arch dl)
+- endif()
++ target_link_libraries(arch ${CMAKE_DL_LIBS})
+ endif()
diff --git a/barrier/patches/patch-tools_gmock-1.6.0_configure b/barrier/patches/patch-tools_gmock-1.6.0_configure
new file mode 100644
index 0000000000..96c42a27cc
--- /dev/null
+++ b/barrier/patches/patch-tools_gmock-1.6.0_configure
@@ -0,0 +1,24 @@
+$NetBSD: patch-tools_gmock-1.6.0_configure,v 1.3 2018/01/25 14:13:22 tnn Exp $
+
+Fix wrong usage of test(1).
+
+--- ext/gmock/configure.orig 2011-05-07 02:25:30.000000000 +0000
++++ ext/gmock/configure
+@@ -14896,7 +14896,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ have_pthreads="$acx_pthread_ok"
+ fi
+- if test "x$have_pthreads" == "xyes"; then
++ if test "x$have_pthreads" = "xyes"; then
+ HAVE_PTHREADS_TRUE=
+ HAVE_PTHREADS_FALSE='#'
+ else
+@@ -14926,7 +14926,7 @@ else
+ enable_external_gtest=yes
+ fi
+
+-if test "x$with_gtest" == "xno"; then :
++if test "x$with_gtest" = "xno"; then :
+ as_fn_error "Support for GoogleTest was explicitly disabled. Currently GoogleMock has a hard
+ dependency upon GoogleTest to build, please provide a version, or allow
+ GoogleMock to use any installed version and fall back upon its internal
diff --git a/barrier/patches/patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h b/barrier/patches/patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h
new file mode 100644
index 0000000000..9d901930eb
--- /dev/null
+++ b/barrier/patches/patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h,v 1.3 2018/01/25 14:13:22 tnn Exp $
+
+--- ext/gmock/include/gmock/internal/gmock-port.h.orig 2011-05-07 02:25:30.000000000 +0000
++++ ext/gmock/include/gmock/internal/gmock-port.h
+@@ -50,6 +50,14 @@
+ // tr1/tuple. gmock-port.h does this via gtest-port.h, which is
+ // guaranteed to pull in the tuple header.
+
++#if __cplusplus >= 201103L
++namespace std {
++ namespace tr1 {
++ using ::std::make_tuple;
++ }
++}
++#endif
++
+ // For MS Visual C++, check the compiler version. At least VS 2003 is
+ // required to compile Google Mock.
+ #if defined(_MSC_VER) && _MSC_VER < 1310
diff --git a/barrier/patches/patch-tools_gtest-1.6.0_configure b/barrier/patches/patch-tools_gtest-1.6.0_configure
new file mode 100644
index 0000000000..1545a28b12
--- /dev/null
+++ b/barrier/patches/patch-tools_gtest-1.6.0_configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-tools_gtest-1.6.0_configure,v 1.3 2018/01/25 14:13:22 tnn Exp $
+
+Fix wrong usage of test(1).
+
+--- ext/gtest/configure.orig 2011-05-07 02:25:30.000000000 +0000
++++ ext/gtest/configure
+@@ -14861,7 +14861,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ have_pthreads="$acx_pthread_ok"
+ fi
+- if test "x$have_pthreads" == "xyes"; then
++ if test "x$have_pthreads" = "xyes"; then
+ HAVE_PTHREADS_TRUE=
+ HAVE_PTHREADS_FALSE='#'
+ else
diff --git a/barrier/patches/patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h b/barrier/patches/patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h
new file mode 100644
index 0000000000..971dbf1d00
--- /dev/null
+++ b/barrier/patches/patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h
@@ -0,0 +1,21 @@
+$NetBSD: patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h,v 1.3 2018/01/25 14:13:22 tnn Exp $
+
+--- ext/gtest/include/gtest/internal/gtest-port.h.orig 2011-05-07 02:25:30.000000000 +0000
++++ ext/gtest/include/gtest/internal/gtest-port.h
+@@ -481,6 +481,16 @@
+ # define BOOST_TR1_DETAIL_CONFIG_HPP_INCLUDED
+ # include <tuple>
+
++# elif __cplusplus >= 201103L
++# include <tuple>
++namespace std {
++ namespace tr1 {
++ using ::std::tuple;
++ using ::std::tuple_element;
++ using ::std::tuple_size;
++ using ::std::get;
++ }
++}
+ # elif defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000)
+ // GCC 4.0+ implements tr1/tuple in the <tr1/tuple> header. This does
+ // not conform to the TR1 spec, which requires the header to be <tuple>.
Home |
Main Index |
Thread Index |
Old Index