summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Weißschuh2015-08-18 22:44:07 +0000
committerThomas Weißschuh2015-08-18 22:44:07 +0000
commitcaa6a5b807b275675aca6d1891fd1b8a3a00d80a (patch)
treeb2e1ee1f234dbf597f5584e1ddf31cf3200312eb
parent07934a08cfe00757d0ed5df27db8c9b390412aca (diff)
downloadaur-caa6a5b807b275675aca6d1891fd1b8a3a00d80a.tar.gz
fix zeal for qt 5.5
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD5
-rw-r--r--add_qdatastream_include.patch13
3 files changed, 20 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0a2950e0850d..80cc1b48cb96 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = zeal
pkgdesc = Simple offline API documentation browser
pkgver = 0.1.1
- pkgrel = 1
+ pkgrel = 2
epoch = 1
url = http://zealdocs.org/
install = zeal.install
@@ -14,8 +14,10 @@ pkgbase = zeal
depends = libarchive
conflicts = zeal-git
source = zeal-0.1.1.tar.gz::https://github.com/jkozera/zeal/archive/v0.1.1.tar.gz
+ source = add_qdatastream_include.patch
source = zeal.install
sha256sums = f4e959f9bc66a6e350ee8a33d34695379633432d103db9776c0c7a76cbc5a9d6
+ sha256sums = 8aa8b29ea5d0ff06766eac6c8ad659012bfa71b0b62167bb0b2382291be7ad6b
sha256sums = 00c8482dd54eaa217682adee62267e8b9e45cc72842cba82ae7de370301cd4eb
pkgname = zeal
diff --git a/PKGBUILD b/PKGBUILD
index 4f3347bb3056..118368ba2571 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=zeal
epoch=1
pkgver=0.1.1
-pkgrel=1
+pkgrel=2
pkgdesc='Simple offline API documentation browser'
arch=(x86_64 i686)
url='http://zealdocs.org/'
@@ -13,10 +13,12 @@ makedepends=()
conflicts=(zeal-git)
install=zeal.install
source=(zeal-${pkgver}.tar.gz::https://github.com/jkozera/zeal/archive/v${pkgver}.tar.gz
+ add_qdatastream_include.patch
zeal.install)
build() {
cd "$srcdir/$pkgname-$pkgver"
+ patch -p1 < "${srcdir}/add_qdatastream_include.patch"
qmake CONFIG+=no_libappindicator
make ZEAL_VERSION=${pkgver}
}
@@ -27,4 +29,5 @@ package() {
}
sha256sums=('f4e959f9bc66a6e350ee8a33d34695379633432d103db9776c0c7a76cbc5a9d6'
+ '8aa8b29ea5d0ff06766eac6c8ad659012bfa71b0b62167bb0b2382291be7ad6b'
'00c8482dd54eaa217682adee62267e8b9e45cc72842cba82ae7de370301cd4eb')
diff --git a/add_qdatastream_include.patch b/add_qdatastream_include.patch
new file mode 100644
index 000000000000..9a1df8d3a3f7
--- /dev/null
+++ b/add_qdatastream_include.patch
@@ -0,0 +1,13 @@
+https://github.com/zealdocs/zeal/issues/376
+https://github.com/zealdocs/zeal/issues/380
+
+--- a/src/main.cpp 2015-04-19 23:08:52.000000000 +0000
++++ b/src/main.cpp 2015-08-18 22:36:56.408596690 +0000
+@@ -3,6 +3,7 @@
+
+ #include <QApplication>
+ #include <QCommandLineParser>
++#include <QDataStream>
+ #include <QDir>
+ #include <QLocalSocket>
+ #include <QStandardPaths>