Update to 22.08.3

3 files changed, 54 insertions, 88 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3417889fc9b2..888418d742d4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,45 +1,19 @@
 pkgbase = kate-root
-	pkgver = 22.04.2
+	pkgdesc = Advanced Text Editor, patched to be able to run as root
+	pkgver = 22.08.3
 	pkgrel = 1
+	url = https://apps.kde.org/kate/
 	arch = x86_64
 	arch = i686
 	arch = armv7h
+	groups = kde-applications
+	groups = kde-utilities
 	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
-	source = https://download.kde.org/stable/release-service/22.04.2/src/kate-22.04.2.tar.xz
-	source = https://download.kde.org/stable/release-service/22.04.2/src/kate-22.04.2.tar.xz.sig
-	source = 0001-Defuse-root-block.patch
-	validpgpkeys = CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7
-	validpgpkeys = F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87
-	validpgpkeys = D81C0CB38EB725EF6691C385BB463350D6EF31EF
-	sha256sums = 7cfec8b6391d89914aa73ead3902fdafab92f73368e0e26743cd4aab1ef117de
-	sha256sums = SKIP
-	sha256sums = 7ab717cd37161ba790a72e3871281a1268e6ce07e7900825738b5d690de96f77
-
-pkgname = kwrite-root
-	pkgdesc = Text Editor, patched to be able to run as root
-	url = https://apps.kde.org/kwrite/
-	groups = kde-applications
-	groups = kde-utilities
-	depends = ktexteditor
-	depends = hicolor-icon-theme
-	provides = kwrite
-	conflicts = kwrite
-
-pkgname = kate-root
-	pkgdesc = Advanced Text Editor, patched to be able to run as root
-	url = https://apps.kde.org/kate/
-	groups = kde-applications
-	groups = kde-utilities
 	depends = knewstuff
 	depends = ktexteditor
 	depends = kactivities
@@ -54,4 +28,18 @@ pkgname = kate-root
 	optdepends = markdownpart: Markdown preview
 	optdepends = svgpart: SVG preview
 	provides = kate
+	provides = kwrite
 	conflicts = kate
+	conflicts = kwrite
+	replaces = kwrite
+	source = https://download.kde.org/stable/release-service/22.08.3/src/kate-22.08.3.tar.xz
+	source = https://download.kde.org/stable/release-service/22.08.3/src/kate-22.08.3.tar.xz.sig
+	source = 0001-Defuse-root-block.patch
+	validpgpkeys = CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7
+	validpgpkeys = F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87
+	validpgpkeys = D81C0CB38EB725EF6691C385BB463350D6EF31EF
+	sha256sums = d195bc0ecf4eed66a123225686ca37c4e673d8ca30e7c39fccb02dfdc7945fa6
+	sha256sums = SKIP
+	sha256sums = c7d029969c6b06aa789ba0a4dbc31050974cee6bed377dbc7ee8ca1dd02e76dd
+
+pkgname = kate-root
diff --git a/0001-Defuse-root-block.patch b/0001-Defuse-root-block.patch
index 8a65b66064bd..e123777a3ebf 100644
--- a/0001-Defuse-root-block.patch
+++ b/0001-Defuse-root-block.patch
@@ -1,6 +1,6 @@
-From 435ed5853b9451ab8fdfff722545c57a8f154625 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Sat, 18 Feb 2017 13:49:14 +0100
+From 52f948fe211fedc54c13c0baf067cd6d8e4cb0c3 Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Sun, 3 Apr 2022 09:26:48 +0200
 Subject: [PATCH] Defuse root block
 
 While the main point is correct as any application running in the same
@@ -8,14 +8,14 @@ X session (not sandboxed) can use kate's capability to open a console,
 we allow (even encourage) running YaST on X11 as root.
 That way it's only an impact on usability.
 ---
- kate/main.cpp   | 3 +--
- kwrite/main.cpp | 3 +--
- 2 files changed, 2 insertions(+), 4 deletions(-)
+ apps/kate/main.cpp   | 15 ++-------------
+ apps/kwrite/main.cpp | 17 +++--------------
+ 2 files changed, 5 insertions(+), 27 deletions(-)
 
 Index: kate/main.cpp
 ===================================================================
