Date: Saturday, August 1, 2015 @ 21:19:30 Author: anthraxx Revision: 137668
upgpkg: synergy 1.7.3-3 updpkg synergy 1.7.3-3: symlink libns.so Added: synergy/trunk/wrapper Modified: synergy/trunk/PKGBUILD synergy/trunk/fix-incompetence.patch ------------------------+ PKGBUILD | 96 ++++++++++++++++++++++++++--------------------- fix-incompetence.patch | 23 ++++++++++- wrapper | 4 + 3 files changed, 81 insertions(+), 42 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-08-01 18:31:07 UTC (rev 137667) +++ PKGBUILD 2015-08-01 19:19:30 UTC (rev 137668) @@ -1,5 +1,5 @@ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> # 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> @@ -12,10 +12,11 @@ # update and just generally don't seem to care much. pkgname=synergy pkgver=1.7.3 -pkgrel=2 +pkgrel=3 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' 'unzip') optdepends=( @@ -22,71 +23,84 @@ 'qt5-base: gui support' 'openssl: encryption support' ) -license=('GPL2') -source=("synergy-${pkgver}.tar.gz::https://github.com/synergy/synergy/archive/v${pkgver}-stable.tar.gz" - "synergys_at.socket" - "synergys_at.service" - fix-incompetence.patch) -sha1sums=('8b29b172ef6d025f3cdf8fb434eb0e23b6ed896f' - '7ec33221725fc496b807e0f435c5e87b590beb5d' - '65ab58cc3546d6374a05a6a260f15045632e43ce' - '10a899901ef62828280f21979625495f4da159f5') +source=(synergy-${pkgver}.tar.gz::https://github.com/synergy/synergy/archive/v${pkgver}-stable.tar.gz + synergys_at.socket + synergys_at.service + fix-incompetence.patch + wrapper) +sha512sums=('334cad16b843f0a6c1337960d76b37724bdb2a5f9841cffab4dbcbe6393cb0c4323860b64a15cccba1158763ef8cbea820900a5c53d0abbb6a92cfbeff827287' + 'f9c124533dfd0bbbb1b5036b7f4b06f7f86f69165e88b9146ff17798377119eb9f1a4666f3b2ee9840bc436558d715cdbfe2fdfd7624348fae64871f785a1a62' + 'e85cc3452bb8ba8fcccb1857386c77eb1e4cabb149a1c492c56b38e1b121ac0e7d96c6fcbd3c9b522d3a4ae9d7a9974f4a89fc32b02a56f665be92af219e371c' + '02eff8a165c33b22239a1e979532b56fbb791cd2a042237f3c3705a4168ec6b833d5dc58a0037375b223af1c34e6bdd8aa9e9c7672a709d7722656c846fe065c' + 'a2e126ad3ac53fb855a331134982f86ef81ffc75b73e73b242e6f854fe7e2daec160fac2161acdc7020cd7f57ae0a8826ac7a249ad10b03db614ada0062b3e93') prepare() { - cd "${srcdir}/synergy-${pkgver}-stable" - patch -p1 < ../fix-incompetence.patch + cd synergy-${pkgver}-stable + patch -p1 < "${srcdir}/fix-incompetence.patch" - cd ext - unzip gmock-1.6.0.zip -d gmock-1.6.0 - unzip gtest-1.6.0.zip -d gtest-1.6.0 + (cd ext + unzip gmock-1.6.0.zip -d gmock-1.6.0 + unzip gtest-1.6.0.zip -d gtest-1.6.0 + ) } build() { - cd "${srcdir}/synergy-${pkgver}-stable" + cd synergy-${pkgver}-stable cmake -DCMAKE_INSTALL_PREFIX=/usr . make - cd src/gui - qmake - make + (cd src/gui + qmake + make + ) } check() { - cd "${srcdir}/synergy-${pkgver}-stable/bin" - ./unittests + cd synergy-${pkgver}-stable + ./bin/unittests } package() { - cd "${srcdir}/synergy-${pkgver}-stable" + cd synergy-${pkgver}-stable # install binary - install -Dm755 bin/synergy "${pkgdir}/usr/bin/synergy" - install -Dm755 bin/synergyc "${pkgdir}/usr/bin/synergyc" - install -Dm755 bin/synergyd "${pkgdir}/usr/bin/synergyd" - install -Dm755 bin/synergys "${pkgdir}/usr/bin/synergys" - install -Dm755 bin/syntool "${pkgdir}/usr/bin/syntool" - install -Dm755 bin/usynergy "${pkgdir}/usr/bin/usynergy" + 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 -Dm644 "doc/${pkgname}.conf.example" "${pkgdir}/etc/${pkgname}.conf.example" - install -Dm644 "doc/${pkgname}.conf.example-advanced" "${pkgdir}/etc/${pkgname}.conf.example-advanced" - install -Dm644 "doc/${pkgname}.conf.example-basic" "${pkgdir}/etc/${pkgname}.conf.example-basic" + install -Dm 644 "doc/${pkgname}.conf.example" "${pkgdir}/etc/${pkgname}.conf.example" + install -Dm 644 "doc/${pkgname}.conf.example-advanced" "${pkgdir}/etc/${pkgname}.conf.example-advanced" + install -Dm 644 "doc/${pkgname}.conf.example-basic" "${pkgdir}/etc/${pkgname}.conf.example-basic" # install manfiles - install -Dm644 "doc/${pkgname}c.man" "${pkgdir}/usr/share/man/man1/${pkgname}c.1" - install -Dm644 "doc/${pkgname}s.man" "${pkgdir}/usr/share/man/man1/${pkgname}s.1" - - # plugin - install -Dm644 bin/plugins/libns.so "${pkgdir}/usr/lib/${pkgname}/libns.so" + 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 -Dm644 "${srcdir}/synergys_at.service" "${pkgdir}/usr/lib/systemd/system/synergys@.service" - install -Dm644 "${srcdir}/synergys_at.socket" "${pkgdir}/usr/lib/systemd/system/synergys@.socket" + install -Dm 644 "${srcdir}/synergys_at.service" "${pkgdir}/usr/lib/systemd/system/synergys@.service" + install -Dm 644 "${srcdir}/synergys_at.socket" "${pkgdir}/usr/lib/systemd/system/synergys@.socket" # install desktop/icon stuff - install -Dm644 "res/synergy.ico" "${pkgdir}/usr/share/icons/synergy.ico" - install -Dm644 "res/synergy.desktop" "${pkgdir}/usr/share/applications/synergy.desktop" + install -Dm 644 "res/synergy.ico" "${pkgdir}/usr/share/icons/synergy.ico" + install -Dm 644 "res/synergy.desktop" "${pkgdir}/usr/share/applications/synergy.desktop" } # vim:set ts=2 sw=2 et: Modified: fix-incompetence.patch =================================================================== --- fix-incompetence.patch 2015-08-01 18:31:07 UTC (rev 137667) +++ fix-incompetence.patch 2015-08-01 19:19:30 UTC (rev 137668) @@ -27,5 +27,26 @@ int arch = getProcessorArch(); if (arch == kProcessorArchLinux32) { -- +From 5080bf0c679711f60ca14eb5979d92f181749bb7 Mon Sep 17 00:00:00 2001 +From: Manuel Frischknecht <manuel.frischkne...@bfh.ch> +Date: Mon, 20 Jul 2015 17:55:02 +0200 +Subject: [PATCH] Fixed a missing include that breaks the build on linux + +--- + src/gui/src/CommandProcess.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/gui/src/CommandProcess.h b/src/gui/src/CommandProcess.h +index 62e89bf..f279dff 100644 +--- a/src/gui/src/CommandProcess.h ++++ b/src/gui/src/CommandProcess.h +@@ -18,6 +18,7 @@ + #ifndef COMMANDTHREAD_H + #define COMMANDTHREAD_H + ++#include <QObject> + #include <QStringList> + + class CommandProcess : public QObject +-- 2.4.2 - Added: wrapper =================================================================== --- wrapper (rev 0) +++ wrapper 2015-08-01 19:19:30 UTC (rev 137668) @@ -0,0 +1,4 @@ +#!/bin/sh +mkdir -p ~/.synergy/plugins +ln -sf /usr/lib/synergy/libns.so ~/.synergy/plugins/libns.so +exec "/usr/lib/synergy/$(basename $0)" "$@" Property changes on: synergy/trunk/wrapper ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property