summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2021-05-31 22:07:03 +0200
committerbartus2021-05-31 22:07:03 +0200
commitd1b2d692eb98e0df970079e45978a01f3fec2001 (patch)
tree92a47281ccb42398e0a4373b541e65b0c639eea2
parentfb72601ae8fba53942a5fa176349df00de9a23d0 (diff)
downloadaur-d1b2d692eb98e0df970079e45978a01f3fec2001.tar.gz
Fix gcc:11 name collision
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c32bdb761fb8..ca1b363c5e16 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = openboard-git
pkgdesc = Interactive whiteboard software for schools and universities (development version current master)
- pkgver = 1.6.1rc.0309.r10.gf3f07f99
+ pkgver = 1.6.1.r6.gdd19e752
pkgrel = 1
url = http://openboard.ch/index.en.html
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 3c7b0cac022f..afed8e29b085 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,13 @@
pkgname=openboard-git
_fragment="#branch=master"
-pkgver=1.6.1rc.0309.r10.gf3f07f99
+pkgver=1.6.1.r6.gdd19e752
pkgrel=1
pkgdesc="Interactive whiteboard software for schools and universities (development version current master)"
arch=('x86_64' 'i686')
url="http://openboard.ch/index.en.html"
license=('GPL3')
-provides=("${pkgname%-git}=${pkgver%%rc*}")
+provides=("${pkgname%-git}=${pkgver%%.r*}")
conflicts=("${pkgname%-git}")
depends=('qt5-base' 'qt5-multimedia' 'qt5-svg' 'qt5-script' 'qt5-webkit' 'qt5-tools' 'qt5-xmlpatterns' 'libpaper' 'bzip2' 'openssl' 'libfdk-aac' 'sdl' 'ffmpeg')
depends+=(quazip) #drop internal quazip and use system one.
@@ -42,6 +42,8 @@ prepare() {
patch -p1 < "$srcdir"/qchar.patch
msg2 "quazip"
patch -p1 < "$srcdir"/quazip.patch
+ msg2 "gcc11"
+ sed 's/_serialize/serialize/g' -i src/pdf-merger/Object.{h,cpp}
}
build() {