summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorhaawda2023-07-05 08:52:11 +0200
committerhaawda2023-07-05 08:52:11 +0200
commit8b31aa6001ba2ea50429cb54025c24bf817fd283 (patch)
treeab1d19afaa1a2939664d63034094d8d2694f2339
parent10bf17dfc74cd45e3e33e4620bae6a60a885724e (diff)
downloadaur-8b31aa6001ba2ea50429cb54025c24bf817fd283.tar.gz
enforce c++-17 standard
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD9
2 files changed, 19 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e650fe0f6fd6..9f3f99d33e5b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
pkgbase = marble-git
pkgdesc = Desktop Globe. (GIT version)
- pkgver = 20.12.3.427.ge1d1826c6
+ pkgver = 20.12.3.454.g2edf1673f
pkgrel = 1
url = https://www.kde.org/applications/system/marble
arch = i686
arch = x86_64
license = GPL
makedepends = git
- makedepends = gpsd
makedepends = quazip
makedepends = shapelib
makedepends = libwlocate
@@ -29,8 +28,19 @@ pkgname = marble-git
groups = kde-applications
groups = kdeedu
depends = marble-common-git
+ depends = gpsd
+ depends = qt5-serialport
+ depends = krunner
+ depends = qt5-webengine
+ depends = protobuf
depends = knewstuff
depends = kparts
+ depends = shapelib
+ depends = libwlocate
+ depends = phonon-qt5
+ depends = qt5-location
+ depends = qt5-webchannel
+ depends = gcc-libs
provides = marble
conflicts = kdeedu-marble<15.04.3-3
conflicts = marble-qt
@@ -60,5 +70,5 @@ pkgname = marble-common-git
depends = libastro-git
depends = marble-git
depends = marble-data-git
- provides = marble-common=20.12.3.427.ge1d1826c6
+ provides = marble-common=20.12.3.454.g2edf1673f
conflicts = marble-common
diff --git a/PKGBUILD b/PKGBUILD
index 7dda1a735392..f0fb96e329a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,13 +6,13 @@ pkgname=('marble-git'
'libastro-git'
'marble-data-git'
'marble-common-git')
-pkgver=20.12.3.427.ge1d1826c6
+pkgver=20.12.3.454.g2edf1673f
pkgrel=1
pkgdesc="Desktop Globe. (GIT version)"
arch=('i686' 'x86_64')
url='https://www.kde.org/applications/system/marble'
license=('GPL')
-makedepends=('git' 'gpsd' 'quazip' 'shapelib' 'libwlocate' 'phonon-qt5'
+makedepends=('git' 'quazip' 'shapelib' 'libwlocate' 'phonon-qt5'
'extra-cmake-modules' 'krunner' 'python' 'qt5-webengine'
'qt5-tools' 'qt5-serialport' 'kparts' 'knewstuff' 'opencv'
'hicolor-icon-theme')
@@ -44,6 +44,7 @@ build() {
-DCMAKE_INSTALL_LIBDIR=lib \
-DQT_PLUGINS_DIR=lib/qt/plugins \
-DBUILD_TESTING=OFF \
+ -DCMAKE_CXX_STANDARD=17 \
-DBUILD_MARBLE_EXAMPLES=OFF \
-DBUILD_MARBLE_TOOLS=ON \
-DBUILD_MARBLE_TESTS=ON \
@@ -64,7 +65,9 @@ package_libastro-git() {
}
package_marble-git() {
- depends=('marble-common-git' 'knewstuff' 'kparts')
+ depends=('marble-common-git' 'gpsd' 'qt5-serialport' 'krunner' 'qt5-webengine'
+ 'protobuf' 'knewstuff' 'kparts' 'shapelib' 'libwlocate' 'phonon-qt5'
+ 'qt5-location' 'qt5-webchannel' 'gcc-libs')
conflicts=('kdeedu-marble<15.04.3-3' 'marble-qt' 'marble')
provides=('marble')
groups=('kde-applications' 'kdeedu')