summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Siegert2018-12-16 23:38:18 +0100
committerFrank Siegert2018-12-16 23:38:18 +0100
commit8982444adeab45214eebddcf6d23956574609dc3 (patch)
treeefc5b3e1745407bdad92a17b32798f40957440f0
parent2c612d47a92270ee1809c7a84fd80f0675d1d4e0 (diff)
downloadaur-8982444adeab45214eebddcf6d23956574609dc3.tar.gz
Fix for new QWebKit dependency structure (thanks to madprog!).
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD5
-rw-r--r--qwebkit.patch12
3 files changed, 20 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e56a1c585d56..1d63c50650c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun Dec 16 21:26:08 UTC 2018
+# Sun Dec 16 22:37:09 UTC 2018
pkgbase = openboard
pkgdesc = Interactive whiteboard software for schools and universities
pkgver = 1.5.1
- pkgrel = 1
+ pkgrel = 2
url = http://openboard.ch/index.en.html
arch = x86_64
arch = i686
@@ -24,11 +24,13 @@ pkgbase = openboard
source = https://github.com/OpenBoard-org/OpenBoard-ThirdParty/archive/master.zip
source = ssl10.patch
source = qchar.patch
+ source = qwebkit.patch
source = openboard.desktop
md5sums = fc8b5a3a90e4f85965158135ad3a9c0e
md5sums = fa1ff089f0bcc15d2a510bb90cdd3002
md5sums = 9dbccb56e4079b75c606dc40c3e77f00
md5sums = bf2c524f3897cfcfb4315bcd92d4206e
+ md5sums = 60f64db6bf627015f4747879c4b30fd3
md5sums = 21d1749400802f8fc0669feaf77de683
pkgname = openboard
diff --git a/PKGBUILD b/PKGBUILD
index 1296b5c85816..a2a1c84fca82 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Frank Siegert <frank.siegert@googlemail.com>
pkgname=openboard
pkgver=1.5.1
-pkgrel=1
+pkgrel=2
pkgdesc="Interactive whiteboard software for schools and universities"
arch=('x86_64' 'i686')
url="http://openboard.ch/index.en.html"
@@ -11,11 +11,13 @@ source=("https://github.com/OpenBoard-org/OpenBoard/archive/v$pkgver.tar.gz"
"https://github.com/OpenBoard-org/OpenBoard-ThirdParty/archive/master.zip"
ssl10.patch
qchar.patch
+ qwebkit.patch
openboard.desktop)
md5sums=('fc8b5a3a90e4f85965158135ad3a9c0e'
'fa1ff089f0bcc15d2a510bb90cdd3002'
'9dbccb56e4079b75c606dc40c3e77f00'
'bf2c524f3897cfcfb4315bcd92d4206e'
+ '60f64db6bf627015f4747879c4b30fd3'
'21d1749400802f8fc0669feaf77de683')
prepare() {
@@ -25,6 +27,7 @@ prepare() {
cd $srcdir/OpenBoard-$pkgver
patch -p1 < $srcdir/ssl10.patch
patch -p1 < $srcdir/qchar.patch
+ patch -p1 < $srcdir/qwebkit.patch
}
build() {
diff --git a/qwebkit.patch b/qwebkit.patch
new file mode 100644
index 000000000000..6e8d0d8887fc
--- /dev/null
+++ b/qwebkit.patch
@@ -0,0 +1,12 @@
+diff -u -ubr a/resources/forms/trapFlash.ui b/resources/forms/trapFlash.ui
+--- a/resources/forms/trapFlash.ui 2017-05-09 15:59:42.177965830 +0200
++++ b/resources/forms/trapFlash.ui 2017-05-09 16:00:08.547747097 +0200
+@@ -113,7 +113,7 @@
+ <customwidget>
+ <class>QWebView</class>
+ <extends>QWidget</extends>
+- <header>QtWebKit/QWebView</header>
++ <header>QtWebKitWidgets/QWebView</header>
+ </customwidget>
+ </customwidgets>
+ <resources/>