Date: Saturday, September 14, 2019 @ 16:38:13 Author: anthraxx Revision: 510567
archrelease: copy trunk to community-x86_64 Added: synergy/repos/community-x86_64/PKGBUILD (from rev 510566, synergy/trunk/PKGBUILD) synergy/repos/community-x86_64/enable-test-build.patch (from rev 510566, synergy/trunk/enable-test-build.patch) synergy/repos/community-x86_64/fix-qt5_11-compatibility.patch (from rev 510566, synergy/trunk/fix-qt5_11-compatibility.patch) synergy/repos/community-x86_64/fix-test-build.patch (from rev 510566, synergy/trunk/fix-test-build.patch) synergy/repos/community-x86_64/synergys.service (from rev 510566, synergy/trunk/synergys.service) synergy/repos/community-x86_64/synergys.socket (from rev 510566, synergy/trunk/synergys.socket) synergy/repos/community-x86_64/use-system-libs.patch (from rev 510566, synergy/trunk/use-system-libs.patch) Deleted: synergy/repos/community-x86_64/PKGBUILD synergy/repos/community-x86_64/enable-test-build.patch synergy/repos/community-x86_64/fix-qt5_11-compatibility.patch synergy/repos/community-x86_64/fix-test-build.patch synergy/repos/community-x86_64/synergys.service synergy/repos/community-x86_64/synergys.socket synergy/repos/community-x86_64/use-system-libs.patch --------------------------------+ PKGBUILD | 182 ++++++++++++++++++------------------ enable-test-build.patch | 40 +++---- fix-qt5_11-compatibility.patch | 72 +++++++------- fix-test-build.patch | 154 +++++++++++++++--------------- synergys.service | 20 +-- synergys.socket | 18 +-- use-system-libs.patch | 196 +++++++++++++++++++-------------------- 7 files changed, 341 insertions(+), 341 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-09-14 16:38:05 UTC (rev 510566) +++ PKGBUILD 2019-09-14 16:38:13 UTC (rev 510567) @@ -1,91 +0,0 @@ -# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> -# Contributor: Sven-Hendrik Haase <s...@lutzhaase.com> -# Contributor: Jelle van der Waa <jelle vdwaa nl> -# Contributor: Stéphane Gaudreault <steph...@archlinux.org> -# Contributor: Dale Blount <d...@archlinux.org> -# Contributor: Michael Düll <m...@akurei.me> -# Contributor: Luca Corbatto <lucaatcorbatto.de> - -# I would just like to take a minute here and state that synergy is -# some of the worst packaged software ever. They BUNDLE a fucking -# zip for cryptopp and do not provide an option to use a system- -# installed version of that library. They change around paths every -# update and just generally don't seem to care much. -pkgname=synergy -pkgver=1.10.1 -pkgrel=1 -pkgdesc='Share a single mouse and keyboard between multiple computers' -url='https://symless.com/synergy/' -arch=('x86_64') -license=('GPL2') -depends=('gcc-libs' 'libxtst' 'libxinerama' 'libxkbcommon-x11' 'avahi' 'curl' 'openssl') -makedepends=('libxt' 'cmake' 'qt5-base' 'gmock' 'gtest') -optdepends=('qt5-base: gui support') -source=(synergy-${pkgver}.tar.gz::https://github.com/symless/synergy-core/archive/v${pkgver}-stable.tar.gz - use-system-libs.patch - fix-qt5_11-compatibility.patch - enable-test-build.patch - fix-test-build.patch - synergys.socket - synergys.service) -sha512sums=('33b298de3e7dacdd4d5c162840b8d0ddabd4127ed7cb04336f2d8dd1a8a9a69dc70c8959cb9086e56e65035cdacb7c743670479123711321283811eb3a823e6e' - '6ed5384ec46e991958f48051c66b87febfb457a748cea48909f87a088c804907f480f123620a0a5921e281ca9871e251de8b7dd5803ffe8566841f68f396c160' - 'b8347b803a7baaeeab75e55778314298fc69e15ccda154a8622b4697c3a3e7d6ba51cb156f06c6b289c41cb0892be7fed5ce49591531ed1ef18fa3a1ec8a7d6d' - '89b29994f238013393b90ad628d781ea6ea1d46c33819be561f031cc0790ef7f3860faaa2803e1459ed3c14affb749ea3bab6b15598c760424c8063195cb56a6' - '158d218faa8d8c33cbea935a9dcad4bcf79309eb485bfea107cd160f894d1090db6fea6e60827509b985ff9a7493020fc819e5e150bdac85f5547e755f3ad9ec' - 'f9c124533dfd0bbbb1b5036b7f4b06f7f86f69165e88b9146ff17798377119eb9f1a4666f3b2ee9840bc436558d715cdbfe2fdfd7624348fae64871f785a1a62' - '9663a11b915e10e60317e732a4d1191e8f8ff19176994c27dd20aa445daab7565bd624e5575c9c639d144293879fbe8376834a076723f778fd322ebd1c9f2029') - -prepare() { - cd synergy-core-${pkgver}-stable - mkdir build - - # get rid of shitty bundled gtest and gmock - patch -Np1 < "${srcdir}/use-system-libs.patch" - # fix the build with qt5.11 - # this is likely to be obsolete in future versions - # see: https://github.com/symless/synergy-core/pull/6359 - patch -Np1 < "${srcdir}/fix-qt5_11-compatibility.patch" - # enable building of test executables - patch -Np1 < "${srcdir}/enable-test-build.patch" - # fix building of test executables - patch -Np1 < "${srcdir}/fix-test-build.patch" - # remove tests that need working X - rm src/test/integtests/platform/XWindowsScreenTests.cpp \ - src/test/integtests/platform/XWindowsKeyStateTests.cpp -} - -build() { - cd synergy-core-${pkgver}-stable/build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. - make -} - -check() { - cd synergy-core-${pkgver}-stable/build - ./bin/unittests - ./bin/integtests -} - -package() { - cd synergy-core-${pkgver}-stable - - # install binary - install -Dm 755 build/bin/{synergy,synergyc,synergyd,synergys,syntool} -t "${pkgdir}/usr/bin" - - # install config - install -Dm 644 doc/${pkgname}.conf* -t "${pkgdir}/etc" - - # install manfiles - install -Dm 644 doc/${pkgname}c.man "${pkgdir}/usr/share/man/man1/${pkgname}c.1" - install -Dm 644 doc/${pkgname}s.man "${pkgdir}/usr/share/man/man1/${pkgname}s.1" - - # install systemd service and socket - install -Dm 644 "${srcdir}"/synergys.{service,socket} -t "${pkgdir}/usr/lib/systemd/user" - - # install desktop/icon stuff - install -Dm 644 res/synergy.ico -t "${pkgdir}/usr/share/icons" - install -Dm 644 res/synergy.desktop -t "${pkgdir}/usr/share/applications" -} - -# vim:set ts=2 sw=2 et: Copied: synergy/repos/community-x86_64/PKGBUILD (from rev 510566, synergy/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-09-14 16:38:13 UTC (rev 510567) @@ -0,0 +1,91 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Contributor: Sven-Hendrik Haase <s...@lutzhaase.com> +# Contributor: Jelle van der Waa <jelle vdwaa nl> +# Contributor: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: Dale Blount <d...@archlinux.org> +# Contributor: Michael Düll <m...@akurei.me> +# Contributor: Luca Corbatto <lucaatcorbatto.de> + +# I would just like to take a minute here and state that synergy is +# some of the worst packaged software ever. They BUNDLE a fucking +# zip for cryptopp and do not provide an option to use a system- +# installed version of that library. They change around paths every +# update and just generally don't seem to care much. +pkgname=synergy +pkgver=1.10.3 +pkgrel=1 +pkgdesc='Share a single mouse and keyboard between multiple computers' +url='https://symless.com/synergy/' +arch=('x86_64') +license=('GPL2') +depends=('gcc-libs' 'libxtst' 'libxinerama' 'libxkbcommon-x11' 'avahi' 'curl' 'openssl') +makedepends=('libxt' 'cmake' 'qt5-base' 'gmock' 'gtest') +optdepends=('qt5-base: gui support') +source=(synergy-${pkgver}.tar.gz::https://github.com/symless/synergy-core/archive/v${pkgver}-stable.tar.gz + use-system-libs.patch + fix-qt5_11-compatibility.patch + enable-test-build.patch + fix-test-build.patch + synergys.socket + synergys.service) +sha512sums=('01497fe362395dd9d26d44f7468ca5c01ee7cd2f590b6c28a67e094f969fdca3b8f78570cca4f188c16fc2575ca895daf8d6ffd07378964ed01da1540db05c8e' + '6ed5384ec46e991958f48051c66b87febfb457a748cea48909f87a088c804907f480f123620a0a5921e281ca9871e251de8b7dd5803ffe8566841f68f396c160' + 'b8347b803a7baaeeab75e55778314298fc69e15ccda154a8622b4697c3a3e7d6ba51cb156f06c6b289c41cb0892be7fed5ce49591531ed1ef18fa3a1ec8a7d6d' + '89b29994f238013393b90ad628d781ea6ea1d46c33819be561f031cc0790ef7f3860faaa2803e1459ed3c14affb749ea3bab6b15598c760424c8063195cb56a6' + '158d218faa8d8c33cbea935a9dcad4bcf79309eb485bfea107cd160f894d1090db6fea6e60827509b985ff9a7493020fc819e5e150bdac85f5547e755f3ad9ec' + 'f9c124533dfd0bbbb1b5036b7f4b06f7f86f69165e88b9146ff17798377119eb9f1a4666f3b2ee9840bc436558d715cdbfe2fdfd7624348fae64871f785a1a62' + '9663a11b915e10e60317e732a4d1191e8f8ff19176994c27dd20aa445daab7565bd624e5575c9c639d144293879fbe8376834a076723f778fd322ebd1c9f2029') + +prepare() { + cd synergy-core-${pkgver}-stable + mkdir build + + # get rid of shitty bundled gtest and gmock + patch -Np1 < "${srcdir}/use-system-libs.patch" + # fix the build with qt5.11 + # this is likely to be obsolete in future versions + # see: https://github.com/symless/synergy-core/pull/6359 + patch -Np1 < "${srcdir}/fix-qt5_11-compatibility.patch" + # enable building of test executables + patch -Np1 < "${srcdir}/enable-test-build.patch" + # fix building of test executables + patch -Np1 < "${srcdir}/fix-test-build.patch" + # remove tests that need working X + rm src/test/integtests/platform/XWindowsScreenTests.cpp \ + src/test/integtests/platform/XWindowsKeyStateTests.cpp +} + +build() { + cd synergy-core-${pkgver}-stable/build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. + make +} + +check() { + cd synergy-core-${pkgver}-stable/build + ./bin/unittests + ./bin/integtests +} + +package() { + cd synergy-core-${pkgver}-stable + + # install binary + install -Dm 755 build/bin/{synergy,synergyc,synergyd,synergys,syntool} -t "${pkgdir}/usr/bin" + + # install config + install -Dm 644 doc/${pkgname}.conf* -t "${pkgdir}/etc" + + # install manfiles + install -Dm 644 doc/${pkgname}c.man "${pkgdir}/usr/share/man/man1/${pkgname}c.1" + install -Dm 644 doc/${pkgname}s.man "${pkgdir}/usr/share/man/man1/${pkgname}s.1" + + # install systemd service and socket + install -Dm 644 "${srcdir}"/synergys.{service,socket} -t "${pkgdir}/usr/lib/systemd/user" + + # install desktop/icon stuff + install -Dm 644 res/synergy.ico -t "${pkgdir}/usr/share/icons" + install -Dm 644 res/synergy.desktop -t "${pkgdir}/usr/share/applications" +} + +# vim:set ts=2 sw=2 et: Deleted: enable-test-build.patch =================================================================== --- enable-test-build.patch 2019-09-14 16:38:05 UTC (rev 510566) +++ enable-test-build.patch 2019-09-14 16:38:13 UTC (rev 510567) @@ -1,20 +0,0 @@ -From 205c97288e43d9892ed88552862c1160f3a82fa8 Mon Sep 17 00:00:00 2001 -From: Luca Corbatto <l...@corbatto.de> -Date: Sun, 22 Jul 2018 16:26:05 +0200 -Subject: [PATCH 3/4] Adds tests - ---- - src/CMakeLists.txt | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index ab63a06..014f87b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -22,3 +22,4 @@ add_subdirectory(cmd) - if (SYNERGY_BUILD_LEGACY_GUI) - add_subdirectory(gui) - endif (SYNERGY_BUILD_LEGACY_GUI) -+add_subdirectory(test) --- -2.18.0 Copied: synergy/repos/community-x86_64/enable-test-build.patch (from rev 510566, synergy/trunk/enable-test-build.patch) =================================================================== --- enable-test-build.patch (rev 0) +++ enable-test-build.patch 2019-09-14 16:38:13 UTC (rev 510567) @@ -0,0 +1,20 @@ +From 205c97288e43d9892ed88552862c1160f3a82fa8 Mon Sep 17 00:00:00 2001 +From: Luca Corbatto <l...@corbatto.de> +Date: Sun, 22 Jul 2018 16:26:05 +0200 +Subject: [PATCH 3/4] Adds tests + +--- + src/CMakeLists.txt | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index ab63a06..014f87b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -22,3 +22,4 @@ add_subdirectory(cmd) + if (SYNERGY_BUILD_LEGACY_GUI) + add_subdirectory(gui) + endif (SYNERGY_BUILD_LEGACY_GUI) ++add_subdirectory(test) +-- +2.18.0 Deleted: fix-qt5_11-compatibility.patch =================================================================== --- fix-qt5_11-compatibility.patch 2019-09-14 16:38:05 UTC (rev 510566) +++ fix-qt5_11-compatibility.patch 2019-09-14 16:38:13 UTC (rev 510567) @@ -1,36 +0,0 @@ -From f5a22a4e514c02cdff2f6dd4ad20a7964ea67d0f Mon Sep 17 00:00:00 2001 -From: Luca Corbatto <l...@corbatto.de> -Date: Sun, 22 Jul 2018 16:03:39 +0200 -Subject: [PATCH 2/4] Fixes build on qt 5.1Fixes build on qt 5.11 - ---- - src/gui/src/ActionDialog.h | 5 +++-- - src/gui/src/ScreenSetupView.h | 6 +++--- - 2 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/src/gui/src/ActionDialog.h b/src/gui/src/ActionDialog.h -index 34e4e85..7cd5a1a 100644 ---- a/src/gui/src/ActionDialog.h -+++ b/src/gui/src/ActionDialog.h -@@ -21,6 +21,7 @@ - #define ACTIONDIALOG_H - - #include <QDialog> -+#include <QButtonGroup> - - #include "ui_ActionDialogBase.h" - -diff --git a/src/gui/src/ScreenSetupView.h b/src/gui/src/ScreenSetupView.h -index 38eae2a..1a41091 100644 ---- a/src/gui/src/ScreenSetupView.h -+++ b/src/gui/src/ScreenSetupView.h -@@ -22,6 +22,7 @@ - - #include <QTableView> - #include <QFlags> -+#include <QHeaderView> - - #include "Screen.h" - --- -2.18.0 Copied: synergy/repos/community-x86_64/fix-qt5_11-compatibility.patch (from rev 510566, synergy/trunk/fix-qt5_11-compatibility.patch) =================================================================== --- fix-qt5_11-compatibility.patch (rev 0) +++ fix-qt5_11-compatibility.patch 2019-09-14 16:38:13 UTC (rev 510567) @@ -0,0 +1,36 @@ +From f5a22a4e514c02cdff2f6dd4ad20a7964ea67d0f Mon Sep 17 00:00:00 2001 +From: Luca Corbatto <l...@corbatto.de> +Date: Sun, 22 Jul 2018 16:03:39 +0200 +Subject: [PATCH 2/4] Fixes build on qt 5.1Fixes build on qt 5.11 + +--- + src/gui/src/ActionDialog.h | 5 +++-- + src/gui/src/ScreenSetupView.h | 6 +++--- + 2 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/src/gui/src/ActionDialog.h b/src/gui/src/ActionDialog.h +index 34e4e85..7cd5a1a 100644 +--- a/src/gui/src/ActionDialog.h ++++ b/src/gui/src/ActionDialog.h +@@ -21,6 +21,7 @@ + #define ACTIONDIALOG_H + + #include <QDialog> ++#include <QButtonGroup> + + #include "ui_ActionDialogBase.h" + +diff --git a/src/gui/src/ScreenSetupView.h b/src/gui/src/ScreenSetupView.h +index 38eae2a..1a41091 100644 +--- a/src/gui/src/ScreenSetupView.h ++++ b/src/gui/src/ScreenSetupView.h +@@ -22,6 +22,7 @@ + + #include <QTableView> + #include <QFlags> ++#include <QHeaderView> + + #include "Screen.h" + +-- +2.18.0 Deleted: fix-test-build.patch =================================================================== --- fix-test-build.patch 2019-09-14 16:38:05 UTC (rev 510566) +++ fix-test-build.patch 2019-09-14 16:38:13 UTC (rev 510567) @@ -1,77 +0,0 @@ -From eedc5ba0dbe901574a9031de1d3c43ef0e417c28 Mon Sep 17 00:00:00 2001 -From: Luca Corbatto <l...@corbatto.de> -Date: Sun, 22 Jul 2018 16:26:30 +0200 -Subject: [PATCH 4/4] Makes tests compilable - ---- - src/test/integtests/CMakeLists.txt | 2 +- - .../integtests/arch/ArchInternetTests.cpp | 37 ------------------- - src/test/unittests/CMakeLists.txt | 2 +- - 3 files changed, 2 insertions(+), 39 deletions(-) - delete mode 100644 src/test/integtests/arch/ArchInternetTests.cpp - -diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt -index e71499a..24c3891 100644 ---- a/src/test/integtests/CMakeLists.txt -+++ b/src/test/integtests/CMakeLists.txt -@@ -68,4 +68,4 @@ endif() - - add_executable(integtests ${sources}) - target_link_libraries(integtests -- arch base client common io ipc mt net platform server synergy gtest gmock ${libs} ${OPENSSL_LIBS}) -+arch base client common io ipc mt net platform server shared gtest gmock ${libs} ${OPENSSL_LIBS}) -diff --git a/src/test/integtests/arch/ArchInternetTests.cpp b/src/test/integtests/arch/ArchInternetTests.cpp -deleted file mode 100644 -index 95823e9..0000000 ---- a/src/test/integtests/arch/ArchInternetTests.cpp -+++ /dev/null -@@ -1,37 +0,0 @@ --/* -- * synergy -- mouse and keyboard sharing utility -- * Copyright (C) 2014-2016 Symless Ltd. -- * -- * This package is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License -- * found in the file LICENSE that should have accompanied this file. -- * -- * This package is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program. If not, see <http://www.gnu.org/licenses/>. -- */ -- --#include "arch/Arch.h" -- --#include "test/global/gtest.h" -- --#define TEST_URL "https://symless.com/tests/?testString" --//#define TEST_URL "http://localhost/synergy/tests/?testString" -- --TEST(ArchInternetTests, get) --{ -- ARCH_INTERNET internet; -- String result = internet.get(TEST_URL); -- ASSERT_EQ("Hello world!", result); --} -- --TEST(ArchInternetTests, urlEncode) --{ -- ARCH_INTERNET internet; -- String result = internet.urlEncode("hello=+&world"); -- ASSERT_EQ("hello%3D%2B%26world", result); --} -diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt -index 9806be9..c6958c5 100644 ---- a/src/test/unittests/CMakeLists.txt -+++ b/src/test/unittests/CMakeLists.txt -@@ -68,4 +68,4 @@ endif() - - add_executable(unittests ${sources}) - target_link_libraries(unittests -- arch base client server common io net platform server synergy mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS}) -+arch base client server common io net platform server mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS}) --- -2.18.0 Copied: synergy/repos/community-x86_64/fix-test-build.patch (from rev 510566, synergy/trunk/fix-test-build.patch) =================================================================== --- fix-test-build.patch (rev 0) +++ fix-test-build.patch 2019-09-14 16:38:13 UTC (rev 510567) @@ -0,0 +1,77 @@ +From eedc5ba0dbe901574a9031de1d3c43ef0e417c28 Mon Sep 17 00:00:00 2001 +From: Luca Corbatto <l...@corbatto.de> +Date: Sun, 22 Jul 2018 16:26:30 +0200 +Subject: [PATCH 4/4] Makes tests compilable + +--- + src/test/integtests/CMakeLists.txt | 2 +- + .../integtests/arch/ArchInternetTests.cpp | 37 ------------------- + src/test/unittests/CMakeLists.txt | 2 +- + 3 files changed, 2 insertions(+), 39 deletions(-) + delete mode 100644 src/test/integtests/arch/ArchInternetTests.cpp + +diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt +index e71499a..24c3891 100644 +--- a/src/test/integtests/CMakeLists.txt ++++ b/src/test/integtests/CMakeLists.txt +@@ -68,4 +68,4 @@ endif() + + add_executable(integtests ${sources}) + target_link_libraries(integtests +- arch base client common io ipc mt net platform server synergy gtest gmock ${libs} ${OPENSSL_LIBS}) ++arch base client common io ipc mt net platform server shared gtest gmock ${libs} ${OPENSSL_LIBS}) +diff --git a/src/test/integtests/arch/ArchInternetTests.cpp b/src/test/integtests/arch/ArchInternetTests.cpp +deleted file mode 100644 +index 95823e9..0000000 +--- a/src/test/integtests/arch/ArchInternetTests.cpp ++++ /dev/null +@@ -1,37 +0,0 @@ +-/* +- * synergy -- mouse and keyboard sharing utility +- * Copyright (C) 2014-2016 Symless Ltd. +- * +- * This package is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public License +- * found in the file LICENSE that should have accompanied this file. +- * +- * This package is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program. If not, see <http://www.gnu.org/licenses/>. +- */ +- +-#include "arch/Arch.h" +- +-#include "test/global/gtest.h" +- +-#define TEST_URL "https://symless.com/tests/?testString" +-//#define TEST_URL "http://localhost/synergy/tests/?testString" +- +-TEST(ArchInternetTests, get) +-{ +- ARCH_INTERNET internet; +- String result = internet.get(TEST_URL); +- ASSERT_EQ("Hello world!", result); +-} +- +-TEST(ArchInternetTests, urlEncode) +-{ +- ARCH_INTERNET internet; +- String result = internet.urlEncode("hello=+&world"); +- ASSERT_EQ("hello%3D%2B%26world", result); +-} +diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt +index 9806be9..c6958c5 100644 +--- a/src/test/unittests/CMakeLists.txt ++++ b/src/test/unittests/CMakeLists.txt +@@ -68,4 +68,4 @@ endif() + + add_executable(unittests ${sources}) + target_link_libraries(unittests +- arch base client server common io net platform server synergy mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS}) ++arch base client server common io net platform server mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS}) +-- +2.18.0 Deleted: synergys.service =================================================================== --- synergys.service 2019-09-14 16:38:05 UTC (rev 510566) +++ synergys.service 2019-09-14 16:38:13 UTC (rev 510567) @@ -1,10 +0,0 @@ -[Unit] -Description=Synergy Server Daemon -After=network.target - -[Service] -ExecStart=/usr/bin/synergys --no-daemon --config /etc/synergy.conf -Restart=on-failure - -[Install] -WantedBy=default.target Copied: synergy/repos/community-x86_64/synergys.service (from rev 510566, synergy/trunk/synergys.service) =================================================================== --- synergys.service (rev 0) +++ synergys.service 2019-09-14 16:38:13 UTC (rev 510567) @@ -0,0 +1,10 @@ +[Unit] +Description=Synergy Server Daemon +After=network.target + +[Service] +ExecStart=/usr/bin/synergys --no-daemon --config /etc/synergy.conf +Restart=on-failure + +[Install] +WantedBy=default.target Deleted: synergys.socket =================================================================== --- synergys.socket 2019-09-14 16:38:05 UTC (rev 510566) +++ synergys.socket 2019-09-14 16:38:13 UTC (rev 510567) @@ -1,9 +0,0 @@ -[Unit] -Conflicts=synergys@.service - -[Socket] -ListenStream=24800 -Accept=false - -[Install] -WantedBy=sockets.target Copied: synergy/repos/community-x86_64/synergys.socket (from rev 510566, synergy/trunk/synergys.socket) =================================================================== --- synergys.socket (rev 0) +++ synergys.socket 2019-09-14 16:38:13 UTC (rev 510567) @@ -0,0 +1,9 @@ +[Unit] +Conflicts=synergys@.service + +[Socket] +ListenStream=24800 +Accept=false + +[Install] +WantedBy=sockets.target Deleted: use-system-libs.patch =================================================================== --- use-system-libs.patch 2019-09-14 16:38:05 UTC (rev 510566) +++ use-system-libs.patch 2019-09-14 16:38:13 UTC (rev 510567) @@ -1,98 +0,0 @@ -From f013182f0bfee54cc1c22740302be84acc380fda Mon Sep 17 00:00:00 2001 -From: Luca Corbatto <l...@corbatto.de> -Date: Sun, 22 Jul 2018 09:17:58 +0200 -Subject: [PATCH 1/4] Fixes bundled libs - ---- - CMakeLists.txt | 4 ++-- - src/test/CMakeLists.txt | 18 +++++++++--------- - src/test/integtests/CMakeLists.txt | 8 ++++---- - src/test/unittests/CMakeLists.txt | 10 +++++----- - 4 files changed, 20 insertions(+), 20 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 35bbfab..eaf8ab6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -56,7 +56,7 @@ else() - endif() - - set (libs) --include_directories (BEFORE SYSTEM ./ext/gtest/include) -+include_directories (BEFORE SYSTEM /usr/include/gtest) - - if (UNIX) - if (NOT APPLE) -diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt -index 1f78ae0..b62f30c 100644 ---- a/src/test/CMakeLists.txt -+++ b/src/test/CMakeLists.txt -@@ -1,11 +1,11 @@ - # synergy -- mouse and keyboard sharing utility - # Copyright (C) 2012-2016 Symless Ltd. - # Copyright (C) 2011 Nick Bolton --# -+# - # This package is free software; you can redistribute it and/or - # modify it under the terms of the GNU General Public License - # found in the file LICENSE that should have accompanied this file. --# -+# - # This package is distributed in the hope that it will be useful, - # but WITHOUT ANY WARRANTY; without even the implied warranty of - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -@@ -15,13 +15,13 @@ - # along with this program. If not, see <http://www.gnu.org/licenses/>. - - include_directories( -- ../../ext/gtest -- ../../ext/gtest/include -- ../../ext/gmock -- ../../ext/gmock/include) -- --add_library(gtest STATIC ../../ext/gtest/src/gtest-all.cc) --add_library(gmock STATIC ../../ext/gmock/src/gmock-all.cc) -+ /usr/src/gtest -+ /usr/include/gtest -+ /usr/src/gmock -+ /usr/include/gmock) -+ -+add_library(gtest STATIC /usr/src/gtest/src/gtest-all.cc) -+add_library(gmock STATIC /usr/src/gmock/gmock-all.cc) - - if (UNIX) - # ignore warnings in gtest and gmock -diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt -index f39968a..e71499a 100644 ---- a/src/test/integtests/CMakeLists.txt -+++ b/src/test/integtests/CMakeLists.txt -@@ -56,8 +56,8 @@ endif() - include_directories( - ../../ - ../../lib/ -- ../../../ext/gtest/include -- ../../../ext/gmock/include -+ /usr/include/gtest -+ /usr/include/gmock - ) - - if (UNIX) -diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt -index 54131eb..9806be9 100644 ---- a/src/test/unittests/CMakeLists.txt -+++ b/src/test/unittests/CMakeLists.txt -@@ -51,9 +51,9 @@ list(APPEND headers ${platform_sources}) - include_directories( - ../../ - ../../lib/ -- ../../../ext/gtest/include -- ../../../ext/gmock/include -- ../../../ext -+ /usr/include/gtest -+ /usr/include/gmock -+ /usr/include - ) - - if (UNIX) --- -2.18.0 Copied: synergy/repos/community-x86_64/use-system-libs.patch (from rev 510566, synergy/trunk/use-system-libs.patch) =================================================================== --- use-system-libs.patch (rev 0) +++ use-system-libs.patch 2019-09-14 16:38:13 UTC (rev 510567) @@ -0,0 +1,98 @@ +From f013182f0bfee54cc1c22740302be84acc380fda Mon Sep 17 00:00:00 2001 +From: Luca Corbatto <l...@corbatto.de> +Date: Sun, 22 Jul 2018 09:17:58 +0200 +Subject: [PATCH 1/4] Fixes bundled libs + +--- + CMakeLists.txt | 4 ++-- + src/test/CMakeLists.txt | 18 +++++++++--------- + src/test/integtests/CMakeLists.txt | 8 ++++---- + src/test/unittests/CMakeLists.txt | 10 +++++----- + 4 files changed, 20 insertions(+), 20 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 35bbfab..eaf8ab6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -56,7 +56,7 @@ else() + endif() + + set (libs) +-include_directories (BEFORE SYSTEM ./ext/gtest/include) ++include_directories (BEFORE SYSTEM /usr/include/gtest) + + if (UNIX) + if (NOT APPLE) +diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt +index 1f78ae0..b62f30c 100644 +--- a/src/test/CMakeLists.txt ++++ b/src/test/CMakeLists.txt +@@ -1,11 +1,11 @@ + # synergy -- mouse and keyboard sharing utility + # Copyright (C) 2012-2016 Symless Ltd. + # Copyright (C) 2011 Nick Bolton +-# ++# + # This package is free software; you can redistribute it and/or + # modify it under the terms of the GNU General Public License + # found in the file LICENSE that should have accompanied this file. +-# ++# + # This package is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +@@ -15,13 +15,13 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + + include_directories( +- ../../ext/gtest +- ../../ext/gtest/include +- ../../ext/gmock +- ../../ext/gmock/include) +- +-add_library(gtest STATIC ../../ext/gtest/src/gtest-all.cc) +-add_library(gmock STATIC ../../ext/gmock/src/gmock-all.cc) ++ /usr/src/gtest ++ /usr/include/gtest ++ /usr/src/gmock ++ /usr/include/gmock) ++ ++add_library(gtest STATIC /usr/src/gtest/src/gtest-all.cc) ++add_library(gmock STATIC /usr/src/gmock/gmock-all.cc) + + if (UNIX) + # ignore warnings in gtest and gmock +diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt +index f39968a..e71499a 100644 +--- a/src/test/integtests/CMakeLists.txt ++++ b/src/test/integtests/CMakeLists.txt +@@ -56,8 +56,8 @@ endif() + include_directories( + ../../ + ../../lib/ +- ../../../ext/gtest/include +- ../../../ext/gmock/include ++ /usr/include/gtest ++ /usr/include/gmock + ) + + if (UNIX) +diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt +index 54131eb..9806be9 100644 +--- a/src/test/unittests/CMakeLists.txt ++++ b/src/test/unittests/CMakeLists.txt +@@ -51,9 +51,9 @@ list(APPEND headers ${platform_sources}) + include_directories( + ../../ + ../../lib/ +- ../../../ext/gtest/include +- ../../../ext/gmock/include +- ../../../ext ++ /usr/include/gtest ++ /usr/include/gmock ++ /usr/include + ) + + if (UNIX) +-- +2.18.0