ready for KF6

4 files changed, 86 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e90cb32ab25b..c2da44b77fde 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,25 @@
 pkgbase = konsole-git
-	pkgdesc = KDE's terminal emulator
-	pkgver = 19.12.3.r783.g110d705f
+	pkgdesc = KDE terminal emulator
+	pkgver = 23.08.4.r8.gaed2dd76d
 	pkgrel = 1
-	url = https://kde.org/applications/system/konsole
+	url = https://invent.kde.org/utilities/konsole
 	arch = x86_64
-	groups = kde-applications
-	groups = kde-utilities
 	license = GPL
 	license = LGPL
 	license = FDL
-	makedepends = extra-cmake-modules
-	makedepends = kdoctools
+	makedepends = extra-cmake-modules>=5.240.0
 	makedepends = git
+	makedepends = kdoctools
+	depends = knewstuff
 	depends = knotifyconfig
-	depends = kpty
 	depends = kparts
-	depends = kinit
-	depends = knewstuff
+	depends = kpty
+	depends = ktextwidgets
+	depends = qt6-multimedia
 	optdepends = keditbookmarks: to manage bookmarks
-	provides = konsole
+	provides = konsole=23.08.4
 	conflicts = konsole
-	source = git+https://invent.kde.org/utilities/konsole.git
-	validpgpkeys = CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7
-	validpgpkeys = F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87
-	validpgpkeys = D81C0CB38EB725EF6691C385BB463350D6EF31EF
+	source = konsole::git+https://invent.kde.org/utilities/konsole.git
 	sha256sums = SKIP
 
 pkgname = konsole-git
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 9e95fc8f8d3b..4ba8092da897 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,87 @@
-# Maintainer: katt <magunasu.b97@gmail.com>
+# Maintainer:
+# Contributor: katt <magunasu.b97@gmail.com>
 # Contributor: Felix Yan <felixonmars@archlinux.org>
 # Contributor: Antonio Rojas <arojas@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
-pkgname=konsole-git
-pkgver=19.12.3.r783.g110d705f
+# options
+: ${_pkgtype:=git}
+
+# basic info
+_pkgname="konsole"
+pkgname="$_pkgname${_pkgtype:+-$_pkgtype}"
+pkgver=23.08.4.r8.gaed2dd76d
 pkgrel=1
-arch=(x86_64)
-url=https://kde.org/applications/system/konsole
-pkgdesc="KDE's terminal emulator"
+pkgdesc='KDE terminal emulator'
+url="https://invent.kde.org/utilities/konsole"
 license=(GPL LGPL FDL)
-groups=(kde-applications kde-utilities)
-depends=(knotifyconfig kpty kparts knewstuff)
-makedepends=(extra-cmake-modules kdoctools git)
-provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}")
-optdepends=('keditbookmarks: to manage bookmarks')
-source=(git+https://invent.kde.org/utilities/konsole.git)
+arch=(x86_64)
+
+depends=(
+  'knewstuff'
+  'knotifyconfig'
+  'kparts'
+  'kpty'
+  'ktextwidgets'
+  'qt6-multimedia'
+)
+makedepends=(
+  'extra-cmake-modules>=5.240.0'
+  'git'
+  'kdoctools'
+)
+optdepends=(
+  'keditbookmarks: to manage bookmarks'
+)
+
+provides=("$_pkgname=${pkgver%%.r*}")
+conflicts=("$_pkgname")
+
+_pkgsrc="$_pkgname"
+source=("$_pkgsrc"::"git+$url.git")
 sha256sums=('SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aacid@kde.org>
-    F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87           # Christoph Feck <cfeck@kde.org>
-    D81C0CB38EB725EF6691C385BB463350D6EF31EF)          # Heiko Becker <heiko.becker@kde.org>
 
 pkgver() {
-    git -C "${pkgname%-git}" describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  cd "$_pkgsrc"
+
+  _regex='^\s+<release version="([0-9]+\.[0-9]+(\.[0-9]+)?)"\s.*/>$'
+  _file='desktop/org.kde.konsole.appdata.xml'
+
+  _line=$(grep -E "$_regex" "$_file" | head -1)
+  _version=$(
+    printf '%s\n' "$_line" \
+      | sed -E "s@$_regex@\1@"
+  )
+  _commit=$(
+    git log -G "$_line" -1 --pretty=oneline --no-color -- $_file \
+      | sed 's@\ .*$@@'
+  )
+  _revision=$(git rev-list --count $_commit..HEAD)
+  _hash=$(git rev-parse --short HEAD)
+
+  printf '%s.r%s.g%s' \
+    "$_version" \
+    "$_revision" \
+    "$_hash"
 }
 
 build() {
-    cmake -B build -S "${pkgname%-git}" \
-        -DBUILD_TESTING=OFF
-    cmake --build build
+  local _cmake_options=(
+    -B build
+    -S "$_pkgsrc"
+
+    -DCMAKE_BUILD_TYPE=None
+    -DCMAKE_INSTALL_PREFIX='/usr'
+    -DCMAKE_INSTALL_LIBDIR='lib'
+
+    -DBUILD_TESTING=OFF
+    -Wno-dev
+  )
+
+  cmake "${_cmake_options[@]}"
+  cmake --build build
 }
 
 package() {
-    DESTDIR="$pkgdir" cmake --install build
+  DESTDIR="${pkgdir:?}" cmake --install build
 }
diff --git a/konsole-git.install b/konsole-git.install
deleted file mode 100644
index ccb9b0a4a311..000000000000
--- a/konsole-git.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    [[ -x xdg-icon-resource ]] && xdg-icon-resource forceupdate --theme hicolor &> /dev/null || true
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}