summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin MacMartin2015-07-27 16:51:47 -0400
committerKevin MacMartin2015-07-27 16:51:47 -0400
commitd138a22ff988983c720dc66786ac69080d373ea6 (patch)
tree56e9ca633140f38fae112edf99956839cfcf7f0c
parent81beae2e70b4533a46c79f1352f65a878c1cdb60 (diff)
downloadaur-d138a22ff988983c720dc66786ac69080d373ea6.tar.gz
Update to 20150724.r2261.41c03b8 and include the missing include fix by mfrischknecht
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD14
-rw-r--r--missing-include-fix.patch21
3 files changed, 36 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1a7ff5391dc1..cce1388d3d41 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = synergy-git
pkgdesc = Share a single mouse and keyboard between multiple computers
- pkgver = 20150707.r2252.284b2e7
+ pkgver = 20150724.r2261.41c03b8
pkgrel = 1
url = http://synergy-foss.org
arch = i686
@@ -23,9 +23,11 @@ pkgbase = synergy-git
source = synergy::git+https://github.com/synergy/synergy.git
source = synergys_at.socket
source = synergys_at.service
- sha1sums = SKIP
- sha1sums = 7ec33221725fc496b807e0f435c5e87b590beb5d
- sha1sums = 65ab58cc3546d6374a05a6a260f15045632e43ce
+ source = missing-include-fix.patch
+ sha512sums = SKIP
+ sha512sums = f9c124533dfd0bbbb1b5036b7f4b06f7f86f69165e88b9146ff17798377119eb9f1a4666f3b2ee9840bc436558d715cdbfe2fdfd7624348fae64871f785a1a62
+ sha512sums = e85cc3452bb8ba8fcccb1857386c77eb1e4cabb149a1c492c56b38e1b121ac0e7d96c6fcbd3c9b522d3a4ae9d7a9974f4a89fc32b02a56f665be92af219e371c
+ sha512sums = 679cc88794d2ef65325ef93f1034f465824efeb2f01521eda7050556c1200df31abf9b5d055b9438d24f040c234d37b74c489e4db6acbf15a2e7fec8e1da226d
pkgname = synergy-git
diff --git a/PKGBUILD b/PKGBUILD
index e436335ee41b..1428eca9d0b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
_pkgname=synergy
pkgname=$_pkgname-git
-pkgver=20150707.r2252.284b2e7
+pkgver=20150724.r2261.41c03b8
pkgrel=1
pkgdesc='Share a single mouse and keyboard between multiple computers'
url='http://synergy-foss.org'
@@ -25,11 +25,13 @@ source=(
"$_pkgname::git+https://github.com/$_pkgname/$_pkgname.git"
"${_pkgname}s_at.socket"
"${_pkgname}s_at.service"
+ 'missing-include-fix.patch'
)
-sha1sums=(
+sha512sums=(
'SKIP'
- '7ec33221725fc496b807e0f435c5e87b590beb5d'
- '65ab58cc3546d6374a05a6a260f15045632e43ce'
+ 'f9c124533dfd0bbbb1b5036b7f4b06f7f86f69165e88b9146ff17798377119eb9f1a4666f3b2ee9840bc436558d715cdbfe2fdfd7624348fae64871f785a1a62'
+ 'e85cc3452bb8ba8fcccb1857386c77eb1e4cabb149a1c492c56b38e1b121ac0e7d96c6fcbd3c9b522d3a4ae9d7a9974f4a89fc32b02a56f665be92af219e371c'
+ '679cc88794d2ef65325ef93f1034f465824efeb2f01521eda7050556c1200df31abf9b5d055b9438d24f040c234d37b74c489e4db6acbf15a2e7fec8e1da226d'
)
provides=("$_pkgname")
conflicts=("$_pkgname")
@@ -43,7 +45,9 @@ pkgver() {
}
prepare() {
- cd $_pkgname/ext
+ cd $_pkgname
+ patch -p1 < ../missing-include-fix.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
}
diff --git a/missing-include-fix.patch b/missing-include-fix.patch
new file mode 100644
index 000000000000..ed53bd40c927
--- /dev/null
+++ b/missing-include-fix.patch
@@ -0,0 +1,21 @@
+From 5080bf0c679711f60ca14eb5979d92f181749bb7 Mon Sep 17 00:00:00 2001
+From: Manuel Frischknecht <manuel.frischknecht@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