Fix build on latest system

3 files changed, 32 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 22d648884193..dd365164e6c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kcm-polkit-kde-git
 	pkgdesc = Configuration for Policy Kit
-	pkgver = 5.9.0.r215.g4aca751
-	pkgrel = 1
+	pkgver = 5.9.0.r229.g294c719
+	pkgrel = 2
 	epoch = 1
 	url = https://projects.kde.org/projects/extragear/base/polkit-kde-kcmodules-1
 	arch = i686
@@ -11,10 +11,19 @@ pkgbase = kcm-polkit-kde-git
 	makedepends = dbus
 	makedepends = git
 	makedepends = extra-cmake-modules
-	depends = kcmutils
+	depends = kcmutils5
+	depends = glibc
+	depends = kconfigwidgets5
+	depends = ki18n5
+	depends = polkit-qt5
+	depends = qt5-base
+	depends = gcc-libs
+	depends = kwidgetsaddons5
+	depends = kcoreaddons5
 	provides = polkit-kde-kcmodules
 	provides = kcm-polkit-kde
 	conflicts = polkit-kde-kcmodules
+	conflicts = kcm-polkit-kde
 	source = kcm-polkit-kde-git::git+https://invent.kde.org/system/polkit-kde-kcmodules-1.git
 	md5sums = SKIP
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..98307f80e516
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+kcm-polkit-kde-git
+pkg
+src
+*.pkg.tar.*
+*.log
diff --git a/PKGBUILD b/PKGBUILD
index d32874aab2de..ae6b62312408 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Eden Rose(EndlessEden) < eden (at) rose.place >
+# Maintainer: ZhangHua <zhanghuadedn at gmail dot com>
+# Contributor: Eden Rose(EndlessEden) < eden (at) rose.place >
 # Contributor: dreieck <oid-maps@seznam.cz>
 # Contributor: ZhangHua <unlisted>
 # Contributor: Dzon Kosto (JohnyPea) <johnypean@gmail.com>
@@ -11,15 +12,18 @@
 
 pkgname=kcm-polkit-kde-git
 epoch=1
-pkgver=5.9.0.r215.g4aca751
-pkgrel=1
+pkgver=5.9.0.r229.g294c719
+pkgrel=2
 pkgdesc="Configuration for Policy Kit"
 arch=('i686' 'x86_64')
 url="https://projects.kde.org/projects/extragear/base/polkit-kde-kcmodules-1"
 license=('GPL')
 provides=('polkit-kde-kcmodules' 'kcm-polkit-kde')
-conflicts=('polkit-kde-kcmodules')
-depends=('kcmutils')
+conflicts=('polkit-kde-kcmodules' 'kcm-polkit-kde')
+depends=(
+	'kcmutils5' 'glibc' 'kconfigwidgets5' 'ki18n5' 'polkit-qt5' 'qt5-base' 'gcc-libs'
+	'kwidgetsaddons5' 'kcoreaddons5'
+)
 makedepends=('cmake' 'dbus' 'git' 'extra-cmake-modules')
 
 source=($pkgname::"git+https://invent.kde.org/system/polkit-kde-kcmodules-1.git")
@@ -28,21 +32,19 @@ md5sums=('SKIP')
 pkgver() {
 	cd "$srcdir"/"$pkgname"
 
-	echo $(cat CMakeLists.txt | grep QT_MIN_VERSION | head -1 | sed 's,set(QT_MIN_VERSION ",,g; s,"),,g')'.r'"$(git rev-list --count HEAD)"'.g'"$(git rev-parse --short HEAD)"
+	_qt_min_version=$(grep QT_MIN_VERSION CMakeLists.txt | head -1 | sed 's,set(QT_MIN_VERSION ",,g; s,"),,g')
+	echo "$_qt_min_version.r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
 }
 
 build() {
-	cd "$srcdir"/"$pkgname"
 
-	cmake . \
+	cmake -B build -S "$srcdir/$pkgname" \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt5
-	make
+		-DCMAKE_BUILD_TYPE=None
+	cmake --build build
 }
 
 package() {
-	cd "$srcdir"/"$pkgname"
 
-	make DESTDIR="${pkgdir}" install
+	 DESTDIR="${pkgdir}" cmake --install build
 }