Date: Wednesday, October 12, 2016 @ 22:10:51 Author: anthraxx Revision: 192100
archrelease: copy trunk to community-i686, community-x86_64 Added: synergy/repos/community-i686/PKGBUILD (from rev 192099, synergy/trunk/PKGBUILD) synergy/repos/community-i686/synergys.service (from rev 192099, synergy/trunk/synergys.service) synergy/repos/community-i686/synergys.socket (from rev 192099, synergy/trunk/synergys.socket) synergy/repos/community-i686/system-gtest.patch (from rev 192099, synergy/trunk/system-gtest.patch) synergy/repos/community-x86_64/PKGBUILD (from rev 192099, synergy/trunk/PKGBUILD) synergy/repos/community-x86_64/synergys.service (from rev 192099, synergy/trunk/synergys.service) synergy/repos/community-x86_64/synergys.socket (from rev 192099, synergy/trunk/synergys.socket) synergy/repos/community-x86_64/system-gtest.patch (from rev 192099, synergy/trunk/system-gtest.patch) Deleted: synergy/repos/community-i686/PKGBUILD synergy/repos/community-i686/synergys.service synergy/repos/community-i686/synergys.socket synergy/repos/community-i686/system-gtest.patch synergy/repos/community-i686/wrapper synergy/repos/community-x86_64/PKGBUILD synergy/repos/community-x86_64/synergys.service synergy/repos/community-x86_64/synergys.socket synergy/repos/community-x86_64/system-gtest.patch synergy/repos/community-x86_64/wrapper -------------------------------------+ /PKGBUILD | 166 +++++++++++++++++++++++++ /synergys.service | 20 +++ /synergys.socket | 18 ++ /system-gtest.patch | 220 ++++++++++++++++++++++++++++++++++ community-i686/PKGBUILD | 104 ---------------- community-i686/synergys.service | 10 - community-i686/synergys.socket | 9 - community-i686/system-gtest.patch | 110 ----------------- community-i686/wrapper | 4 community-x86_64/PKGBUILD | 104 ---------------- community-x86_64/synergys.service | 10 - community-x86_64/synergys.socket | 9 - community-x86_64/system-gtest.patch | 110 ----------------- community-x86_64/wrapper | 4 14 files changed, 424 insertions(+), 474 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-10-12 22:10:22 UTC (rev 192099) +++ community-i686/PKGBUILD 2016-10-12 22:10:51 UTC (rev 192100) @@ -1,104 +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> - -# 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.8.3 -pkgrel=1 -pkgdesc='Share a single mouse and keyboard between multiple computers' -url='http://synergy-foss.org' -arch=('i686' 'x86_64') -license=('GPL2') -depends=('gcc-libs' 'libxtst' 'libxinerama' 'libxkbcommon-x11' 'avahi' 'curl') -makedepends=('libxt' 'cmake' 'qt5-base' 'gmock' 'gtest') -optdepends=('qt5-base: gui support' - 'openssl: encryption support') -source=(synergy-${pkgver}.tar.gz::https://github.com/symless/synergy/archive/v${pkgver}-stable.tar.gz - system-gtest.patch - synergys.socket - synergys.service - wrapper) -sha512sums=('a5e51e68a16b4e84d916aa54f03925c9db0df70b80c586d020c599f9685d820f097dd6519e07ad31704e769dd9072eb79f0f95465a12890a8caca44d0fac0688' - '4bef039f59b565d08079a8187df76f9773cfddeb81376ccc42f5570049389f114559721ed7b0464c4a4d1431ba72a736b11755573019583d0075d9da08c03ed2' - 'f9c124533dfd0bbbb1b5036b7f4b06f7f86f69165e88b9146ff17798377119eb9f1a4666f3b2ee9840bc436558d715cdbfe2fdfd7624348fae64871f785a1a62' - '9663a11b915e10e60317e732a4d1191e8f8ff19176994c27dd20aa445daab7565bd624e5575c9c639d144293879fbe8376834a076723f778fd322ebd1c9f2029' - 'a2e126ad3ac53fb855a331134982f86ef81ffc75b73e73b242e6f854fe7e2daec160fac2161acdc7020cd7f57ae0a8826ac7a249ad10b03db614ada0062b3e93') - -prepare() { - cd synergy-${pkgver}-stable - mkdir build - # get rid of shitty bundled gtest and gmock - patch -p1 < "${srcdir}/system-gtest.patch" -} - -build() { - cd synergy-${pkgver}-stable - - msg2 "Building core..." - (cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. - # unittests don't pass with optimization (segfault on nullptr) - sed 's|\-O2|\-O0|g' -i src/test/unittests/CMakeFiles/unittests.dir/{flags.make,link.txt} - make - ) - - msg2 "Building GUI..." - (cd src/gui - qmake - make - ) -} - -check() { - cd synergy-${pkgver}-stable - ./bin/unittests -} - -package() { - cd synergy-${pkgver}-stable - - # install binary - install -Dm 755 bin/synergy "${pkgdir}/usr/lib/synergy/synergy" - install -Dm 755 bin/synergyc "${pkgdir}/usr/lib/synergy/synergyc" - install -Dm 755 bin/synergyd "${pkgdir}/usr/lib/synergy/synergyd" - install -Dm 755 bin/synergys "${pkgdir}/usr/lib/synergy/synergys" - install -Dm 755 bin/syntool "${pkgdir}/usr/lib/synergy/syntool" - install -Dm 755 bin/usynergy "${pkgdir}/usr/lib/synergy/usynergy" - - # unfuck wrapper - install -Dm 755 "${srcdir}/wrapper" "${pkgdir}/usr/lib/synergy/wrapper" - install -d "${pkgdir}/usr/bin" - ln -sf /usr/lib/synergy/wrapper "${pkgdir}/usr/bin/synergy" - ln -sf /usr/lib/synergy/wrapper "${pkgdir}/usr/bin/synergyc" - ln -sf /usr/lib/synergy/wrapper "${pkgdir}/usr/bin/synergyd" - ln -sf /usr/lib/synergy/wrapper "${pkgdir}/usr/bin/synergys" - ln -sf /usr/lib/synergy/wrapper "${pkgdir}/usr/bin/syntool" - ln -sf /usr/lib/synergy/wrapper "${pkgdir}/usr/bin/usynergy" - - # plugin - install -Dm 755 bin/plugins/libns.so "${pkgdir}/usr/lib/${pkgname}/libns.so" - - # 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-i686/PKGBUILD (from rev 192099, synergy/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-10-12 22:10:51 UTC (rev 192100) @@ -0,0 +1,83 @@ +# 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> + +# 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.8.4 +pkgrel=1 +pkgdesc='Share a single mouse and keyboard between multiple computers' +url='http://synergy-foss.org' +arch=('i686' '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/archive/v${pkgver}-stable.tar.gz + system-gtest.patch + synergys.socket + synergys.service) +sha512sums=('7d01138a0481662c5d78bec0a6cacadeb5927a9ea283adb6a63d9c7ab0d97a39484b5ede5f70fe4fbc7a5a296caa581e81cddeddb82687c379686f469ab3b584' + '4bef039f59b565d08079a8187df76f9773cfddeb81376ccc42f5570049389f114559721ed7b0464c4a4d1431ba72a736b11755573019583d0075d9da08c03ed2' + 'f9c124533dfd0bbbb1b5036b7f4b06f7f86f69165e88b9146ff17798377119eb9f1a4666f3b2ee9840bc436558d715cdbfe2fdfd7624348fae64871f785a1a62' + '9663a11b915e10e60317e732a4d1191e8f8ff19176994c27dd20aa445daab7565bd624e5575c9c639d144293879fbe8376834a076723f778fd322ebd1c9f2029') + +prepare() { + cd synergy-${pkgver}-stable + mkdir build + # get rid of shitty bundled gtest and gmock + patch -p1 < "${srcdir}/system-gtest.patch" +} + +build() { + cd synergy-${pkgver}-stable + + msg2 "Building core..." + (cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. + # unittests don't pass with optimization (segfault on nullptr) + sed 's|\-O2|\-O0|g' -i src/test/unittests/CMakeFiles/unittests.dir/{flags.make,link.txt} + make + ) + + msg2 "Building GUI..." + (cd src/gui + qmake + make + ) +} + +check() { + cd synergy-${pkgver}-stable + ./bin/unittests +} + +package() { + cd synergy-${pkgver}-stable + + # install binary + install -Dm 755 bin/{synergy,synergyc,synergyd,synergys,syntool,usynergy} -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: community-i686/synergys.service =================================================================== --- community-i686/synergys.service 2016-10-12 22:10:22 UTC (rev 192099) +++ community-i686/synergys.service 2016-10-12 22:10:51 UTC (rev 192100) @@ -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-i686/synergys.service (from rev 192099, synergy/trunk/synergys.service) =================================================================== --- community-i686/synergys.service (rev 0) +++ community-i686/synergys.service 2016-10-12 22:10:51 UTC (rev 192100) @@ -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: community-i686/synergys.socket =================================================================== --- community-i686/synergys.socket 2016-10-12 22:10:22 UTC (rev 192099) +++ community-i686/synergys.socket 2016-10-12 22:10:51 UTC (rev 192100) @@ -1,9 +0,0 @@ -[Unit] -Conflicts=synergys@.service - -[Socket] -ListenStream=24800 -Accept=false - -[Install] -WantedBy=sockets.target Copied: synergy/repos/community-i686/synergys.socket (from rev 192099, synergy/trunk/synergys.socket) =================================================================== --- community-i686/synergys.socket (rev 0) +++ community-i686/synergys.socket 2016-10-12 22:10:51 UTC (rev 192100) @@ -0,0 +1,9 @@ +[Unit] +Conflicts=synergys@.service + +[Socket] +ListenStream=24800 +Accept=false + +[Install] +WantedBy=sockets.target Deleted: community-i686/system-gtest.patch =================================================================== --- community-i686/system-gtest.patch 2016-10-12 22:10:22 UTC (rev 192099) +++ community-i686/system-gtest.patch 2016-10-12 22:10:51 UTC (rev 192100) @@ -1,110 +0,0 @@ -From e391e1286d80fa2e38c2440bc2266a0fd7bd37ca Mon Sep 17 00:00:00 2001 -From: anthraxx <leve...@leventepolyak.net> -Date: Thu, 29 Sep 2016 02:04:41 +0200 -Subject: [PATCH] using system gtest and gmock - ---- - src/lib/platform/CMakeLists.txt | 2 +- - src/lib/server/CMakeLists.txt | 2 +- - src/lib/synergy/CMakeLists.txt | 2 +- - src/test/CMakeLists.txt | 12 ++++++------ - src/test/integtests/CMakeLists.txt | 4 ++-- - src/test/unittests/CMakeLists.txt | 4 ++-- - 6 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt -index 6c272c2..09ddf26 100644 ---- a/src/lib/platform/CMakeLists.txt -+++ b/src/lib/platform/CMakeLists.txt -@@ -31,7 +31,7 @@ endif() - - include_directories( - ../ -- ../../../ext/gtest-1.6.0/include -+ /usr/include/gtest - ) - - if (UNIX) -diff --git a/src/lib/server/CMakeLists.txt b/src/lib/server/CMakeLists.txt -index 2c34af0..f7df650 100644 ---- a/src/lib/server/CMakeLists.txt -+++ b/src/lib/server/CMakeLists.txt -@@ -24,7 +24,7 @@ endif() - include_directories( - ../ - ../../../ext -- ../../../ext/gtest-1.6.0/include -+ /usr/include/gtest - ) - - if (UNIX) -diff --git a/src/lib/synergy/CMakeLists.txt b/src/lib/synergy/CMakeLists.txt -index 0972be8..619709f 100644 ---- a/src/lib/synergy/CMakeLists.txt -+++ b/src/lib/synergy/CMakeLists.txt -@@ -36,7 +36,7 @@ endif() - include_directories( - ../ - ../../../ext -- ../../../ext/gtest-1.6.0/include -+ /usr/include/gtest - ) - - if (UNIX) -diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt -index 8812150..5d38156 100644 ---- a/src/test/CMakeLists.txt -+++ b/src/test/CMakeLists.txt -@@ -15,13 +15,13 @@ - # along with this program. If not, see <http://www.gnu.org/licenses/>. - - include_directories( -- ../../ext/gtest-1.6.0 -- ../../ext/gtest-1.6.0/include -- ../../ext/gmock-1.6.0 -- ../../ext/gmock-1.6.0/include) -+ /usr/incude/gtest -+ /usr/src/gtest -+ /usr/include/gmock -+ /usr/src/gmock) - --add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc) --add_library(gmock STATIC ../../ext/gmock-1.6.0/src/gmock-all.cc) -+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 bde35c2..dc4f202 100644 ---- a/src/test/integtests/CMakeLists.txt -+++ b/src/test/integtests/CMakeLists.txt -@@ -56,8 +56,8 @@ endif() - include_directories( - ../../ - ../../lib/ -- ../../../ext/gtest-1.6.0/include -- ../../../ext/gmock-1.6.0/include -+ /usr/include/gtest -+ /usr/include/gmock - ) - - if (UNIX) -diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt -index 4cacdf9..f0a8dbe 100644 ---- a/src/test/unittests/CMakeLists.txt -+++ b/src/test/unittests/CMakeLists.txt -@@ -51,8 +51,8 @@ list(APPEND headers ${platform_sources}) - include_directories( - ../../ - ../../lib/ -- ../../../ext/gtest-1.6.0/include -- ../../../ext/gmock-1.6.0/include -+ /usr/include/gtest -+ /usr/include/gmock - ../../../ext - ) - --- -2.10.0 - Copied: synergy/repos/community-i686/system-gtest.patch (from rev 192099, synergy/trunk/system-gtest.patch) =================================================================== --- community-i686/system-gtest.patch (rev 0) +++ community-i686/system-gtest.patch 2016-10-12 22:10:51 UTC (rev 192100) @@ -0,0 +1,110 @@ +From e391e1286d80fa2e38c2440bc2266a0fd7bd37ca Mon Sep 17 00:00:00 2001 +From: anthraxx <leve...@leventepolyak.net> +Date: Thu, 29 Sep 2016 02:04:41 +0200 +Subject: [PATCH] using system gtest and gmock + +--- + src/lib/platform/CMakeLists.txt | 2 +- + src/lib/server/CMakeLists.txt | 2 +- + src/lib/synergy/CMakeLists.txt | 2 +- + src/test/CMakeLists.txt | 12 ++++++------ + src/test/integtests/CMakeLists.txt | 4 ++-- + src/test/unittests/CMakeLists.txt | 4 ++-- + 6 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt +index 6c272c2..09ddf26 100644 +--- a/src/lib/platform/CMakeLists.txt ++++ b/src/lib/platform/CMakeLists.txt +@@ -31,7 +31,7 @@ endif() + + include_directories( + ../ +- ../../../ext/gtest-1.6.0/include ++ /usr/include/gtest + ) + + if (UNIX) +diff --git a/src/lib/server/CMakeLists.txt b/src/lib/server/CMakeLists.txt +index 2c34af0..f7df650 100644 +--- a/src/lib/server/CMakeLists.txt ++++ b/src/lib/server/CMakeLists.txt +@@ -24,7 +24,7 @@ endif() + include_directories( + ../ + ../../../ext +- ../../../ext/gtest-1.6.0/include ++ /usr/include/gtest + ) + + if (UNIX) +diff --git a/src/lib/synergy/CMakeLists.txt b/src/lib/synergy/CMakeLists.txt +index 0972be8..619709f 100644 +--- a/src/lib/synergy/CMakeLists.txt ++++ b/src/lib/synergy/CMakeLists.txt +@@ -36,7 +36,7 @@ endif() + include_directories( + ../ + ../../../ext +- ../../../ext/gtest-1.6.0/include ++ /usr/include/gtest + ) + + if (UNIX) +diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt +index 8812150..5d38156 100644 +--- a/src/test/CMakeLists.txt ++++ b/src/test/CMakeLists.txt +@@ -15,13 +15,13 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + + include_directories( +- ../../ext/gtest-1.6.0 +- ../../ext/gtest-1.6.0/include +- ../../ext/gmock-1.6.0 +- ../../ext/gmock-1.6.0/include) ++ /usr/incude/gtest ++ /usr/src/gtest ++ /usr/include/gmock ++ /usr/src/gmock) + +-add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc) +-add_library(gmock STATIC ../../ext/gmock-1.6.0/src/gmock-all.cc) ++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 bde35c2..dc4f202 100644 +--- a/src/test/integtests/CMakeLists.txt ++++ b/src/test/integtests/CMakeLists.txt +@@ -56,8 +56,8 @@ endif() + include_directories( + ../../ + ../../lib/ +- ../../../ext/gtest-1.6.0/include +- ../../../ext/gmock-1.6.0/include ++ /usr/include/gtest ++ /usr/include/gmock + ) + + if (UNIX) +diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt +index 4cacdf9..f0a8dbe 100644 +--- a/src/test/unittests/CMakeLists.txt ++++ b/src/test/unittests/CMakeLists.txt +@@ -51,8 +51,8 @@ list(APPEND headers ${platform_sources}) + include_directories( + ../../ + ../../lib/ +- ../../../ext/gtest-1.6.0/include +- ../../../ext/gmock-1.6.0/include ++ /usr/include/gtest ++ /usr/include/gmock + ../../../ext + ) + +-- +2.10.0 + Deleted: community-i686/wrapper =================================================================== --- community-i686/wrapper 2016-10-12 22:10:22 UTC (rev 192099) +++ community-i686/wrapper 2016-10-12 22:10:51 UTC (rev 192100) @@ -1,4 +0,0 @@ -#!/bin/sh -mkdir -p ~/.synergy/plugins -ln -sf /usr/lib/synergy/libns.so ~/.synergy/plugins/libns.so -exec "/usr/lib/synergy/$(basename $0)" "$@" Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-10-12 22:10:22 UTC (rev 192099) +++ community-x86_64/PKGBUILD 2016-10-12 22:10:51 UTC (rev 192100) @@ -1,104 +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> - -# 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.8.3 -pkgrel=1 -pkgdesc='Share a single mouse and keyboard between multiple computers' -url='http://synergy-foss.org' -arch=('i686' 'x86_64') -license=('GPL2') -depends=('gcc-libs' 'libxtst' 'libxinerama' 'libxkbcommon-x11' 'avahi' 'curl') -makedepends=('libxt' 'cmake' 'qt5-base' 'gmock' 'gtest') -optdepends=('qt5-base: gui support' - 'openssl: encryption support') -source=(synergy-${pkgver}.tar.gz::https://github.com/symless/synergy/archive/v${pkgver}-stable.tar.gz - system-gtest.patch - synergys.socket - synergys.service - wrapper) -sha512sums=('a5e51e68a16b4e84d916aa54f03925c9db0df70b80c586d020c599f9685d820f097dd6519e07ad31704e769dd9072eb79f0f95465a12890a8caca44d0fac0688' - '4bef039f59b565d08079a8187df76f9773cfddeb81376ccc42f5570049389f114559721ed7b0464c4a4d1431ba72a736b11755573019583d0075d9da08c03ed2' - 'f9c124533dfd0bbbb1b5036b7f4b06f7f86f69165e88b9146ff17798377119eb9f1a4666f3b2ee9840bc436558d715cdbfe2fdfd7624348fae64871f785a1a62' - '9663a11b915e10e60317e732a4d1191e8f8ff19176994c27dd20aa445daab7565bd624e5575c9c639d144293879fbe8376834a076723f778fd322ebd1c9f2029' - 'a2e126ad3ac53fb855a331134982f86ef81ffc75b73e73b242e6f854fe7e2daec160fac2161acdc7020cd7f57ae0a8826ac7a249ad10b03db614ada0062b3e93') - -prepare() { - cd synergy-${pkgver}-stable - mkdir build - # get rid of shitty bundled gtest and gmock - patch -p1 < "${srcdir}/system-gtest.patch" -} - -build() { - cd synergy-${pkgver}-stable - - msg2 "Building core..." - (cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. - # unittests don't pass with optimization (segfault on nullptr) - sed 's|\-O2|\-O0|g' -i src/test/unittests/CMakeFiles/unittests.dir/{flags.make,link.txt} - make - ) - - msg2 "Building GUI..." - (cd src/gui - qmake - make - ) -} - -check() { - cd synergy-${pkgver}-stable - ./bin/unittests -} - -package() { - cd synergy-${pkgver}-stable - - # install binary - install -Dm 755 bin/synergy "${pkgdir}/usr/lib/synergy/synergy" - install -Dm 755 bin/synergyc "${pkgdir}/usr/lib/synergy/synergyc" - install -Dm 755 bin/synergyd "${pkgdir}/usr/lib/synergy/synergyd" - install -Dm 755 bin/synergys "${pkgdir}/usr/lib/synergy/synergys" - install -Dm 755 bin/syntool "${pkgdir}/usr/lib/synergy/syntool" - install -Dm 755 bin/usynergy "${pkgdir}/usr/lib/synergy/usynergy" - - # unfuck wrapper - install -Dm 755 "${srcdir}/wrapper" "${pkgdir}/usr/lib/synergy/wrapper" - install -d "${pkgdir}/usr/bin" - ln -sf /usr/lib/synergy/wrapper "${pkgdir}/usr/bin/synergy" - ln -sf /usr/lib/synergy/wrapper "${pkgdir}/usr/bin/synergyc" - ln -sf /usr/lib/synergy/wrapper "${pkgdir}/usr/bin/synergyd" - ln -sf /usr/lib/synergy/wrapper "${pkgdir}/usr/bin/synergys" - ln -sf /usr/lib/synergy/wrapper "${pkgdir}/usr/bin/syntool" - ln -sf /usr/lib/synergy/wrapper "${pkgdir}/usr/bin/usynergy" - - # plugin - install -Dm 755 bin/plugins/libns.so "${pkgdir}/usr/lib/${pkgname}/libns.so" - - # 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 192099, synergy/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-10-12 22:10:51 UTC (rev 192100) @@ -0,0 +1,83 @@ +# 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> + +# 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.8.4 +pkgrel=1 +pkgdesc='Share a single mouse and keyboard between multiple computers' +url='http://synergy-foss.org' +arch=('i686' '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/archive/v${pkgver}-stable.tar.gz + system-gtest.patch + synergys.socket + synergys.service) +sha512sums=('7d01138a0481662c5d78bec0a6cacadeb5927a9ea283adb6a63d9c7ab0d97a39484b5ede5f70fe4fbc7a5a296caa581e81cddeddb82687c379686f469ab3b584' + '4bef039f59b565d08079a8187df76f9773cfddeb81376ccc42f5570049389f114559721ed7b0464c4a4d1431ba72a736b11755573019583d0075d9da08c03ed2' + 'f9c124533dfd0bbbb1b5036b7f4b06f7f86f69165e88b9146ff17798377119eb9f1a4666f3b2ee9840bc436558d715cdbfe2fdfd7624348fae64871f785a1a62' + '9663a11b915e10e60317e732a4d1191e8f8ff19176994c27dd20aa445daab7565bd624e5575c9c639d144293879fbe8376834a076723f778fd322ebd1c9f2029') + +prepare() { + cd synergy-${pkgver}-stable + mkdir build + # get rid of shitty bundled gtest and gmock + patch -p1 < "${srcdir}/system-gtest.patch" +} + +build() { + cd synergy-${pkgver}-stable + + msg2 "Building core..." + (cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. + # unittests don't pass with optimization (segfault on nullptr) + sed 's|\-O2|\-O0|g' -i src/test/unittests/CMakeFiles/unittests.dir/{flags.make,link.txt} + make + ) + + msg2 "Building GUI..." + (cd src/gui + qmake + make + ) +} + +check() { + cd synergy-${pkgver}-stable + ./bin/unittests +} + +package() { + cd synergy-${pkgver}-stable + + # install binary + install -Dm 755 bin/{synergy,synergyc,synergyd,synergys,syntool,usynergy} -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: community-x86_64/synergys.service =================================================================== --- community-x86_64/synergys.service 2016-10-12 22:10:22 UTC (rev 192099) +++ community-x86_64/synergys.service 2016-10-12 22:10:51 UTC (rev 192100) @@ -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 192099, synergy/trunk/synergys.service) =================================================================== --- community-x86_64/synergys.service (rev 0) +++ community-x86_64/synergys.service 2016-10-12 22:10:51 UTC (rev 192100) @@ -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: community-x86_64/synergys.socket =================================================================== --- community-x86_64/synergys.socket 2016-10-12 22:10:22 UTC (rev 192099) +++ community-x86_64/synergys.socket 2016-10-12 22:10:51 UTC (rev 192100) @@ -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 192099, synergy/trunk/synergys.socket) =================================================================== --- community-x86_64/synergys.socket (rev 0) +++ community-x86_64/synergys.socket 2016-10-12 22:10:51 UTC (rev 192100) @@ -0,0 +1,9 @@ +[Unit] +Conflicts=synergys@.service + +[Socket] +ListenStream=24800 +Accept=false + +[Install] +WantedBy=sockets.target Deleted: community-x86_64/system-gtest.patch =================================================================== --- community-x86_64/system-gtest.patch 2016-10-12 22:10:22 UTC (rev 192099) +++ community-x86_64/system-gtest.patch 2016-10-12 22:10:51 UTC (rev 192100) @@ -1,110 +0,0 @@ -From e391e1286d80fa2e38c2440bc2266a0fd7bd37ca Mon Sep 17 00:00:00 2001 -From: anthraxx <leve...@leventepolyak.net> -Date: Thu, 29 Sep 2016 02:04:41 +0200 -Subject: [PATCH] using system gtest and gmock - ---- - src/lib/platform/CMakeLists.txt | 2 +- - src/lib/server/CMakeLists.txt | 2 +- - src/lib/synergy/CMakeLists.txt | 2 +- - src/test/CMakeLists.txt | 12 ++++++------ - src/test/integtests/CMakeLists.txt | 4 ++-- - src/test/unittests/CMakeLists.txt | 4 ++-- - 6 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt -index 6c272c2..09ddf26 100644 ---- a/src/lib/platform/CMakeLists.txt -+++ b/src/lib/platform/CMakeLists.txt -@@ -31,7 +31,7 @@ endif() - - include_directories( - ../ -- ../../../ext/gtest-1.6.0/include -+ /usr/include/gtest - ) - - if (UNIX) -diff --git a/src/lib/server/CMakeLists.txt b/src/lib/server/CMakeLists.txt -index 2c34af0..f7df650 100644 ---- a/src/lib/server/CMakeLists.txt -+++ b/src/lib/server/CMakeLists.txt -@@ -24,7 +24,7 @@ endif() - include_directories( - ../ - ../../../ext -- ../../../ext/gtest-1.6.0/include -+ /usr/include/gtest - ) - - if (UNIX) -diff --git a/src/lib/synergy/CMakeLists.txt b/src/lib/synergy/CMakeLists.txt -index 0972be8..619709f 100644 ---- a/src/lib/synergy/CMakeLists.txt -+++ b/src/lib/synergy/CMakeLists.txt -@@ -36,7 +36,7 @@ endif() - include_directories( - ../ - ../../../ext -- ../../../ext/gtest-1.6.0/include -+ /usr/include/gtest - ) - - if (UNIX) -diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt -index 8812150..5d38156 100644 ---- a/src/test/CMakeLists.txt -+++ b/src/test/CMakeLists.txt -@@ -15,13 +15,13 @@ - # along with this program. If not, see <http://www.gnu.org/licenses/>. - - include_directories( -- ../../ext/gtest-1.6.0 -- ../../ext/gtest-1.6.0/include -- ../../ext/gmock-1.6.0 -- ../../ext/gmock-1.6.0/include) -+ /usr/incude/gtest -+ /usr/src/gtest -+ /usr/include/gmock -+ /usr/src/gmock) - --add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc) --add_library(gmock STATIC ../../ext/gmock-1.6.0/src/gmock-all.cc) -+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 bde35c2..dc4f202 100644 ---- a/src/test/integtests/CMakeLists.txt -+++ b/src/test/integtests/CMakeLists.txt -@@ -56,8 +56,8 @@ endif() - include_directories( - ../../ - ../../lib/ -- ../../../ext/gtest-1.6.0/include -- ../../../ext/gmock-1.6.0/include -+ /usr/include/gtest -+ /usr/include/gmock - ) - - if (UNIX) -diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt -index 4cacdf9..f0a8dbe 100644 ---- a/src/test/unittests/CMakeLists.txt -+++ b/src/test/unittests/CMakeLists.txt -@@ -51,8 +51,8 @@ list(APPEND headers ${platform_sources}) - include_directories( - ../../ - ../../lib/ -- ../../../ext/gtest-1.6.0/include -- ../../../ext/gmock-1.6.0/include -+ /usr/include/gtest -+ /usr/include/gmock - ../../../ext - ) - --- -2.10.0 - Copied: synergy/repos/community-x86_64/system-gtest.patch (from rev 192099, synergy/trunk/system-gtest.patch) =================================================================== --- community-x86_64/system-gtest.patch (rev 0) +++ community-x86_64/system-gtest.patch 2016-10-12 22:10:51 UTC (rev 192100) @@ -0,0 +1,110 @@ +From e391e1286d80fa2e38c2440bc2266a0fd7bd37ca Mon Sep 17 00:00:00 2001 +From: anthraxx <leve...@leventepolyak.net> +Date: Thu, 29 Sep 2016 02:04:41 +0200 +Subject: [PATCH] using system gtest and gmock + +--- + src/lib/platform/CMakeLists.txt | 2 +- + src/lib/server/CMakeLists.txt | 2 +- + src/lib/synergy/CMakeLists.txt | 2 +- + src/test/CMakeLists.txt | 12 ++++++------ + src/test/integtests/CMakeLists.txt | 4 ++-- + src/test/unittests/CMakeLists.txt | 4 ++-- + 6 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt +index 6c272c2..09ddf26 100644 +--- a/src/lib/platform/CMakeLists.txt ++++ b/src/lib/platform/CMakeLists.txt +@@ -31,7 +31,7 @@ endif() + + include_directories( + ../ +- ../../../ext/gtest-1.6.0/include ++ /usr/include/gtest + ) + + if (UNIX) +diff --git a/src/lib/server/CMakeLists.txt b/src/lib/server/CMakeLists.txt +index 2c34af0..f7df650 100644 +--- a/src/lib/server/CMakeLists.txt ++++ b/src/lib/server/CMakeLists.txt +@@ -24,7 +24,7 @@ endif() + include_directories( + ../ + ../../../ext +- ../../../ext/gtest-1.6.0/include ++ /usr/include/gtest + ) + + if (UNIX) +diff --git a/src/lib/synergy/CMakeLists.txt b/src/lib/synergy/CMakeLists.txt +index 0972be8..619709f 100644 +--- a/src/lib/synergy/CMakeLists.txt ++++ b/src/lib/synergy/CMakeLists.txt +@@ -36,7 +36,7 @@ endif() + include_directories( + ../ + ../../../ext +- ../../../ext/gtest-1.6.0/include ++ /usr/include/gtest + ) + + if (UNIX) +diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt +index 8812150..5d38156 100644 +--- a/src/test/CMakeLists.txt ++++ b/src/test/CMakeLists.txt +@@ -15,13 +15,13 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + + include_directories( +- ../../ext/gtest-1.6.0 +- ../../ext/gtest-1.6.0/include +- ../../ext/gmock-1.6.0 +- ../../ext/gmock-1.6.0/include) ++ /usr/incude/gtest ++ /usr/src/gtest ++ /usr/include/gmock ++ /usr/src/gmock) + +-add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc) +-add_library(gmock STATIC ../../ext/gmock-1.6.0/src/gmock-all.cc) ++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 bde35c2..dc4f202 100644 +--- a/src/test/integtests/CMakeLists.txt ++++ b/src/test/integtests/CMakeLists.txt +@@ -56,8 +56,8 @@ endif() + include_directories( + ../../ + ../../lib/ +- ../../../ext/gtest-1.6.0/include +- ../../../ext/gmock-1.6.0/include ++ /usr/include/gtest ++ /usr/include/gmock + ) + + if (UNIX) +diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt +index 4cacdf9..f0a8dbe 100644 +--- a/src/test/unittests/CMakeLists.txt ++++ b/src/test/unittests/CMakeLists.txt +@@ -51,8 +51,8 @@ list(APPEND headers ${platform_sources}) + include_directories( + ../../ + ../../lib/ +- ../../../ext/gtest-1.6.0/include +- ../../../ext/gmock-1.6.0/include ++ /usr/include/gtest ++ /usr/include/gmock + ../../../ext + ) + +-- +2.10.0 + Deleted: community-x86_64/wrapper =================================================================== --- community-x86_64/wrapper 2016-10-12 22:10:22 UTC (rev 192099) +++ community-x86_64/wrapper 2016-10-12 22:10:51 UTC (rev 192100) @@ -1,4 +0,0 @@ -#!/bin/sh -mkdir -p ~/.synergy/plugins -ln -sf /usr/lib/synergy/libns.so ~/.synergy/plugins/libns.so -exec "/usr/lib/synergy/$(basename $0)" "$@"