Version 2.4.21.beta

4 files changed, 34 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0bed45f3109d..649896c322cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Apr 21 20:48:20 UTC 2016
+# Thu Apr 21 21:13:41 UTC 2016
 pkgbase = vokoscreen
 	pkgdesc = An easy to use screencast creator. Qt5 UI.
-	pkgver = 2.4.20.beta
+	pkgver = 2.4.21.beta
 	pkgrel = 1
 	url = http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html
 	install = vokoscreen.install
@@ -10,19 +10,21 @@ pkgbase = vokoscreen
 	arch = x86_64
 	license = GPL2
 	makedepends = qt5-tools
+	depends = qt5-x11extras
 	depends = ffmpeg
 	depends = lame
-	depends = qt5-x11extras
 	depends = desktop-file-utils
+	depends = xdg-utils
+	depends = lsof
 	optdepends = pulseaudio-alsa: for PulseAudio support
-	provides = vokoscreen=2.4.20.beta
+	provides = vokoscreen=2.4.21.beta
 	conflicts = vokoscreen-git
-	source = vokoscreen-2.4.20-beta.tar.gz::https://github.com/vkohaupt/vokoscreen/archive/2.4.20-beta.tar.gz
-	source = lrelease_fix.patch
+	source = vokoscreen-2.4.21-beta.tar.gz::https://github.com/vkohaupt/vokoscreen/archive/2.4.21-beta.tar.gz
 	source = desktop_file.patch
-	sha512sums = ef5741d932696e70a3abef4a458b88db58d3d1b6cfee0f2ddf1ea77b3634a8e2104dc6f9ab16427adde8bec16c3bd85cdb6f21e2c414154a46a2680fec60728b
-	sha512sums = c88025e797daa551d9fb74d4edefd04f0f5034dd3a67163518687eb41a0a03b6b50074179bc9b8d620277ac96a53ccd100b788ebffb40e7dd741869e4e9bbab3
+	source = fix_lrelease.patch
+	sha512sums = eef5a9d5c266020f3eae9f982442b4e58af393a449fe4300f015527fd804c91c9b7b759970f1edd39466ffab55aea38770d591418d8495d3fe0c7681dac4f43d
 	sha512sums = 3ddc567f831b9f6e2672997a77a099cf8fdd5a6a1d79157738c1670c9106fd6c4e09d74287a770c19bac23dcb73a19ce69cc1ac893d4988f75c7ac35668f7a90
+	sha512sums = 4c7e61e06a90de2815dd7564a9df050a939d5a3a1bb5514ee5808fd5277b5e6a12af80384f630e2c8429ca2decb318684b8f300a64846ae393c9482bc81425a4
 
 pkgname = vokoscreen
 
diff --git a/PKGBUILD b/PKGBUILD
index dd30f6f5d919..f8792e8787bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Giacomo <giacomogiorgianni at gmail dot com>
 
 pkgname=vokoscreen
-_pkgver=2.4.20-beta
+_pkgver=2.4.21-beta
 pkgver=${_pkgver/-/.}
 pkgrel=1
 pkgdesc='An easy to use screencast creator. Qt5 UI.'
@@ -10,7 +10,10 @@ arch=('i686' 'x86_64')
 url='http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html'
 license=('GPL2')
 
-depends=('ffmpeg' 'lame' 'qt5-x11extras' 'desktop-file-utils')
+depends=(
+	'qt5-x11extras' 'ffmpeg' 'lame'
+	'desktop-file-utils' 'xdg-utils' 'lsof'
+)
 optdepends=(
 	'pulseaudio-alsa: for PulseAudio support'
 )
