summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlfredo Ramos2015-08-18 21:57:37 -0500
committerAlfredo Ramos2015-08-18 21:57:37 -0500
commitfa5c066d09f5abe021d89995230d6019373a42e0 (patch)
tree68a83c4ea98db78f895ae69c56a17b77b199a79f
parentdf8832ea1bac7e46191cebab49309d8dff2f34b1 (diff)
downloadaur-fa5c066d09f5abe021d89995230d6019373a42e0.tar.gz
Qt 5.5 build fixed upstream
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD10
-rw-r--r--qdatastream_fix.patch10
3 files changed, 4 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index daad7a3d4e1..54eae922cf2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = vokoscreen-git
pkgdesc = An easy to use screencast creator. Qt5 UI. Development version.
- pkgver = 2.4.3.beta.r0.g8369402
+ pkgver = 2.4.3.beta.r20.g60f97b4
pkgrel = 2
url = http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html
arch = i686
@@ -12,13 +12,11 @@ pkgbase = vokoscreen-git
depends = lame
depends = qt5-x11extras
optdepends = pulseaudio-alsa: for PulseAudio support
- provides = vokoscreen=2.4.3.beta.r0.g8369402
+ provides = vokoscreen=2.4.3.beta.r20.g60f97b4
conflicts = vokoscreen
source = git+https://github.com/vkohaupt/vokoscreen.git
- source = qdatastream_fix.patch
source = desktop_file.patch
sha512sums = SKIP
- sha512sums = 301ad97abcb5ad731ee4a95ebf00b6fe47d53cb1e0342df00290f61e8c0316b4e2621c0743212a480bbe0a3699659f2fff1196629de0ebf843dc1b0d2997f889
sha512sums = 3ddc567f831b9f6e2672997a77a099cf8fdd5a6a1d79157738c1670c9106fd6c4e09d74287a770c19bac23dcb73a19ce69cc1ac893d4988f75c7ac35668f7a90
pkgname = vokoscreen-git
diff --git a/PKGBUILD b/PKGBUILD
index 367b20b464d..bcfc66921df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
_pkgname=vokoscreen
pkgname=${_pkgname}-git
-pkgver=2.4.3.beta.r0.g8369402
+pkgver=2.4.3.beta.r20.g60f97b4
pkgrel=2
pkgdesc='An easy to use screencast creator. Qt5 UI. Development version.'
arch=('i686' 'x86_64')
@@ -21,12 +21,10 @@ conflicts=("${_pkgname}")
source=(
"git+https://github.com/vkohaupt/${_pkgname}.git"
- 'qdatastream_fix.patch'
'desktop_file.patch'
)
sha512sums=(
'SKIP'
- '301ad97abcb5ad731ee4a95ebf00b6fe47d53cb1e0342df00290f61e8c0316b4e2621c0743212a480bbe0a3699659f2fff1196629de0ebf843dc1b0d2997f889'
'3ddc567f831b9f6e2672997a77a099cf8fdd5a6a1d79157738c1670c9106fd6c4e09d74287a770c19bac23dcb73a19ce69cc1ac893d4988f75c7ac35668f7a90'
)
@@ -41,12 +39,8 @@ pkgver() {
}
prepare() {
- cd ${srcdir}/${_pkgname}
-
- # Qt 5.5 fix
- patch QtSingleApplicationQt5/qtlocalpeer.h ../qdatastream_fix.patch
-
# Desktop file description
+ cd ${srcdir}/${_pkgname}
patch applications/${_pkgname}.desktop ../desktop_file.patch
# Create build directory
diff --git a/qdatastream_fix.patch b/qdatastream_fix.patch
deleted file mode 100644
index c1b7f0b5f52..00000000000
--- a/qdatastream_fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/QtSingleApplicationQt5/qtlocalpeer.h 2015-07-15 00:37:52.607697860 -0500
-+++ b/QtSingleApplicationQt5/qtlocalpeer.h 2015-07-15 00:38:05.327732874 -0500
-@@ -43,6 +43,7 @@
- #include <QLocalServer>
- #include <QLocalSocket>
- #include <QDir>
-+#include <QDataStream>
-
- #include "qtlockedfile.h"
-