summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD43
2 files changed, 22 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 323d3f24d814..1840733b97c4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
pkgbase = kmbox-git
pkgdesc = Library for accessing mail storages in MBox format
- pkgver = r443.eef349b
+ pkgver = 5.16.40_r489.gb23719c
pkgrel = 1
url = https://kontact.kde.org
- arch = i686
arch = x86_64
+ groups = kdepim-git
license = LGPL
- makedepends = extra-cmake-modules
makedepends = git
- depends = kmime
+ makedepends = extra-cmake-modules-git
+ depends = kmime-git
provides = kmbox
conflicts = kmbox
source = git+https://github.com/KDE/kmbox.git
diff --git a/PKGBUILD b/PKGBUILD
index 54c39161c330..0d0cbee6b66c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,35 @@
-# Maintainer: João Figueiredo <jf dot mundox at gmail dot com>
+# Merged with official ABS kmbox PKGBUILD by João, 2021/02/01 (all respective contributors apply herein)
+# Maintainer: João Figueiredo <jf.mundox@gmail.com>
# Contributor: Felix Golatofski <contact@xdfr.de>
# Contributor: Antonio Rojas <arojas@archlinux.org>
-_pkgname=kmbox
-pkgname=$_pkgname-git
-pkgver=r443.eef349b
+pkgname=kmbox-git
+pkgver=5.16.40_r489.gb23719c
pkgrel=1
pkgdesc="Library for accessing mail storages in MBox format"
-arch=(i686 x86_64)
+arch=($CARCH)
url="https://kontact.kde.org"
license=(LGPL)
-depends=(kmime)
-makedepends=(extra-cmake-modules git)
-conflicts=("$_pkgname")
-provides=("$_pkgname")
-source=('git+https://github.com/KDE/kmbox.git')
+groups=(kdepim-git)
+depends=(kmime-git)
+makedepends=(git extra-cmake-modules-git)
+conflicts=(${pkgname%-git})
+provides=(${pkgname%-git})
+source=("git+https://github.com/KDE/${pkgname%-git}.git")
sha256sums=('SKIP')
pkgver() {
- cd $srcdir/$_pkgname
- printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
- cd $srcdir/$_pkgname
- mkdir -p build
+ cd ${pkgname%-git}
+ _ver="$(grep -m1 'set(PIM_VERSION' CMakeLists.txt | cut -d '"' -f2 | tr - .)"
+ echo "${_ver}_r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
}
build() {
- cd $srcdir/$_pkgname/build
- cmake ../ \
- -DBUILD_TESTING=OFF \
- -DBUILD_QCH=ON
- make
+ cmake -B build -S ${pkgname%-git} \
+ -DBUILD_TESTING=OFF
+ cmake --build build
}
package() {
- cd $srcdir/$_pkgname/build
- make DESTDIR="$pkgdir" install
- install -Dm644 ../COPYING.LIB "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
+ DESTDIR="$pkgdir" cmake --install build
}