Merged with official ABS kate PKGBUILD

2 files changed, 63 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c88f969e7308..3612fe033b38 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,38 +1,56 @@
 pkgbase = kate-git
-	pkgdesc = Advanced Text Editor
-	pkgver = 21.07.70_r17988.g3d0d58325
+	pkgdesc = Advanced text editor
+	pkgver = 24.04.70_r21426.g34a64411f
 	pkgrel = 1
-	url = https://www.kde.org/applications/utilities/kate/
+	url = https://apps.kde.org/kate/
 	arch = x86_64
 	groups = kde-applications-git
 	groups = kde-utilities-git
-	license = GPL
-	license = LGPL
-	license = FDL
-	makedepends = extra-cmake-modules
-	makedepends = kdoctools
-	makedepends = plasma-framework
-	makedepends = knewstuff
-	makedepends = kitemmodels
-	makedepends = ktexteditor
-	makedepends = kactivities
-	makedepends = kuserfeedback
+	groups = kde-utilities
+	license = GPL-2.0-or-later
+	license = LGPL-2.0-or-later
 	makedepends = git
-	depends = knewstuff
-	depends = ktexteditor
-	depends = kactivities
-	depends = kuserfeedback
-	depends = hicolor-icon-theme
+	makedepends = extra-cmake-modules-git
+	makedepends = kdoctools-git
+	depends = gcc-libs
+	depends = glibc
+	depends = kbookmarks-git
+	depends = kcolorscheme-git
+	depends = kcompletion-git
+	depends = kconfig-git
+	depends = kconfigwidgets-git
+	depends = kcoreaddons-git
+	depends = kcrash-git
+	depends = kdbusaddons-git
+	depends = kguiaddons-git
+	depends = ki18n-git
+	depends = kiconthemes-git
+	depends = kio-git
+	depends = knewstuff-git
+	depends = kparts-git
+	depends = kservice-git
+	depends = ktexteditor-git
+	depends = ktextwidgets-git
+	depends = kuserfeedback-git
+	depends = kwidgetsaddons-git
+	depends = kwindowsystem-git
+	depends = kxmlgui-git
+	depends = qt6-base
+	depends = syntax-highlighting-git
 	optdepends = konsole-git: open a terminal in Kate
 	optdepends = clang: C and C++ LSP support
-	optdepends = python-language-server: Python LSP support
+	optdepends = python-lsp-server: Python LSP support
 	optdepends = texlab: LaTeX LSP support
 	optdepends = rust: Rust LSP support
+	optdepends = git: git-blame plugin
 	provides = kate
+	provides = kwrite
+	provides = kwrite-git
 	conflicts = kate
-	conflicts = kdesdk-kate
-	conflicts = kdebase-kwrite
-	source = git+https://invent.kde.org/utilities/kate.git
-	md5sums = SKIP
+	conflicts = kwrite
+	conflicts = kwrite-git
+	replaces = kwrite-git
+	source = git+https://github.com/KDE/kate.git
+	sha256sums = SKIP
 
 pkgname = kate-git
diff --git a/PKGBUILD b/PKGBUILD
index cac1d52bd2b0..f1b73e6c1366 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,46 @@
-# Maintainer: dr460nf1r3 <dr460nf1r3@garudalinux.org>
+# Merged with official ABS kate PKGBUILD by João, 2024/03/26 (all respective contributors apply herein)
+# Maintainer: João Figueiredo & chaotic-aur <islandc0der@chaotic.cx>
+# Contributor: dr460nf1r3 <dr460nf1r3@garudalinux.org>
 # Contributor: Felix Yan <felixonmars@archlinux.org>
 # Contributor: Antonio Rojas <arojas@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kate-git
-pkgver=21.07.70_r17988.g3d0d58325
+pkgver=24.04.70_r21426.g34a64411f
 pkgrel=1
-pkgdesc="Advanced Text Editor"
-groups=(kde-applications-git kde-utilities-git)
-url="https://www.kde.org/applications/utilities/kate/"
-depends=(knewstuff ktexteditor kactivities kuserfeedback hicolor-icon-theme)
+arch=($CARCH)
+license=(GPL-2.0-or-later LGPL-2.0-or-later)
+pkgdesc='Advanced text editor'
+groups=(kde-applications-git kde-utilities-git kde-utilities)
+url='https://apps.kde.org/kate/'
+depends=(gcc-libs glibc kbookmarks-git kcolorscheme-git kcompletion-git kconfig-git kconfigwidgets-git kcoreaddons-git kcrash-git kdbusaddons-git kguiaddons-git ki18n-git kiconthemes-git kio-git knewstuff-git kparts-git kservice-git ktexteditor-git ktextwidgets-git kuserfeedback-git kwidgetsaddons-git kwindowsystem-git kxmlgui-git qt6-base syntax-highlighting-git)
+makedepends=(git extra-cmake-modules-git kdoctools-git)
+conflicts=(${pkgname%-git} kwrite kwrite-git)
+provides=(${pkgname%-git} kwrite kwrite-git)
+replaces=(kwrite-git)
 optdepends=('konsole-git: open a terminal in Kate'
             'clang: C and C++ LSP support'
-            'python-language-server: Python LSP support'
+            'python-lsp-server: Python LSP support'
             'texlab: LaTeX LSP support'
-            'rust: Rust LSP support')
-arch=(x86_64)
-license=(GPL LGPL FDL)
-makedepends=(extra-cmake-modules kdoctools plasma-framework knewstuff kitemmodels ktexteditor kactivities kuserfeedback git)
-provides=('kate')
-conflicts=('kate' 'kdesdk-kate' 'kdebase-kwrite')
-source=(git+https://invent.kde.org/utilities/kate.git)
-md5sums=('SKIP')
+            'rust: Rust LSP support'
+            'git: git-blame plugin')
+source=("git+https://github.com/KDE/${pkgname%-git}.git")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd kate
+  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)"
 }
 
-prepare() {
-  mkdir -p build
-}
-
 build() {
-  cd build
-  cmake -B build -S ../kate \
+  cmake -B build -S ${pkgname%-git} \
     -DBUILD_TESTING=OFF
   cmake --build build
 }
 
 package() {
-  cd build
   DESTDIR="$pkgdir" cmake --install build
 }