summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Siegert2019-04-11 09:05:51 +0200
committerFrank Siegert2019-04-11 09:05:55 +0200
commit06014145c50310c0901c56467dd78d6931a50687 (patch)
treeefef881eb31b05759cb650527cc67f705243a441
parentd8b3613f6d941e84719e30f11e2104036eedbd22 (diff)
downloadaur-06014145c50310c0901c56467dd78d6931a50687.tar.gz
Update to 1.5.3-2 include patch for memleak
-rw-r--r--.SRCINFO6
-rw-r--r--218.diff15
-rw-r--r--PKGBUILD7
3 files changed, 9 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2a639bddb23f..ac61c91c824a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = openboard
pkgdesc = Interactive whiteboard software for schools and universities
pkgver = 1.5.3
- pkgrel = 1
+ pkgrel = 2
url = http://openboard.ch/index.en.html
arch = x86_64
arch = i686
@@ -23,13 +23,15 @@ pkgbase = openboard
source = https://github.com/OpenBoard-org/OpenBoard-ThirdParty/archive/master.zip
source = qchar.patch
source = qwebkit.patch
- source = 218.diff
+ source = https://github.com/OpenBoard-org/OpenBoard/pull/218.diff
+ source = https://github.com/OpenBoard-org/OpenBoard/pull/223.diff
source = openboard.desktop
md5sums = fe3644033dccfd16c80b683210e4ac57
md5sums = fa1ff089f0bcc15d2a510bb90cdd3002
md5sums = bf2c524f3897cfcfb4315bcd92d4206e
md5sums = 60f64db6bf627015f4747879c4b30fd3
md5sums = f484614cc48181287607afb5a45ef644
+ md5sums = 04c421c140e983d41975943ede5fe61a
md5sums = 21d1749400802f8fc0669feaf77de683
pkgname = openboard
diff --git a/218.diff b/218.diff
deleted file mode 100644
index 6e5c1b60c05e..000000000000
--- a/218.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/podcast/podcast.pri b/src/podcast/podcast.pri
-index 7e6ea9ee..e96263fa 100644
---- a/src/podcast/podcast.pri
-+++ b/src/podcast/podcast.pri
-@@ -69,8 +69,8 @@ linux-g++* {
- -lxcb-xfixes \
- -lxcb-render -lxcb-shape -lxcb -lX11 -lasound -lSDL -lx264 -lpthread -lvpx -lvorbisenc -lvorbis -ltheoraenc -ltheoradec -logg -lopus -lmp3lame -lfreetype -lfdk-aac -lass -llzma -lbz2 -lz -ldl -lswresample -lswscale -lavutil -lm
-
-- UBUNTU_VERSION = $$system(lsb_release -irs)
-- equals(UBUNTU_VERSION, Ubuntu 14.04) {
-+ FFMPEG_VERSION = $$system(ffmpeg --version|& grep -oP "version.*?\K[0-9]\.[0-9]")
-+ equals(FFMPEG_VERSION, 2.8) {
- LIBS -= -lswresample
- LIBS += -lavresample
- }
diff --git a/PKGBUILD b/PKGBUILD
index 305d356592fb..9c71ee08d794 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Frank Siegert <frank.siegert@googlemail.com>
pkgname=openboard
pkgver=1.5.3
-pkgrel=1
+pkgrel=2
pkgdesc="Interactive whiteboard software for schools and universities"
arch=('x86_64' 'i686')
url="http://openboard.ch/index.en.html"
@@ -11,13 +11,15 @@ source=("https://github.com/OpenBoard-org/OpenBoard/archive/v$pkgver.tar.gz"
"https://github.com/OpenBoard-org/OpenBoard-ThirdParty/archive/master.zip"
qchar.patch
qwebkit.patch
- 218.diff
+ https://github.com/OpenBoard-org/OpenBoard/pull/218.diff
+ https://github.com/OpenBoard-org/OpenBoard/pull/223.diff
openboard.desktop)
md5sums=('fe3644033dccfd16c80b683210e4ac57'
'fa1ff089f0bcc15d2a510bb90cdd3002'
'bf2c524f3897cfcfb4315bcd92d4206e'
'60f64db6bf627015f4747879c4b30fd3'
'f484614cc48181287607afb5a45ef644'
+ '04c421c140e983d41975943ede5fe61a'
'21d1749400802f8fc0669feaf77de683')
prepare() {
@@ -28,6 +30,7 @@ prepare() {
patch -p1 < $srcdir/qchar.patch
patch -p1 < $srcdir/qwebkit.patch
patch -p1 < $srcdir/218.diff
+ patch -p1 < $srcdir/223.diff
}
build() {