summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Figueiredo2021-02-01 23:16:38 +0000
committerJoão Figueiredo2021-02-01 23:16:38 +0000
commit213eb8d5342b069f0766619b66fef1d30b34ee31 (patch)
treee41dcda3c491e8aaed09d601049a196c63141da2
parent43e37b09205be19cfe438e4b9a2b96e082f93a3e (diff)
downloadaur-213eb8d5342b069f0766619b66fef1d30b34ee31.tar.gz
Merged with official ABS kactivities PKGBUILD
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD40
2 files changed, 24 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9a34b7e8d742..033cc762f8d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,23 @@
pkgbase = kactivities-git
pkgdesc = Core components for the KDE's Activities
- pkgver = v5.74.0.rc1.r0.g2455463
+ pkgver = 5.79.0_r1320.g89a7262
pkgrel = 1
url = https://community.kde.org/Frameworks
- arch = i686
arch = x86_64
- groups = kf5
+ groups = kf5-git
license = LGPL
- makedepends = extra-cmake-modules
+ makedepends = git
+ makedepends = extra-cmake-modules-git
makedepends = boost
makedepends = doxygen
- makedepends = git
makedepends = qt5-tools
makedepends = qt5-doc
makedepends = qt5-declarative
- depends = kcoreaddons
- depends = kconfig
- depends = kwindowsystem
+ depends = kcoreaddons-git
+ depends = kconfig-git
+ depends = kwindowsystem-git
optdepends = qt5-declarative: QML bindings
provides = kactivities
- provides = kactivities-frameworks
conflicts = kactivities
source = git+https://github.com/KDE/kactivities.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 1b0b78e76d59..b00d317ab74b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,37 @@
-# Maintainer: João Figueiredo <jf dot mundox at gmail dot com>
+# Merged with official ABS kactivities 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: Andrea Scarpino <andrea@archlinux.org>
-_pkgname=kactivities
-pkgname=$_pkgname-git
-pkgver=v5.74.0.rc1.r0.g2455463
+pkgname=kactivities-git
+pkgver=5.79.0_r1320.g89a7262
pkgrel=1
-arch=('i686' 'x86_64')
+arch=($CARCH)
pkgdesc="Core components for the KDE's Activities"
url='https://community.kde.org/Frameworks'
license=(LGPL)
-depends=(kcoreaddons kconfig kwindowsystem)
-makedepends=(extra-cmake-modules boost doxygen git qt5-tools qt5-doc qt5-declarative)
+depends=(kcoreaddons-git kconfig-git kwindowsystem-git)
+makedepends=(git extra-cmake-modules-git boost doxygen qt5-tools qt5-doc qt5-declarative)
+conflicts=(${pkgname%-git})
+provides=(${pkgname%-git})
optdepends=('qt5-declarative: QML bindings')
-groups=(kf5)
-provides=('kactivities' 'kactivities-frameworks')
-conflicts=('kactivities')
-source=('git+https://github.com/KDE/kactivities.git')
+groups=(kf5-git)
+source=("git+https://github.com/KDE/${pkgname%-git}.git")
sha256sums=('SKIP')
pkgver() {
- cd $srcdir/$_pkgname
- git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
- cd $srcdir/$_pkgname
- mkdir -p build
+ cd ${pkgname%-git}
+ _ver="$(grep -m1 "set(KF5\?_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 ../ \
+ cmake -B build -S ${pkgname%-git} \
-DBUILD_TESTING=OFF \
-DBUILD_QCH=ON
- make
+ cmake --build build
}
package() {
- cd $srcdir/$_pkgname/build
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" cmake --install build
}