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

[Levente Polyak]

    Date: Wednesday, August 10, 2016 @ 21:43:29
  Author: anthraxx
Revision: 186364

upgpkg: synergy 1.8.2-1

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

------------------------+
 PKGBUILD               |   21 +++++++++------------
 fix-incompetence.patch |   23 -----------------------
 2 files changed, 9 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-10 21:39:41 UTC (rev 186363)
+++ PKGBUILD	2016-08-10 21:43:29 UTC (rev 186364)
@@ -11,32 +11,27 @@
 # 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.6
-pkgrel=2
-pkgdesc="Share a single mouse and keyboard between multiple computers"
-url="http://synergy-foss.org"
+pkgver=1.8.2
+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' 'unzip')
-optdepends=(
-  'qt5-base: gui support'
-  'openssl: encryption support'
-)
+optdepends=('qt5-base: gui support'
+            'openssl: encryption support')
 source=(synergy-${pkgver}.tar.gz::https://github.com/symless/synergy/archive/v${pkgver}-stable.tar.gz
         synergys.socket
         synergys.service
-        fix-incompetence.patch
         wrapper)
-sha512sums=('025305fc1aca425b27c1d4f16dd0c6ee7798c048e234c8a27272b81b03c0c1cb35fab6639707c1b55d58e7676fe2abf058b6f93e994ae5b256034c32c6fe806a'
+sha512sums=('48d7e18e92f239feddc7afd31b5614c2c27b7dc1cb30e58aa168095771a85d87c9c621daaef6ee0126381bcdcfa515d484545d763d0b1c5e6c181e0e5175639c'
             'f9c124533dfd0bbbb1b5036b7f4b06f7f86f69165e88b9146ff17798377119eb9f1a4666f3b2ee9840bc436558d715cdbfe2fdfd7624348fae64871f785a1a62'
             '9663a11b915e10e60317e732a4d1191e8f8ff19176994c27dd20aa445daab7565bd624e5575c9c639d144293879fbe8376834a076723f778fd322ebd1c9f2029'
-            '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
@@ -47,6 +42,8 @@
   cd synergy-${pkgver}-stable
 
   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
 
   (cd src/gui

Deleted: fix-incompetence.patch
===================================================================
--- fix-incompetence.patch	2016-08-10 21:39:41 UTC (rev 186363)
+++ fix-incompetence.patch	2016-08-10 21:43:29 UTC (rev 186364)
@@ -1,23 +0,0 @@
-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
-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