Minor patch improvement

4 files changed, 38 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f8a73cb2ecd..152048a970a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Mar 20 06:48:51 UTC 2016
+# Wed Mar 23 02:21:14 UTC 2016
 pkgbase = vokoscreen
 	pkgdesc = An easy to use screencast creator. Qt5 UI.
 	pkgver = 2.4.18.beta
-	pkgrel = 1
+	pkgrel = 2
 	url = http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html
 	install = vokoscreen.install
 	arch = i686
@@ -18,10 +18,10 @@ pkgbase = vokoscreen
 	provides = vokoscreen=2.4.18.beta
 	conflicts = vokoscreen-git
 	source = vokoscreen-2.4.18-beta.tar.gz::https://github.com/vkohaupt/vokoscreen/archive/2.4.18-beta.tar.gz
-	source = lrelease_qt5_fix.patch
+	source = lrelease_fix.patch
 	source = desktop_file.patch
 	sha512sums = 1f0717c34e625cad57141f24369420a2a4fdbb7ebe7a2fb9e6ad1c6e107b546259247c39dd472815161f4942dabde001a6592615339e1016b81b8615d0e9d649
-	sha512sums = f85d0c1c2fb264ef201870cfc595042b5ef1e5ec8884c46dbc7b1ff19808d934179de3fca23d5b208fa4913f475dd52e7a86cc13d4a62a89bcfd91b5141dd87c
+	sha512sums = c88025e797daa551d9fb74d4edefd04f0f5034dd3a67163518687eb41a0a03b6b50074179bc9b8d620277ac96a53ccd100b788ebffb40e7dd741869e4e9bbab3
 	sha512sums = 3ddc567f831b9f6e2672997a77a099cf8fdd5a6a1d79157738c1670c9106fd6c4e09d74287a770c19bac23dcb73a19ce69cc1ac893d4988f75c7ac35668f7a90
 
 pkgname = vokoscreen
diff --git a/PKGBUILD b/PKGBUILD
index b3954614eeed..d3594a0788e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=vokoscreen
 _pkgver=2.4.18-beta
 pkgver=${_pkgver/-/.}
-pkgrel=1
+pkgrel=2
 pkgdesc='An easy to use screencast creator. Qt5 UI.'
 arch=('i686' 'x86_64')
 url='http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html'
@@ -22,12 +22,12 @@ install=${pkgname}.install
 
 source=(
 	"${pkgname}-${_pkgver}.tar.gz::https://github.com/vkohaupt/${pkgname}/archive/${_pkgver}.tar.gz"
-	'lrelease_qt5_fix.patch'
+	'lrelease_fix.patch'
 	'desktop_file.patch'
 )
 sha512sums=(
 	'1f0717c34e625cad57141f24369420a2a4fdbb7ebe7a2fb9e6ad1c6e107b546259247c39dd472815161f4942dabde001a6592615339e1016b81b8615d0e9d649'
-	'f85d0c1c2fb264ef201870cfc595042b5ef1e5ec8884c46dbc7b1ff19808d934179de3fca23d5b208fa4913f475dd52e7a86cc13d4a62a89bcfd91b5141dd87c'
+	'c88025e797daa551d9fb74d4edefd04f0f5034dd3a67163518687eb41a0a03b6b50074179bc9b8d620277ac96a53ccd100b788ebffb40e7dd741869e4e9bbab3'
 	'3ddc567f831b9f6e2672997a77a099cf8fdd5a6a1d79157738c1670c9106fd6c4e09d74287a770c19bac23dcb73a19ce69cc1ac893d4988f75c7ac35668f7a90'
 )
 
@@ -35,7 +35,7 @@ prepare() {
 	cd "${srcdir}"/${pkgname}-${_pkgver}
 
 	# lrelease fix
-	patch -Np1 < ../lrelease_qt5_fix.patch
+	patch -Np1 < ../lrelease_fix.patch
 	
 	# Desktop file description
 	patch -Np1 < ../desktop_file.patch
diff --git a/lrelease_fix.patch b/lrelease_fix.patch
new file mode 100644
index 000000000000..bd9a220d831d
--- /dev/null
+++ b/lrelease_fix.patch
@@ -0,0 +1,30 @@
+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}
diff --git a/lrelease_qt5_fix.patch b/lrelease_qt5_fix.patch
deleted file mode 100644
index c0416538396f..000000000000
--- a/lrelease_qt5_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uprNBZ --suppress-blank-empty a/vokoscreen.pro b/vokoscreen.pro
---- a/vokoscreen.pro	2016-03-19 23:10:48.000000000 -0600
-+++ b/vokoscreen.pro	2016-03-20 00:30:43.886544622 -0600
-@@ -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_BINS]/lrelease
-   }
-   isEmpty(TS_DIR):TS_DIR = language
-   TSQM.name = lrelease-qt5 ${QMAKE_FILE_IN}