@@ -22,21 +25,21 @@ install=${pkgname}.install
 
 source=(
 	"${pkgname}-${_pkgver}.tar.gz::https://github.com/vkohaupt/${pkgname}/archive/${_pkgver}.tar.gz"
-	'lrelease_fix.patch'
 	'desktop_file.patch'
+	'fix_lrelease.patch'
 )
 sha512sums=(
-	'ef5741d932696e70a3abef4a458b88db58d3d1b6cfee0f2ddf1ea77b3634a8e2104dc6f9ab16427adde8bec16c3bd85cdb6f21e2c414154a46a2680fec60728b'
-	'c88025e797daa551d9fb74d4edefd04f0f5034dd3a67163518687eb41a0a03b6b50074179bc9b8d620277ac96a53ccd100b788ebffb40e7dd741869e4e9bbab3'
+	'eef5a9d5c266020f3eae9f982442b4e58af393a449fe4300f015527fd804c91c9b7b759970f1edd39466ffab55aea38770d591418d8495d3fe0c7681dac4f43d'
 	'3ddc567f831b9f6e2672997a77a099cf8fdd5a6a1d79157738c1670c9106fd6c4e09d74287a770c19bac23dcb73a19ce69cc1ac893d4988f75c7ac35668f7a90'
+	'4c7e61e06a90de2815dd7564a9df050a939d5a3a1bb5514ee5808fd5277b5e6a12af80384f630e2c8429ca2decb318684b8f300a64846ae393c9482bc81425a4'
 )
 
 prepare() {
 	cd "${srcdir}"/${pkgname}-${_pkgver}
 
-	# lrelease fix
-	patch -Np1 < ../lrelease_fix.patch
-	
+	# Fix lrelease path
+	patch -Np1 < ../fix_lrelease.patch
+
 	# Desktop file description
 	patch -Np1 < ../desktop_file.patch
 
@@ -56,8 +59,7 @@ build() {
 	cd "${srcdir}"/build
 	qmake-qt5 ../${pkgname}-${_pkgver} \
 		CONFIG+=release \
-		CONFIG+=c++14 \
-		-spec linux-g++
+		CONFIG+=c++14
 
 	make -j${njobs}
 }
diff --git a/fix_lrelease.patch b/fix_lrelease.patch
new file mode 100644
index 000000000000..462bb819c79c
--- /dev/null
+++ b/fix_lrelease.patch
@@ -0,0 +1,12 @@
+diff -uprNEBZ --suppress-blank-empty a/vokoscreen.pro b/vokoscreen.pro
+--- a/vokoscreen.pro	2016-04-19 04:48:55.000000000 -0500
++++ b/vokoscreen.pro	2016-04-21 15:56:08.404677703 -0500
+@@ -27,7 +27,7 @@ TRANSLATIONS = $$files(language/vokoscre
+ !isEmpty(TRANSLATIONS) {
+   isEmpty(QMAKE_LRELEASE) {
+     win32: QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
+-      else: QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease-qt5
++      else: QMAKE_LRELEASE = $$[QT_INSTALL_PREFIX]/bin/lrelease-qt5
+   }
+   isEmpty(TS_DIR):TS_DIR = language
+   TSQM.name = lrelease-qt5 ${QMAKE_FILE_IN}
diff --git a/lrelease_fix.patch b/lrelease_fix.patch
deleted file mode 100644
index bd9a220d831d..000000000000
--- a/lrelease_fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -uprNEBZ --suppress-blank-empty a/vokoscreen.pro b/vokoscreen.pro
---- a/vokoscreen.pro	2016-03-22 19:42:41.311844000 -0600
-+++ b/vokoscreen.pro	2016-03-22 20:00:55.593940662 -0600
-@@ -17,7 +17,7 @@ FORMS += vokoscreen.ui
- # Das Script/Macro siehe weiter unten "# language packages" muß weiter bestehen bleiben damit "make clean" die *.qm Dateien löscht.
-
- equals(QT_MAJOR_VERSION, "4") {
--  system(lrelease language/vokoscreen_*.ts)
-+  system(lrelease-qt4 language/vokoscreen_*.ts)
-   message("")
-   message("[vokoscreen] lrelease --> qt4")
-   message("")
-@@ -40,7 +40,7 @@ equals(QT_MAJOR_VERSION, "4") {
- !isEmpty(TRANSLATIONS) {
-   isEmpty(QMAKE_LRELEASE) {
-     win32: QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
--      else: QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
-+	  else: QMAKE_LRELEASE = $$[QT_INSTALL_PREFIX]/bin/lrelease-qt4
-   }
-   isEmpty(TS_DIR):TS_DIR = language
-   TSQM.name = lrelease ${QMAKE_FILE_IN}
-@@ -61,7 +61,7 @@ equals(QT_MAJOR_VERSION, "5") {
- !isEmpty(TRANSLATIONS) {
-   isEmpty(QMAKE_LRELEASE) {
-     win32: QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
--      else: QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease-qt5
-+      else: QMAKE_LRELEASE = $$[QT_INSTALL_PREFIX]/bin/lrelease-qt5
-   }
-   isEmpty(TS_DIR):TS_DIR = language
-   TSQM.name = lrelease-qt5 ${QMAKE_FILE_IN}