summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD47
2 files changed, 26 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ca8d5387b45f..77cd3c3dd9b0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
pkgbase = kimap-git
- pkgdesc = Job-based API for interacting with IMAP servers (Git)
- pkgver = r990.aaf8977
+ pkgdesc = Job-based API for interacting with IMAP servers
+ pkgver = 5.16.40_r1058.g377d7ad
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
- depends = kio
+ makedepends = extra-cmake-modules-git
+ depends = kmime-git
+ depends = kio-git
provides = kimap
conflicts = kimap
source = git+https://github.com/KDE/kimap.git
diff --git a/PKGBUILD b/PKGBUILD
index ef4d1c38759b..26be954c8c4d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,35 @@
-# Maintainer: João Figueiredo <jf dot mundox at gmail dot com>
+# Merged with official ABS kimap PKGBUILD by João, 2021/01/31 (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=kimap
-pkgname=$_pkgname-git
-pkgver=r990.aaf8977
+pkgname=kimap-git
+pkgver=5.16.40_r1058.g377d7ad
pkgrel=1
-pkgdesc="Job-based API for interacting with IMAP servers (Git)"
-arch=('i686' 'x86_64')
+pkgdesc="Job-based API for interacting with IMAP servers"
+arch=($CARCH)
url="https://kontact.kde.org"
-license=('LGPL')
-depends=(kmime kio)
-makedepends=(extra-cmake-modules git)
-conflicts=("$_pkgname")
-provides=("$_pkgname")
-source=('git+https://github.com/KDE/kimap.git')
+license=(LGPL)
+groups=(kdepim-git)
+depends=(kmime-git kio-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
}