Merged with official ABS kdialog PKGBUILD

2 files changed, 29 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5e9e8d4dd8fc..a62f7e995c1b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
 pkgbase = kdialog-git
-	pkgdesc = KDialog can be used to show nice dialog boxes from shell scripts. (GIT version)
-	pkgver = .1145.0ff88bbab
+	pkgdesc = A utility for displaying dialog boxes from shell scripts
+	pkgver = 21.03.70_r1167.gd1a5a9518
 	pkgrel = 1
-	url = https://projects.kde.org/projects/kde/applications/kdialog
-	arch = i686
+	url = https://www.kde.org/
 	arch = x86_64
+	groups = kde-applications-git
+	groups = kde-utilities-git
 	license = LGPL
-	makedepends = extra-cmake-modules
 	makedepends = git
-	makedepends = python
-	depends = kio
+	makedepends = extra-cmake-modules-git
+	depends = kio-git
 	provides = kdialog
-	conflicts = kdebase-kdialog
 	conflicts = kdialog
 	source = git+https://github.com/KDE/kdialog.git
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index ac265f04124d..8cb09908260f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,37 @@
-# Maintainer: João Figueiredo <jf dot mundox at gmail dot com>
+# Merged with official ABS kdialog PKGBUILD by João, 2021/02/01 (all respective contributors apply herein)
+# Maintainer: João Figueiredo <jf.mundox@gmail.com>
 # Contributor: Antonio Rojas <arojas@archlinux,org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdialog-git
-pkgver=.1145.0ff88bbab
+pkgver=21.03.70_r1167.gd1a5a9518
 pkgrel=1
-pkgdesc="KDialog can be used to show nice dialog boxes from shell scripts. (GIT version)"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/applications/kdialog'
-license=('LGPL')
-depends=('kio')
-makedepends=('extra-cmake-modules'
-             'git'
-             'python'
-             )
-conflicts=('kdebase-kdialog'
-           'kdialog'
-           )
-provides=('kdialog')
-source=('git+https://github.com/KDE/kdialog.git')
+pkgdesc="A utility for displaying dialog boxes from shell scripts"
+arch=($CARCH)
+url="https://www.kde.org/"
+license=(LGPL)
+depends=(kio-git)
+makedepends=(git extra-cmake-modules-git)
+conflicts=(${pkgname%-git})
+provides=(${pkgname%-git})
+groups=(kde-applications-git kde-utilities-git)
+source=("git+https://github.com/KDE/${pkgname%-git}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd kdialog
-  _ver="$(cat src/kdialog.cpp | grep -m1 'i18n( ' | sed 's|i18n|ixxn|g' | cut -d '"' -f2)"
-  echo "${_ver}.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-  mkdir -p build
+  cd ${pkgname%-git}
+  _major_ver="$(grep -m1 "set *(RELEASE_SERVICE_VERSION_MAJOR" CMakeLists.txt | cut -d '"' -f2)"
+  _minor_ver="$(grep -m1 "set *(RELEASE_SERVICE_VERSION_MINOR" CMakeLists.txt | cut -d '"' -f2)"
+  _micro_ver="$(grep -m1 "set *(RELEASE_SERVICE_VERSION_MICRO" CMakeLists.txt | cut -d '"' -f2)"
+  echo "${_major_ver}.${_minor_ver}.${_micro_ver}_r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd build
-  cmake ../kdialog \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DKDE_INSTALL_LIBDIR=lib \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+  cmake -B build -S ${pkgname%-git} \
     -DBUILD_TESTING=OFF
-  make
+  cmake --build build
 }
+
 package() {
-  make -C build DESTDIR="${pkgdir}" install
+  DESTDIR="$pkgdir" cmake --install build
 }