[arch-commits] Commit in synergy/trunk (PKGBUILD fix-incompetence.patch)

[Levente Polyak]

    Date: Monday, August 24, 2015 @ 17:17:11
  Author: anthraxx
Revision: 138729

upgpkg: synergy 1.7.4-1

upgpkg synergy 1.7.4-1

Modified:
  synergy/trunk/PKGBUILD
  synergy/trunk/fix-incompetence.patch

------------------------+
 PKGBUILD               |    9 ++++-----
 fix-incompetence.patch |   29 -----------------------------
 2 files changed, 4 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-24 13:10:35 UTC (rev 138728)
+++ PKGBUILD	2015-08-24 15:17:11 UTC (rev 138729)
@@ -11,8 +11,8 @@
 # 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=3
+pkgver=1.7.4
+pkgrel=1
 pkgdesc="Share a single mouse and keyboard between multiple computers"
 url="http://synergy-foss.org"
 arch=('i686' 'x86_64')
@@ -28,16 +28,15 @@
         synergys_at.service
         fix-incompetence.patch
         wrapper)
-sha512sums=('334cad16b843f0a6c1337960d76b37724bdb2a5f9841cffab4dbcbe6393cb0c4323860b64a15cccba1158763ef8cbea820900a5c53d0abbb6a92cfbeff827287'
+sha512sums=('ad6139209a8635ed91e943e11a7709d96a037bdda45a949c9f63aa3e13211aecf02651794921d2dde30d9024930e256da7538f1cf104d300be1e6b7bc4732932'
             'f9c124533dfd0bbbb1b5036b7f4b06f7f86f69165e88b9146ff17798377119eb9f1a4666f3b2ee9840bc436558d715cdbfe2fdfd7624348fae64871f785a1a62'
             'e85cc3452bb8ba8fcccb1857386c77eb1e4cabb149a1c492c56b38e1b121ac0e7d96c6fcbd3c9b522d3a4ae9d7a9974f4a89fc32b02a56f665be92af219e371c'
-            '02eff8a165c33b22239a1e979532b56fbb791cd2a042237f3c3705a4168ec6b833d5dc58a0037375b223af1c34e6bdd8aa9e9c7672a709d7722656c846fe065c'
+            'd598f05614d0db894781e85ecab9a1196da3df6967e3bd44f5b8246c7cba76859734cf953edddf0addf6464f62f88b99da52fb5674e8db4a58bf971d078da83a'
             'a2e126ad3ac53fb855a331134982f86ef81ffc75b73e73b242e6f854fe7e2daec160fac2161acdc7020cd7f57ae0a8826ac7a249ad10b03db614ada0062b3e93')
 
 prepare() {
   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

Modified: fix-incompetence.patch
===================================================================
--- fix-incompetence.patch	2015-08-24 13:10:35 UTC (rev 138728)
+++ fix-incompetence.patch	2015-08-24 15:17:11 UTC (rev 138729)
@@ -1,32 +1,3 @@
-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) {
--- 
 From 5080bf0c679711f60ca14eb5979d92f181749bb7 Mon Sep 17 00:00:00 2001
 From: Manuel Frischknecht <manuel.frischknecht at bfh.ch>
 Date: Mon, 20 Jul 2015 17:55:02 +0200