Date: Monday, June 1, 2015 @ 12:15:11 Author: anthraxx Revision: 134460
fix incompetente plugin detection via upstream patch Added: synergy/trunk/fix-incompetence.patch Modified: synergy/trunk/PKGBUILD ------------------------+ PKGBUILD | 9 ++++++--- fix-incompetence.patch | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-06-01 10:13:39 UTC (rev 134459) +++ PKGBUILD 2015-06-01 10:15:11 UTC (rev 134460) @@ -12,7 +12,7 @@ # update and just generally don't seem to care much. pkgname=synergy pkgver=1.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="Share a single mouse and keyboard between multiple computers" url="http://synergy-foss.org"; arch=('i686' 'x86_64') @@ -25,13 +25,16 @@ license=('GPL2') source=("synergy-${pkgver}.tar.gz::https://github.com/synergy/synergy/archive/v${pkgver}-stable.tar.gz"; "synergys_at.socket" - "synergys_at.service") + "synergys_at.service" + fix-incompetence.patch) sha1sums=('8b29b172ef6d025f3cdf8fb434eb0e23b6ed896f' '7ec33221725fc496b807e0f435c5e87b590beb5d' - '65ab58cc3546d6374a05a6a260f15045632e43ce') + '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 Added: fix-incompetence.patch =================================================================== --- fix-incompetence.patch (rev 0) +++ fix-incompetence.patch 2015-06-01 10:15:11 UTC (rev 134460) @@ -0,0 +1,31 @@ +From 03fc9b5fa72fd3197ca1e496f2c22e640304a602 Mon Sep 17 00:00:00 2001 +From: Maxim Doucet <[email protected]> +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 +
