diff options
| author | bartus | 2022-01-20 11:08:08 +0100 |
|---|---|---|
| committer | bartus | 2022-01-20 11:08:49 +0100 |
| commit | 09106bb543da667089476fb5c5e4049d75469833 (patch) | |
| tree | 49569a7c630185d0b7fda2f884a1a56739fac3ab | |
| parent | 1a00505dfa7f67623719dca9a59faeb2b496826e (diff) | |
| download | aur-09106bb543da667089476fb5c5e4049d75469833.tar.gz | |
Fix build agasint latest Arch poppler pkg
Fix #2
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | c++17.patch | 16 |
3 files changed, 24 insertions, 2 deletions
@@ -1,7 +1,7 @@ pkgbase = openboard-git pkgdesc = Interactive whiteboard software for schools and universities (development version current master) pkgver = 1.6.1.r6.gdd19e752 - pkgrel = 2 + pkgrel = 3 url = http://openboard.ch/index.en.html arch = x86_64 arch = i686 @@ -28,12 +28,14 @@ pkgbase = openboard-git source = openboard.desktop source = qchar.patch source = quazip.patch + source = c++17.patch source = drop_ThirdParty_repo.patch source = 30fps.patch sha256sums = SKIP sha256sums = e518455b149ced284f515219d752a579f82c67fd143c6f489ea00ff0741a0c79 sha256sums = b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549 sha256sums = 0a9d037336dab3dbd99652b71934a94cd1e9801650fe5e72f4dd1de1718dd4c1 + sha256sums = 7b3ca090cee096f47b27f29f2a1a956b4afcaa08338a084fcb20cd7f01d71e26 sha256sums = a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14 sha256sums = 205062adbbd48d6622341e316e14a5496f73696385a3ed5cda7a89d3e7d2861d @@ -5,7 +5,7 @@ pkgname=openboard-git _fragment="#branch=master" pkgver=1.6.1.r6.gdd19e752 -pkgrel=2 +pkgrel=3 pkgdesc="Interactive whiteboard software for schools and universities (development version current master)" arch=('x86_64' 'i686') url="http://openboard.ch/index.en.html" @@ -20,12 +20,14 @@ source=("git://github.com/OpenBoard-org/OpenBoard.git${_fragment}" openboard.desktop) source+=(qchar.patch) source+=(quazip.patch) +source+=(c++17.patch) source+=(drop_ThirdParty_repo.patch) source+=(30fps.patch) sha256sums=('SKIP' 'e518455b149ced284f515219d752a579f82c67fd143c6f489ea00ff0741a0c79' 'b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549' '0a9d037336dab3dbd99652b71934a94cd1e9801650fe5e72f4dd1de1718dd4c1' + '7b3ca090cee096f47b27f29f2a1a956b4afcaa08338a084fcb20cd7f01d71e26' 'a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14' '205062adbbd48d6622341e316e14a5496f73696385a3ed5cda7a89d3e7d2861d') @@ -42,6 +44,8 @@ prepare() { patch -p1 < "$srcdir"/qchar.patch msg2 "quazip" patch -p1 < "$srcdir"/quazip.patch + msg2 "cpp17" + patch -p1 < "$srcdir"/c++17.patch msg2 "gcc11" sed 's/_serialize/serialize/g' -i src/pdf-merger/Object.{h,cpp} } diff --git a/c++17.patch b/c++17.patch new file mode 100644 index 000000000000..c919284db87e --- /dev/null +++ b/c++17.patch @@ -0,0 +1,16 @@ +--- orig/OpenBoard.pro 2022-01-17 19:21:33.000000000 +0100 ++++ OpenBoard-1.6.1/OpenBoard.pro 2022-01-13 20:52:35.000000000 +0100 +@@ -1,11 +1,12 @@ + TARGET = "OpenBoard" + TEMPLATE = app + +-CONFIG += c++14 ++CONFIG += c++1z + CONFIG -= flat + CONFIG += debug_and_release \ + no_include_pwd + ++QMAKE_CXXFLAGS += -std=c++17 + + VERSION_MAJ = 1 + VERSION_MIN = 6 |