Adopt ASP PKGBUILD changes

3 files changed, 79 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e7603f45d7c3..8c2fc3fea68b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,45 @@
 pkgbase = kate-git
-	pkgdesc = An advanced editor component which is used in numerous KDE applications requiring a text editing component
-	pkgver = r15288.15d26a7
+	pkgver = 21.07.70_r17987.g664722487
 	pkgrel = 1
-	url = https://projects.kde.org/projects/kde/applications/kate
-	install = kate-git.install
-	arch = i686
 	arch = x86_64
+	license = GPL
 	license = LGPL
-	makedepends = extra-cmake-modules
-	makedepends = git
+	license = FDL
+	makedepends = extra-cmake-modules-git
 	makedepends = kdoctools-git
-	makedepends = python
 	makedepends = plasma-framework-git
-	depends = knewstuff-git
-	depends = ktexteditor-git
-	depends = threadweaver-git
-	depends = kinit-git
-	depends = kded-git
+	makedepends = knewstuff-git
+	makedepends = kitemmodels-git
+	makedepends = ktexteditor-git
+	makedepends = kactivities-git
+	makedepends = kuserfeedback-git
+	makedepends = git
 	provides = kate
 	conflicts = kate
 	conflicts = kdesdk-kate
 	conflicts = kdebase-kwrite
-	source = git://anongit.kde.org/kate.git
+	source = git+https://invent.kde.org/utilities/kate.git
 	md5sums = SKIP
 
-pkgname = kate-git
+pkgname = kwrite-git
+	pkgdesc = Text Editor
+	url = https://www.kde.org/applications/utilities/kwrite/
+	groups = kde-applications-git
+	depends = ktexteditor-git
+	depends = hicolor-icon-theme
 
+pkgname = kate-git
+	pkgdesc = Advanced Text Editor
+	url = https://www.kde.org/applications/utilities/kate/
+	groups = kde-applications-git
+	groups = kde-utilities-git
+	depends = knewstuff-git
+	depends = ktexteditor-git
+	depends = kactivities-git
+	depends = kuserfeedback-git
+	depends = hicolor-icon-theme
+	optdepends = konsole-git: open a terminal in Kate
+	optdepends = clang: C and C++ LSP support
+	optdepends = python-language-server: Python LSP support
+	optdepends = texlab: LaTeX LSP support
+	optdepends = rust: Rust LSP support
diff --git a/PKGBUILD b/PKGBUILD
index d55bb9b187ed..93e5dde37ec7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,26 @@
-# Maintainer: Tajidin Abd <tajidinabd at archlinux dot us>
+# Maintainer: 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=r15288.15d26a7
+pkgbase=kate-git
+pkgname=(kwrite-git kate-git)
+pkgver=21.07.70_r17987.g664722487
 pkgrel=1
-pkgdesc='An advanced editor component which is used in numerous KDE applications requiring a text editing component'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/applications/kate'
-license=('LGPL')
-depends=('knewstuff-git' 'ktexteditor-git' 'threadweaver-git' 
-'kinit-git' 
-'kded-git')
-makedepends=('extra-cmake-modules' 'git' 'kdoctools-git' 'python' 'plasma-framework-git')
+arch=(x86_64)
+license=(GPL LGPL FDL)
+makedepends=(extra-cmake-modules-git kdoctools-git plasma-framework-git knewstuff-git kitemmodels-git ktexteditor-git kactivities-git kuserfeedback-git git)
 provides=('kate')
 conflicts=('kate' 'kdesdk-kate' 'kdebase-kwrite')
-install=kate-git.install
-source=('git://anongit.kde.org/kate.git')
+source=(git+https://invent.kde.org/utilities/kate.git)
 md5sums=('SKIP')
 
 pkgver() {
   cd kate
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  _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() {
@@ -29,16 +29,40 @@ prepare() {
 
 build() {
   cd build
-  cmake ../kate \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_INSTALL_DIR=lib \
-    -DBUILD_TESTING=OFF \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+  cmake -B build -S ../kate \
+    -DBUILD_TESTING=OFF
+  cmake --build build
   make
 }
 
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
+package_kwrite-git() {
+  pkgdesc="Text Editor"
+  groups=(kde-applications-git)
+  url="https://www.kde.org/applications/utilities/kwrite/"
+  depends=(ktexteditor-git hicolor-icon-theme)
+
+  DESTDIR="$pkgdir" cmake --install build
+
+  find "$pkgdir" -type f -name '*kate*' -exec rm {} \;
+  rm -r "$pkgdir"/usr/lib/qt/plugins/ktexteditor \
+        "$pkgdir"/usr/share/doc/HTML/*/{kate,katepart} \
+        "$pkgdir"/usr/share/katexmltools \
+        "$pkgdir"/usr/share/locale/*/LC_MESSAGES/{ktexteditorpreviewplugin,lspclient,tabswitcherplugin}.mo \
+        "$pkgdir"/usr/share/plasma/plasmoids
+}
+
+package_kate-git() {
+  pkgdesc="Advanced Text Editor"
+  groups=(kde-applications-git kde-utilities-git)
+  url="https://www.kde.org/applications/utilities/kate/"
+  depends=(knewstuff-git ktexteditor-git kactivities-git kuserfeedback-git hicolor-icon-theme)
+  optdepends=('konsole-git: open a terminal in Kate'
+              'clang: C and C++ LSP support'
+              'python-language-server: Python LSP support'
+              'texlab: LaTeX LSP support'
+              'rust: Rust LSP support')
+  DESTDIR="$pkgdir" cmake --install build
+
+  find "$pkgdir" -type f -name '*kwrite*' -exec rm {} \;
+  rm -r "$pkgdir"/usr/share/doc/HTML/*/kwrite
 }
diff --git a/kate-git.install b/kate-git.install
deleted file mode 100644
index 5495fb1b5d27..000000000000
--- a/kate-git.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}