Skip to content

Commit

Permalink
Handle conflicts and provides properly
Browse files Browse the repository at this point in the history
  • Loading branch information
IslandC0der committed Mar 30, 2024
1 parent 4cc23d2 commit 7d543d4
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 6 deletions.
12 changes: 9 additions & 3 deletions .SRCINFO
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pkgbase = marble-git
pkgdesc = Desktop Globe
pkgver = 24.04.70_r13851.gab23c211a
pkgrel = 1
pkgrel = 2
url = https://github.com/KDE/marble
arch = x86_64
license = GPL-2.0-or-later
Expand All @@ -20,8 +20,6 @@ pkgbase = marble-git
makedepends = qt5-webengine
makedepends = shapelib
makedepends = kirigami2-git
provides = marble
conflicts = marble
source = git+https://github.com/KDE/marble.git
sha256sums = SKIP

Expand All @@ -43,6 +41,8 @@ pkgname = marble-git
depends = qt5-base
depends = qt5-declarative
optdepends = krunner5: Krunner plugin
provides = marble
conflicts = marble

pkgname = marble-common-git
pkgdesc = Common libraries and plugins for Marble
Expand All @@ -61,6 +61,8 @@ pkgname = marble-common-git
optdepends = libwlocate: WLAN based geolocation
optdepends = qt5-serialport: APRS plugin
optdepends = shapelib: SHP plugin
provides = marble-common
conflicts = marble-common

pkgname = marble-maps-git
pkgdesc = OpenStreetMap Navigation
Expand All @@ -70,10 +72,14 @@ pkgname = marble-maps-git
depends = marble-common-git
depends = qt5-base
depends = qt5-declarative
provides = marble-maps
conflicts = marble-maps

pkgname = marble-qt-git
pkgdesc = Desktop Globe (Qt version)
depends = gcc-libs
depends = glibc
depends = marble-common-git
depends = qt5-base
provides = marble-qt
conflicts = marble-qt
12 changes: 9 additions & 3 deletions PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@ pkgname=(marble-git
marble-maps-git
marble-qt-git)
pkgver=24.04.70_r13851.gab23c211a
pkgrel=1
pkgrel=2
pkgdesc='Desktop Globe'
arch=($CARCH)
url="https://github.com/KDE/${pkgbase%-git}"
license=(GPL-2.0-or-later)
makedepends=(git extra-cmake-modules-git gpsd kdoctools5 knewstuff5 kparts5 krunner5 libwlocate phonon-qt5-git protobuf qt5-serialport qt5-tools qt5-webengine shapelib kirigami2-git)
conflicts=(${pkgbase%-git})
provides=(${pkgbase%-git})
source=("git+$url.git")
sha256sums=('SKIP')

Expand Down Expand Up @@ -44,6 +42,8 @@ build() {

package_marble-common-git() {
pkgdesc='Common libraries and plugins for Marble'
conflicts=(marble-common)
provides=(marble-common)
depends=(gcc-libs
glibc
phonon-qt5-git
Expand Down Expand Up @@ -71,6 +71,8 @@ package_marble-common-git() {

package_marble-qt-git() {
pkgdesc+=' (Qt version)'
conflicts=(marble-qt)
provides=(marble-qt)
depends=(gcc-libs
glibc
marble-common-git
Expand All @@ -94,6 +96,8 @@ package_marble-git() {
marble-common-git
qt5-base
qt5-declarative)
conflicts=(marble)
provides=(marble)
optdepends=('krunner5: Krunner plugin')
groups=(kde-applications-git
kde-education-git)
Expand All @@ -107,6 +111,8 @@ package_marble-git() {

package_marble-maps-git() {
pkgdesc='OpenStreetMap Navigation'
conflicts=(marble-maps)
provides=(marble-maps)
depends=(gcc-libs
glibc
kirigami2-git
Expand Down

0 comments on commit 7d543d4

Please sign in to comment.