Update to 21.08.3

3 files changed, 15 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a889810db6d..b4f443f9593d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = kate-root
-	pkgver = 21.08.2
+	pkgver = 21.08.3
 	pkgrel = 1
 	arch = x86_64
 	arch = i686
@@ -15,14 +15,16 @@ pkgbase = kate-root
 	makedepends = ktexteditor
 	makedepends = kactivities
 	makedepends = kuserfeedback
-	source = https://download.kde.org/stable/release-service/21.08.2/src/kate-21.08.2.tar.xz
-	source = https://download.kde.org/stable/release-service/21.08.2/src/kate-21.08.2.tar.xz.sig
+	source = https://download.kde.org/stable/release-service/21.08.3/src/kate-21.08.3.tar.xz
+	source = https://download.kde.org/stable/release-service/21.08.3/src/kate-21.08.3.tar.xz.sig
+	source = https://invent.kde.org/utilities/kate/-/commit/8328b53f.patch
 	source = 0001-Defuse-root-block.patch
 	validpgpkeys = CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7
 	validpgpkeys = F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87
 	validpgpkeys = D81C0CB38EB725EF6691C385BB463350D6EF31EF
-	sha256sums = d68898759dd2538051124681e5928ef5fb163ca61b6cd8f59ee056cc068ea6b2
+	sha256sums = e23eb09a06e29c273332dedc95f79abb9d070ec749cf9de2178a0c383b07bfbd
 	sha256sums = SKIP
+	sha256sums = 082c4a0c985b07e0f6976f0e183c28be290b796978f362e46e3917c24d9ca4b1
 	sha256sums = 6d61580de90efa53eb52077353097d66fb823965c0a70176a47bf5524603aa57
 
 pkgname = kwrite-root
@@ -47,7 +49,7 @@ pkgname = kate-root
 	depends = hicolor-icon-theme
 	optdepends = konsole: 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
diff --git a/.gitignore b/.gitignore
index 7334925ab911..5e9c22ecab54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@
 !.gitignore
 !.SRCINFO
 !PKGBUILD
-!*.patch
+!0001-Defuse-root-block.patch
diff --git a/PKGBUILD b/PKGBUILD
index bcfc1a2f7569..70e87632619e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,15 +7,17 @@
 pkgbase=kate-root
 _pkgbase=kate
 pkgname=(kwrite-root kate-root)
-pkgver=21.08.2
+pkgver=21.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}
+        https://invent.kde.org/utilities/kate/-/commit/8328b53f.patch
         0001-Defuse-root-block.patch)
-sha256sums=('d68898759dd2538051124681e5928ef5fb163ca61b6cd8f59ee056cc068ea6b2'
+sha256sums=('e23eb09a06e29c273332dedc95f79abb9d070ec749cf9de2178a0c383b07bfbd'
             'SKIP'
+            '082c4a0c985b07e0f6976f0e183c28be290b796978f362e46e3917c24d9ca4b1'
             '6d61580de90efa53eb52077353097d66fb823965c0a70176a47bf5524603aa57')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck@kde.org>
@@ -23,7 +25,8 @@ validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aac
 
 prepare() {
   cd $srcdir/$_pkgbase-$pkgver
-  patch -Np1 -i $srcdir/0001-Defuse-root-block.patch
+  patch -Np1 -i $srcdir/8328b53f.patch # Use python-lsp-server
+  patch -Np1 -i $srcdir/0001-Defuse-root-block.patch # Enable sudo/kdesu
 }
 
 build() {
@@ -57,7 +60,7 @@ package_kate-root() {
   depends=(knewstuff ktexteditor kactivities kuserfeedback hicolor-icon-theme)
   optdepends=('konsole: 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'
               'git: git-blame plugin')