summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorhaawda2020-12-01 22:12:36 +0100
committerhaawda2020-12-01 22:12:36 +0100
commit9167bc2cec61dd9bab362f3ec0fd62de0ad8a8d0 (patch)
tree5704753a5b534c54dafc0cd77c560622f555d5ed
parent8cb1d581a1bc67e6c30332bab1cf1b10f9bdf5d1 (diff)
downloadaur-9167bc2cec61dd9bab362f3ec0fd62de0ad8a8d0.tar.gz
fix dependencies
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD31
2 files changed, 9 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 171b08bdd4a1..914342556d79 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = marble-git
pkgdesc = Desktop Globe. (GIT version)
- pkgver = 20.08.1.47.g5ded04e18
+ pkgver = 20.08.3.81.gabdada2a0
pkgrel = 1
url = https://www.kde.org/applications/system/marble
arch = i686
@@ -28,19 +28,9 @@ pkgbase = marble-git
pkgname = marble-git
groups = kde-applications
groups = kdeedu
- depends = libastro-git
depends = marble-common-git
- depends = marble-data-git
- depends = qt5-webkit
- depends = kparts
depends = knewstuff
- depends = opencv
- depends = quazip
- optdepends = gpsd: position information via gpsd
- optdepends = shapelib: reading and displaying .shp files
- optdepends = qt5-serialport: reading from serial port in APRS plugin
- optdepends = libwlocate: Position information based on neighboring WLAN networks
- optdepends = krunner: Krunner plugin for marble
+ depends = kparts
provides = marble
conflicts = kdeedu-marble<15.04.3-3
conflicts = marble-qt
@@ -70,6 +60,6 @@ pkgname = marble-common-git
depends = libastro-git
depends = marble-git
depends = marble-data-git
- provides = marble-common=20.08.1.47.g5ded04e18
+ provides = marble-common=20.08.3.81.gabdada2a0
conflicts = marble-common
diff --git a/PKGBUILD b/PKGBUILD
index b8ada7cedc27..9ee53a57e86e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('marble-git'
'libastro-git'
'marble-data-git'
'marble-common-git')
-pkgver=20.08.1.47.g5ded04e18
+pkgver=20.08.3.81.gabdada2a0
pkgrel=1
pkgdesc="Desktop Globe. (GIT version)"
arch=('i686' 'x86_64')
@@ -63,38 +63,19 @@ package_libastro-git() {
}
package_marble-git() {
- depends=('libastro-git'
- 'marble-common-git'
- 'marble-data-git'
- 'qt5-webkit'
- 'kparts'
- 'knewstuff'
- 'opencv'
- 'quazip'
- )
- optdepends=('gpsd: position information via gpsd'
- 'shapelib: reading and displaying .shp files'
- 'qt5-serialport: reading from serial port in APRS plugin'
- 'libwlocate: Position information based on neighboring WLAN networks'
- 'krunner: Krunner plugin for marble'
- )
- conflicts=('kdeedu-marble<15.04.3-3'
- 'marble-qt'
- 'marble'
- )
+ depends=('marble-common-git' 'knewstuff' 'kparts')
+ conflicts=('kdeedu-marble<15.04.3-3' 'marble-qt' 'marble')
provides=('marble')
- groups=('kde-applications'
- 'kdeedu'
- )
+ groups=('kde-applications' 'kdeedu')
make -C build DESTDIR="${pkgdir}" install
- # provided by libastro
+ # provided by libastro-git
rm -fr "${pkgdir}/usr/include/astro"
rm -fr "${pkgdir}/usr/lib/"libastro.*
rm -fr "${pkgdir}/usr/lib/cmake/Astro"
- # provided by marble-data
+ # provided by marble-data-git
rm -fr "${pkgdir}/usr/share/"{icons,mime,marble}
}