[arch-commits] Commit in synergy/repos (14 files)
Levente Polyak
anthraxx at archlinux.org
Mon Jun 1 10:15:41 UTC 2015
Date: Monday, June 1, 2015 @ 12:15:40
Author: anthraxx
Revision: 134461
archrelease: copy trunk to community-i686, community-x86_64
Added:
synergy/repos/community-i686/PKGBUILD
(from rev 134460, synergy/trunk/PKGBUILD)
synergy/repos/community-i686/fix-incompetence.patch
(from rev 134460, synergy/trunk/fix-incompetence.patch)
synergy/repos/community-i686/synergys_at.service
(from rev 134460, synergy/trunk/synergys_at.service)
synergy/repos/community-i686/synergys_at.socket
(from rev 134460, synergy/trunk/synergys_at.socket)
synergy/repos/community-x86_64/PKGBUILD
(from rev 134460, synergy/trunk/PKGBUILD)
synergy/repos/community-x86_64/fix-incompetence.patch
(from rev 134460, synergy/trunk/fix-incompetence.patch)
synergy/repos/community-x86_64/synergys_at.service
(from rev 134460, synergy/trunk/synergys_at.service)
synergy/repos/community-x86_64/synergys_at.socket
(from rev 134460, synergy/trunk/synergys_at.socket)
Deleted:
synergy/repos/community-i686/PKGBUILD
synergy/repos/community-i686/synergys_at.service
synergy/repos/community-i686/synergys_at.socket
synergy/repos/community-x86_64/PKGBUILD
synergy/repos/community-x86_64/synergys_at.service
synergy/repos/community-x86_64/synergys_at.socket
-----------------------------------------+
/PKGBUILD | 184 ++++++++++++++++++++++++++++++
/synergys_at.service | 22 +++
/synergys_at.socket | 18 ++
community-i686/PKGBUILD | 89 --------------
community-i686/fix-incompetence.patch | 31 +++++
community-i686/synergys_at.service | 11 -
community-i686/synergys_at.socket | 9 -
community-x86_64/PKGBUILD | 89 --------------
community-x86_64/fix-incompetence.patch | 31 +++++
community-x86_64/synergys_at.service | 11 -
community-x86_64/synergys_at.socket | 9 -
11 files changed, 286 insertions(+), 218 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-06-01 10:15:11 UTC (rev 134460)
+++ community-i686/PKGBUILD 2015-06-01 10:15:40 UTC (rev 134461)
@@ -1,89 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Jelle van der Waa <jelle vdwaa nl>
-# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
-# Contributor: Dale Blount <dale at archlinux.org>
-# Contributor: Michael Düll <mail at 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.7.3
-pkgrel=1
-pkgdesc="Share a single mouse and keyboard between multiple computers"
-url="http://synergy-foss.org"
-arch=('i686' 'x86_64')
-depends=('gcc-libs' 'libxtst' 'libxinerama' 'libxkbcommon-x11' 'avahi' 'curl')
-makedepends=('libxt' 'cmake' 'qt5-base' 'unzip')
-optdepends=(
- '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")
-sha1sums=('8b29b172ef6d025f3cdf8fb434eb0e23b6ed896f'
- '7ec33221725fc496b807e0f435c5e87b590beb5d'
- '65ab58cc3546d6374a05a6a260f15045632e43ce')
-
-prepare() {
- cd "${srcdir}/synergy-${pkgver}-stable"
-
- 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"
-
- cmake -DCMAKE_INSTALL_PREFIX=/usr .
- make
-
- cd src/gui
- qmake
- make
-}
-
-check() {
- cd "${srcdir}/synergy-${pkgver}-stable/bin"
- ./unittests
-}
-
-package() {
- cd "${srcdir}/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 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 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 systemd service and socket
- install -Dm644 "${srcdir}/synergys_at.service" "${pkgdir}/usr/lib/systemd/system/synergys at .service"
- install -Dm644 "${srcdir}/synergys_at.socket" "${pkgdir}/usr/lib/systemd/system/synergys at .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"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: synergy/repos/community-i686/PKGBUILD (from rev 134460, synergy/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-06-01 10:15:40 UTC (rev 134461)
@@ -0,0 +1,92 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Jelle van der Waa <jelle vdwaa nl>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: Dale Blount <dale at archlinux.org>
+# Contributor: Michael Düll <mail at 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.7.3
+pkgrel=2
+pkgdesc="Share a single mouse and keyboard between multiple computers"
+url="http://synergy-foss.org"
+arch=('i686' 'x86_64')
+depends=('gcc-libs' 'libxtst' 'libxinerama' 'libxkbcommon-x11' 'avahi' 'curl')
+makedepends=('libxt' 'cmake' 'qt5-base' 'unzip')
+optdepends=(
+ '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')
+
+prepare() {
+ cd "${srcdir}/synergy-${pkgver}-stable"
+ patch -p1 < ../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
+}
+
+build() {
+ cd "${srcdir}/synergy-${pkgver}-stable"
+
+ cmake -DCMAKE_INSTALL_PREFIX=/usr .
+ make
+
+ cd src/gui
+ qmake
+ make
+}
+
+check() {
+ cd "${srcdir}/synergy-${pkgver}-stable/bin"
+ ./unittests
+}
+
+package() {
+ cd "${srcdir}/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 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 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 systemd service and socket
+ install -Dm644 "${srcdir}/synergys_at.service" "${pkgdir}/usr/lib/systemd/system/synergys at .service"
+ install -Dm644 "${srcdir}/synergys_at.socket" "${pkgdir}/usr/lib/systemd/system/synergys at .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"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: synergy/repos/community-i686/fix-incompetence.patch (from rev 134460, synergy/trunk/fix-incompetence.patch)
===================================================================
--- community-i686/fix-incompetence.patch (rev 0)
+++ community-i686/fix-incompetence.patch 2015-06-01 10:15:40 UTC (rev 134461)
@@ -0,0 +1,31 @@
+From 03fc9b5fa72fd3197ca1e496f2c22e640304a602 Mon Sep 17 00:00:00 2001
+From: Maxim Doucet <maxim.doucet at gmail.com>
+Date: Wed, 27 May 2015 18:34:47 +0200
+Subject: [PATCH] Fix issue synergy/synergy#4720
+
+---
+ src/gui/src/PluginManager.cpp | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/src/gui/src/PluginManager.cpp b/src/gui/src/PluginManager.cpp
+index fd3a24e..d1dc876 100644
+--- a/src/gui/src/PluginManager.cpp
++++ b/src/gui/src/PluginManager.cpp
+@@ -194,13 +194,7 @@ QString PluginManager::getPluginUrl(const QString& pluginName)
+ process.start(program, args);
+ bool success = process.waitForStarted();
+
+- if (!success || !process.waitForFinished())
+- {
+- emit error(tr("Could not get Linux package type."));
+- return "";
+- }
+-
+- bool isDeb = (process.exitCode() == 0);
++ bool isDeb = (success && process.waitForFinished() & (process.exitCode() == 0));
+
+ int arch = getProcessorArch();
+ if (arch == kProcessorArchLinux32) {
+--
+2.4.2
+
Deleted: community-i686/synergys_at.service
===================================================================
--- community-i686/synergys_at.service 2015-06-01 10:15:11 UTC (rev 134460)
+++ community-i686/synergys_at.service 2015-06-01 10:15:40 UTC (rev 134461)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Synergy Server Daemon
-After=network.target
-
-[Service]
-User=%i
-ExecStart=/usr/bin/synergys --no-daemon --config /etc/synergy.conf
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
Copied: synergy/repos/community-i686/synergys_at.service (from rev 134460, synergy/trunk/synergys_at.service)
===================================================================
--- community-i686/synergys_at.service (rev 0)
+++ community-i686/synergys_at.service 2015-06-01 10:15:40 UTC (rev 134461)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Synergy Server Daemon
+After=network.target
+
+[Service]
+User=%i
+ExecStart=/usr/bin/synergys --no-daemon --config /etc/synergy.conf
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-i686/synergys_at.socket
===================================================================
--- community-i686/synergys_at.socket 2015-06-01 10:15:11 UTC (rev 134460)
+++ community-i686/synergys_at.socket 2015-06-01 10:15:40 UTC (rev 134461)
@@ -1,9 +0,0 @@
-[Unit]
-Conflicts=synergys at .service
-
-[Socket]
-ListenStream=24800
-Accept=false
-
-[Install]
-WantedBy=sockets.target
Copied: synergy/repos/community-i686/synergys_at.socket (from rev 134460, synergy/trunk/synergys_at.socket)
===================================================================
--- community-i686/synergys_at.socket (rev 0)
+++ community-i686/synergys_at.socket 2015-06-01 10:15:40 UTC (rev 134461)
@@ -0,0 +1,9 @@
+[Unit]
+Conflicts=synergys at .service
+
+[Socket]
+ListenStream=24800
+Accept=false
+
+[Install]
+WantedBy=sockets.target
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-06-01 10:15:11 UTC (rev 134460)
+++ community-x86_64/PKGBUILD 2015-06-01 10:15:40 UTC (rev 134461)
@@ -1,89 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Jelle van der Waa <jelle vdwaa nl>
-# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
-# Contributor: Dale Blount <dale at archlinux.org>
-# Contributor: Michael Düll <mail at 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.7.3
-pkgrel=1
-pkgdesc="Share a single mouse and keyboard between multiple computers"
-url="http://synergy-foss.org"
-arch=('i686' 'x86_64')
-depends=('gcc-libs' 'libxtst' 'libxinerama' 'libxkbcommon-x11' 'avahi' 'curl')
-makedepends=('libxt' 'cmake' 'qt5-base' 'unzip')
-optdepends=(
- '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")
-sha1sums=('8b29b172ef6d025f3cdf8fb434eb0e23b6ed896f'
- '7ec33221725fc496b807e0f435c5e87b590beb5d'
- '65ab58cc3546d6374a05a6a260f15045632e43ce')
-
-prepare() {
- cd "${srcdir}/synergy-${pkgver}-stable"
-
- 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"
-
- cmake -DCMAKE_INSTALL_PREFIX=/usr .
- make
-
- cd src/gui
- qmake
- make
-}
-
-check() {
- cd "${srcdir}/synergy-${pkgver}-stable/bin"
- ./unittests
-}
-
-package() {
- cd "${srcdir}/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 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 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 systemd service and socket
- install -Dm644 "${srcdir}/synergys_at.service" "${pkgdir}/usr/lib/systemd/system/synergys at .service"
- install -Dm644 "${srcdir}/synergys_at.socket" "${pkgdir}/usr/lib/systemd/system/synergys at .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"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: synergy/repos/community-x86_64/PKGBUILD (from rev 134460, synergy/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-06-01 10:15:40 UTC (rev 134461)
@@ -0,0 +1,92 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Jelle van der Waa <jelle vdwaa nl>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: Dale Blount <dale at archlinux.org>
+# Contributor: Michael Düll <mail at 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.7.3
+pkgrel=2
+pkgdesc="Share a single mouse and keyboard between multiple computers"
+url="http://synergy-foss.org"
+arch=('i686' 'x86_64')
+depends=('gcc-libs' 'libxtst' 'libxinerama' 'libxkbcommon-x11' 'avahi' 'curl')
+makedepends=('libxt' 'cmake' 'qt5-base' 'unzip')
+optdepends=(
+ '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')
+
+prepare() {
+ cd "${srcdir}/synergy-${pkgver}-stable"
+ patch -p1 < ../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
+}
+
+build() {
+ cd "${srcdir}/synergy-${pkgver}-stable"
+
+ cmake -DCMAKE_INSTALL_PREFIX=/usr .
+ make
+
+ cd src/gui
+ qmake
+ make
+}
+
+check() {
+ cd "${srcdir}/synergy-${pkgver}-stable/bin"
+ ./unittests
+}
+
+package() {
+ cd "${srcdir}/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 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 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 systemd service and socket
+ install -Dm644 "${srcdir}/synergys_at.service" "${pkgdir}/usr/lib/systemd/system/synergys at .service"
+ install -Dm644 "${srcdir}/synergys_at.socket" "${pkgdir}/usr/lib/systemd/system/synergys at .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"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: synergy/repos/community-x86_64/fix-incompetence.patch (from rev 134460, synergy/trunk/fix-incompetence.patch)
===================================================================
--- community-x86_64/fix-incompetence.patch (rev 0)
+++ community-x86_64/fix-incompetence.patch 2015-06-01 10:15:40 UTC (rev 134461)
@@ -0,0 +1,31 @@
+From 03fc9b5fa72fd3197ca1e496f2c22e640304a602 Mon Sep 17 00:00:00 2001
+From: Maxim Doucet <maxim.doucet at gmail.com>
+Date: Wed, 27 May 2015 18:34:47 +0200
+Subject: [PATCH] Fix issue synergy/synergy#4720
+
+---
+ src/gui/src/PluginManager.cpp | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/src/gui/src/PluginManager.cpp b/src/gui/src/PluginManager.cpp
+index fd3a24e..d1dc876 100644
+--- a/src/gui/src/PluginManager.cpp
++++ b/src/gui/src/PluginManager.cpp
+@@ -194,13 +194,7 @@ QString PluginManager::getPluginUrl(const QString& pluginName)
+ process.start(program, args);
+ bool success = process.waitForStarted();
+
+- if (!success || !process.waitForFinished())
+- {
+- emit error(tr("Could not get Linux package type."));
+- return "";
+- }
+-
+- bool isDeb = (process.exitCode() == 0);
++ bool isDeb = (success && process.waitForFinished() & (process.exitCode() == 0));
+
+ int arch = getProcessorArch();
+ if (arch == kProcessorArchLinux32) {
+--
+2.4.2
+
Deleted: community-x86_64/synergys_at.service
===================================================================
--- community-x86_64/synergys_at.service 2015-06-01 10:15:11 UTC (rev 134460)
+++ community-x86_64/synergys_at.service 2015-06-01 10:15:40 UTC (rev 134461)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Synergy Server Daemon
-After=network.target
-
-[Service]
-User=%i
-ExecStart=/usr/bin/synergys --no-daemon --config /etc/synergy.conf
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
Copied: synergy/repos/community-x86_64/synergys_at.service (from rev 134460, synergy/trunk/synergys_at.service)
===================================================================
--- community-x86_64/synergys_at.service (rev 0)
+++ community-x86_64/synergys_at.service 2015-06-01 10:15:40 UTC (rev 134461)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Synergy Server Daemon
+After=network.target
+
+[Service]
+User=%i
+ExecStart=/usr/bin/synergys --no-daemon --config /etc/synergy.conf
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/synergys_at.socket
===================================================================
--- community-x86_64/synergys_at.socket 2015-06-01 10:15:11 UTC (rev 134460)
+++ community-x86_64/synergys_at.socket 2015-06-01 10:15:40 UTC (rev 134461)
@@ -1,9 +0,0 @@
-[Unit]
-Conflicts=synergys at .service
-
-[Socket]
-ListenStream=24800
-Accept=false
-
-[Install]
-WantedBy=sockets.target
Copied: synergy/repos/community-x86_64/synergys_at.socket (from rev 134460, synergy/trunk/synergys_at.socket)
===================================================================
--- community-x86_64/synergys_at.socket (rev 0)
+++ community-x86_64/synergys_at.socket 2015-06-01 10:15:40 UTC (rev 134461)
@@ -0,0 +1,9 @@
+[Unit]
+Conflicts=synergys at .service
+
+[Socket]
+ListenStream=24800
+Accept=false
+
+[Install]
+WantedBy=sockets.target
More information about the arch-commits
mailing list