QvkScreenkey.h fix. Beta 2.3.5

3 files changed, 28 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ae20c6d8534b..ec79ce742e4d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vokoscreen-git
-	pkgdesc = An easy to use screencast creator. Qt5 build. Development version.
-	pkgver = 2.3.5.beta.r0.g0fe3ec2
-	pkgrel = 1
+	pkgdesc = An easy to use screencast creator. Qt5 UI. Development version.
+	pkgver = 2.3.6.beta.r1.g6cf2dee
+	pkgrel = 2
 	url = http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html
 	arch = i686
 	arch = x86_64
@@ -12,12 +12,14 @@ pkgbase = vokoscreen-git
 	depends = lame
 	depends = qt5-x11extras
 	optdepends = pulseaudio-alsa: for PulseAudio support
-	provides = vokoscreen=2.3.5.beta.r0.g0fe3ec2
+	provides = vokoscreen=2.3.6.beta.r1.g6cf2dee
 	conflicts = vokoscreen
 	source = git+https://github.com/vkohaupt/vokoscreen.git
 	source = desktop_file.patch
+	source = moc_qvkscreenkey_fix.patch
 	sha512sums = SKIP
 	sha512sums = 3ddc567f831b9f6e2672997a77a099cf8fdd5a6a1d79157738c1670c9106fd6c4e09d74287a770c19bac23dcb73a19ce69cc1ac893d4988f75c7ac35668f7a90
+	sha512sums = 1cb8bf086d5eb0541dfaa6606fb04a978c280a381e7fa39f562d5e27032642d434362a4e13618a0f8c2b36418aebeabe93264bb35eb97a085e9275a3472d0da0
 
 pkgname = vokoscreen-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 643840853334..5a4415c6e179 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@
 
 _pkgname=vokoscreen
 pkgname=${_pkgname}-git
-pkgver=2.3.5.beta.r0.g0fe3ec2
-pkgrel=1
-pkgdesc='An easy to use screencast creator. Qt5 build. Development version.'
+pkgver=2.3.6.beta.r1.g6cf2dee
+pkgrel=2
+pkgdesc='An easy to use screencast creator. Qt5 UI. Development version.'
 arch=('i686' 'x86_64')
 url='http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html'
 license=('GPL2')
@@ -22,10 +22,12 @@ conflicts=("${_pkgname}")
 source=(
 	"git+https://github.com/vkohaupt/${_pkgname}.git"
 	'desktop_file.patch'
+	'moc_qvkscreenkey_fix.patch'
 )
 sha512sums=(
 	'SKIP'
 	'3ddc567f831b9f6e2672997a77a099cf8fdd5a6a1d79157738c1670c9106fd6c4e09d74287a770c19bac23dcb73a19ce69cc1ac893d4988f75c7ac35668f7a90'
+	'1cb8bf086d5eb0541dfaa6606fb04a978c280a381e7fa39f562d5e27032642d434362a4e13618a0f8c2b36418aebeabe93264bb35eb97a085e9275a3472d0da0'
 )
 
 pkgver() {
@@ -42,6 +44,10 @@ prepare() {
 	# Patching *.desktop file
 	cd ${srcdir}/${_pkgname}
 	patch ./applications/${_pkgname}.desktop ../desktop_file.patch
+	
+	# Fix QvkScreenkey.h
+	# https://forum.qt.io/topic/41817/expected-unqualified-id-before-int-with-qt5-3-only-for-bool-signal-and-slot/2
+	patch ./screenkey/QvkScreenkey.h ../moc_qvkscreenkey_fix.patch
 
 	# Create build directory
 	mkdir -p ${srcdir}/build
diff --git a/moc_qvkscreenkey_fix.patch b/moc_qvkscreenkey_fix.patch
new file mode 100644
index 000000000000..4c3bed3165fa
--- /dev/null
+++ b/moc_qvkscreenkey_fix.patch
@@ -0,0 +1,13 @@
+--- a/screenkey/QvkScreenkey.h	2015-06-14 17:14:13.276872940 -0500
++++ b/screenkey/QvkScreenkey.h	2015-06-14 17:15:21.356869542 -0500
+@@ -9,6 +9,10 @@
+ #include <stdio.h>
+ #include <string.h>
+
++#ifdef Bool
++#undef Bool
++#endif
++
+ class QvkScreenkey: public QObject
+ { 
+ Q_OBJECT