---- a/kate/main.cpp	2018-12-25 09:49:15.867478873 +0100
-+++ b/kate/main.cpp	2018-12-25 09:49:19.231424088 +0100
+--- a/apps/kate/main.cpp	2022-04-04 03:49:44.000000000 +0200
++++ b/apps/kate/main.cpp	2022-04-04 05:55:46.476883480 +0200
 @@ -47,21 +47,10 @@
  int main(int argc, char **argv)
  {
@@ -43,8 +43,8 @@ Index: kate/main.cpp
      /**
 Index: kwrite/main.cpp
 ===================================================================
---- a/kwrite/main.cpp	2018-12-25 09:49:19.231424088 +0100
-+++ b/kwrite/main.cpp	2018-12-25 09:50:32.302253532 +0100
+--- a/apps/kwrite/main.cpp	2022-04-04 03:49:44.000000000 +0200
++++ b/apps/kwrite/main.cpp	2022-04-04 05:57:17.276197192 +0200
 @@ -39,21 +39,10 @@
  extern "C" Q_DECL_EXPORT int main(int argc, char **argv)
  {
diff --git a/PKGBUILD b/PKGBUILD
index a985fbc6fc81..6675c8c10f4f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,70 +4,48 @@
 # Contributor: Antonio Rojas <arojas@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
-pkgbase=kate-root
-_pkgbase=kate
-pkgname=(kwrite-root kate-root)
-pkgver=22.04.2
+pkgname=kate-root
+_pkgname=kate
+pkgver=22.08.3
 pkgrel=1
 arch=(x86_64 i686 armv7h)
 license=(GPL LGPL FDL)
-makedepends=(extra-cmake-modules kdoctools plasma-framework knewstuff kitemmodels ktexteditor kactivities kuserfeedback)
-source=(https://download.kde.org/stable/release-service/$pkgver/src/$_pkgbase-$pkgver.tar.xz{,.sig}
+pkgdesc='Advanced Text Editor, patched to be able to run as root'
+groups=(kde-applications kde-utilities)
+url='https://apps.kde.org/kate/'
+depends=(knewstuff ktexteditor kactivities kuserfeedback hicolor-icon-theme)
+optdepends=('konsole: open a terminal in Kate'
+            'clang: C and C++ LSP support'
+            'python-lsp-server: Python LSP support'
+            'texlab: LaTeX LSP support'
+            'rust: Rust LSP support'
+            'git: git-blame plugin'
+            'markdownpart: Markdown preview'
+            'svgpart: SVG preview')
+makedepends=(extra-cmake-modules kdoctools plasma-framework)
+conflicts=('kate' 'kwrite')
+provides=('kate' 'kwrite')
+replaces=('kwrite')
+source=(https://download.kde.org/stable/release-service/$pkgver/src/$_pkgname-$pkgver.tar.xz{,.sig}
         0001-Defuse-root-block.patch)
-sha256sums=('7cfec8b6391d89914aa73ead3902fdafab92f73368e0e26743cd4aab1ef117de'
+sha256sums=('d195bc0ecf4eed66a123225686ca37c4e673d8ca30e7c39fccb02dfdc7945fa6'
             'SKIP'
-            '7ab717cd37161ba790a72e3871281a1268e6ce07e7900825738b5d690de96f77')
+            'c7d029969c6b06aa789ba0a4dbc31050974cee6bed377dbc7ee8ca1dd02e76dd')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck@kde.org>
               D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker@kde.org>
 
 prepare() {
   # root shall be allowed once again
-  patch -d $_pkgbase-$pkgver -Np1 < 0001-Defuse-root-block.patch
+  patch -d $_pkgname-$pkgver -Np1 < 0001-Defuse-root-block.patch
 }
 
 build() {
-  cmake -B build -S $_pkgbase-$pkgver \
+  cmake -B build -S $_pkgname-$pkgver \
     -DBUILD_TESTING=OFF
   cmake --build build
 }
 
-package_kwrite-root() {
-  pkgdesc='Text Editor, patched to be able to run as root'
-  groups=(kde-applications kde-utilities)
-  url='https://apps.kde.org/kwrite/'
-  depends=(ktexteditor hicolor-icon-theme)
-  provides=('kwrite')
-  conflicts=('kwrite')
-
+package() {
   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-root() {
-  pkgdesc='Advanced Text Editor, patched to be able to run as root'
-  groups=(kde-applications kde-utilities)
-  url='https://apps.kde.org/kate/'
-  depends=(knewstuff ktexteditor kactivities kuserfeedback hicolor-icon-theme)
-  optdepends=('konsole: open a terminal in Kate'
-              'clang: C and C++ LSP support'
-              'python-lsp-server: Python LSP support'
-              'texlab: LaTeX LSP support'
-              'rust: Rust LSP support'
-              'git: git-blame plugin'
-              'markdownpart: Markdown preview'
-              'svgpart: SVG preview')
-  provides=('kate')
-  conflicts=('kate')
-
-  DESTDIR="$pkgdir" cmake --install build
-
-  find "$pkgdir" -type f -name '*kwrite*' -exec rm {} \;
-  rm -r "$pkgdir"/usr/share/doc/HTML/*/kwrite
 }