summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO24
-rw-r--r--PKGBUILD53
-rw-r--r--ksysguard.install9
3 files changed, 45 insertions, 41 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e674df64dd79..e4260e1b8e5f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,24 @@
pkgbase = ksysguard-git
- pkgdesc = KSysGuard
- pkgver = r3293.97811cdd
+ pkgdesc = Track and control the processes running in your system
+ pkgver = 5.21.80_r3473.ga22ec0b7
pkgrel = 1
- url = https://projects.kde.org/projects/kde/kde-workspace
- arch = i686
+ url = https://userbase.kde.org/KSysGuard
+ install = ksysguard.install
arch = x86_64
- groups = plasma
+ groups = plasma-git
license = LGPL
- makedepends = extra-cmake-modules-git
makedepends = git
- makedepends = kdoctools
- depends = knewstuff-git
- depends = kdelibs4support-git
+ makedepends = extra-cmake-modules-git
+ makedepends = kdoctools-git
+ makedepends = networkmanager-qt-git
depends = libksysguard-git
- depends = lm_sensors
+ depends = kinit-git
+ optdepends = nvidia-utils: NVIDIA GPU usage
+ optdepends = networkmanager-qt-git: improved network statistics
provides = ksysguard
conflicts = ksysguard
- conflicts = kdebase-workspace
source = git+https://github.com/KDE/ksysguard.git
- md5sums = SKIP
+ sha256sums = SKIP
pkgname = ksysguard-git
diff --git a/PKGBUILD b/PKGBUILD
index bcc9e8cf2676..5bd4ae93d087 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,37 @@
-# Maintainer: João Figueiredo <jf dot mundox at gmail dot com>
+# Merged with official ABS ksysguard PKGBUILD by João, 2021/01/31 (all respective contributors apply herein)
+# Maintainer: João Figueiredo <jf.mundox@gmail.com>
# Contributor: Antonio Rojas <nqn1976 @ gmail.com>
pkgname=ksysguard-git
-pkgver=r3293.97811cdd
+pkgver=5.21.80_r3473.ga22ec0b7
pkgrel=1
-pkgdesc='KSysGuard'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kde-workspace'
-license=('LGPL')
-depends=('knewstuff-git' 'kdelibs4support-git' 'libksysguard-git' 'lm_sensors')
-makedepends=('extra-cmake-modules-git' 'git' 'kdoctools')
-conflicts=('ksysguard' 'kdebase-workspace')
-provides=('ksysguard')
-source=('git+https://github.com/KDE/ksysguard.git')
-groups=('plasma')
-md5sums=('SKIP')
+pkgdesc='Track and control the processes running in your system'
+arch=($CARCH)
+url='https://userbase.kde.org/KSysGuard'
+license=(LGPL)
+depends=(libksysguard-git kinit-git)
+makedepends=(git extra-cmake-modules-git kdoctools-git networkmanager-qt-git)
+conflicts=(${pkgname%-git})
+provides=(${pkgname%-git})
+optdepends=('nvidia-utils: NVIDIA GPU usage' 'networkmanager-qt-git: improved network statistics')
+groups=(plasma-git)
+install=${pkgname%-git}.install
+source=("git+https://github.com/KDE/${pkgname%-git}.git")
+sha256sums=('SKIP')
pkgver() {
- cd ksysguard
- printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
- mkdir -p build
+ cd ${pkgname%-git}
+ _ver="$(grep -m1 'set(PROJECT_VERSION' CMakeLists.txt | cut -d '"' -f2 | tr - .)"
+ echo "${_ver}_r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
}
build() {
- cd build
- cmake ../ksysguard \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=lib \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
- make
+ cmake -B build -S ${pkgname%-git} \
+ -DCMAKE_INSTALL_LIBEXECDIR=lib \
+ -DBUILD_TESTING=OFF
+ cmake --build build
}
package() {
- cd build
- make DESTDIR="${pkgdir}" install
+ DESTDIR="$pkgdir" cmake --install build
}
diff --git a/ksysguard.install b/ksysguard.install
new file mode 100644
index 000000000000..891b1d423b9a
--- /dev/null
+++ b/ksysguard.install
@@ -0,0 +1,9 @@
+post_install() {
+# this is executed by make install, but doesn't work since setcap can only be run as root
+ setcap CAP_NET_RAW=+ep /usr/lib/ksysguard/ksgrd_network_helper
+}
+
+post_upgrade() {
+ post_install
+}
+