summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD12
-rw-r--r--lrelease_fix.patch30
3 files changed, 44 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 66439c2a4030..9b2a15bc3425 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Fri Feb 12 02:21:09 UTC 2016
+# Wed Mar 23 02:14:23 UTC 2016
pkgbase = vokoscreen-git
pkgdesc = An easy to use screencast creator. Qt5 UI. Development version.
- pkgver = 2.4.15.beta.3.ge00de96
+ pkgver = 2.4.18.beta.1.g9577fa1
pkgrel = 2
url = http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html
install = vokoscreen-git.install
@@ -16,11 +16,13 @@ pkgbase = vokoscreen-git
depends = qt5-x11extras
depends = desktop-file-utils
optdepends = pulseaudio-alsa: for PulseAudio support
- provides = vokoscreen=2.4.15.beta.3.ge00de96
+ provides = vokoscreen=2.4.18.beta.1.g9577fa1
conflicts = vokoscreen
source = git+https://github.com/vkohaupt/vokoscreen.git
+ source = lrelease_fix.patch
source = desktop_file.patch
sha512sums = SKIP
+ sha512sums = c88025e797daa551d9fb74d4edefd04f0f5034dd3a67163518687eb41a0a03b6b50074179bc9b8d620277ac96a53ccd100b788ebffb40e7dd741869e4e9bbab3
sha512sums = 3ddc567f831b9f6e2672997a77a099cf8fdd5a6a1d79157738c1670c9106fd6c4e09d74287a770c19bac23dcb73a19ce69cc1ac893d4988f75c7ac35668f7a90
pkgname = vokoscreen-git
diff --git a/PKGBUILD b/PKGBUILD
index 057bd08c94dc..25395f61cc78 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
_pkgname=vokoscreen
pkgname=${_pkgname}-git
-pkgver=2.4.15.beta.3.ge00de96
+pkgver=2.4.18.beta.1.g9577fa1
pkgrel=2
pkgdesc='An easy to use screencast creator. Qt5 UI. Development version.'
arch=('i686' 'x86_64')
@@ -23,10 +23,12 @@ install=${pkgname}.install
source=(
"git+https://github.com/vkohaupt/${_pkgname}.git"
+ 'lrelease_fix.patch'
'desktop_file.patch'
)
sha512sums=(
'SKIP'
+ 'c88025e797daa551d9fb74d4edefd04f0f5034dd3a67163518687eb41a0a03b6b50074179bc9b8d620277ac96a53ccd100b788ebffb40e7dd741869e4e9bbab3'
'3ddc567f831b9f6e2672997a77a099cf8fdd5a6a1d79157738c1670c9106fd6c4e09d74287a770c19bac23dcb73a19ce69cc1ac893d4988f75c7ac35668f7a90'
)
@@ -37,9 +39,13 @@ pkgver() {
}
prepare() {
- # Desktop file description
cd "${srcdir}"/${_pkgname}
- patch -p1 < ../desktop_file.patch
+
+ # lrelease fix
+ patch -Np1 < ../lrelease_fix.patch
+
+ # Desktop entry
+ patch -Np1 < ../desktop_file.patch
# Create build directory
mkdir -p "${srcdir}"/build
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}