Rebuild xterm

qtcreator/qtcreator/PKGBUILD

@@ -3,7 +3,7 @@ pkgname=(qtcreator qtcreator-devel)
 pkgver=13.0.0
 _clangver=17.0.6
 _commit=13.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=(x86_64)
 url='https://www.qt.io'
@@ -33,7 +33,8 @@ source=("fancymainwindow.patch"
         "perf.patch"
         "doxygen.patch"
         "pythonproject.patch"
-        "appstackedpane.patch")
+        "appstackedpane.patch"
+        "pylsp.patch")
 sha256sums=(SKIP
             SKIP
             SKIP
@@ -42,6 +43,7 @@ sha256sums=(SKIP
             SKIP
             SKIP
             SKIP
+            SKIP
             SKIP)
 
 groups=('modified')
@@ -68,6 +70,7 @@ prepare() {
   patch -d qt-creator -p1 < pythonproject.patch
   patch -d qt-creator -p1 < appstackedpane.patch
   patch -d qt-creator -p1 < fancymainwindow.patch
+  patch -d qt-creator -p1 < pylsp.patch
 }
 
 build() {

qtcreator/qtcreator/pylsp.patch

@@ -0,0 +1,14 @@
+diff --git a/src/plugins/python/pythonlanguageclient.cpp b/src/plugins/python/pythonlanguageclient.cpp
+index dbe6c434..1c5cd00d 100644
+--- a/src/plugins/python/pythonlanguageclient.cpp
++++ b/src/plugins/python/pythonlanguageclient.cpp
+@@ -81,7 +81,8 @@ static PythonLanguageServerState checkPythonLanguageServer(const FilePath &pytho
+     if (lspPath.isEmpty())
+         return {PythonLanguageServerState::CanNotBeInstalled, FilePath()};
+ 
+-    if (lspPath.pathAppended("bin").pathAppended("pylsp").withExecutableSuffix().exists())
++    if (lspPath.pathAppended("bin").pathAppended("pylsp").withExecutableSuffix().exists() ||
++        FilePath("/usr/bin/pylsp").withExecutableSuffix().exists())
+         return {PythonLanguageServerState::AlreadyInstalled, lspPath};
+ 
+     Process pythonProcess;

xterm/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=xterm
 pkgver=390
-pkgrel=1
+pkgrel=2
 pkgdesc="X Terminal Emulator"
 arch=('x86_64')
 url="https://invisible-island.net/xterm/"