[arch-commits] Commit in texstudio/trunk (PKGBUILD fs56433.patch fs72345.patch)

[Sven-Hendrik Haase]

    Date: Tuesday, October 12, 2021 @ 02:05:28
  Author: svenstaro
Revision: 1029730

upgpkg: texstudio 4.0.1-1: Try to fix FS#72345

Added:
  texstudio/trunk/fs72345.patch
Modified:
  texstudio/trunk/PKGBUILD
Deleted:
  texstudio/trunk/fs56433.patch

---------------+
 PKGBUILD      |   12 ++++++------
 fs56433.patch |   12 ------------
 fs72345.patch |   25 +++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-12 01:03:41 UTC (rev 1029729)
+++ PKGBUILD	2021-10-12 02:05:28 UTC (rev 1029730)
@@ -1,7 +1,7 @@
 # Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
 # Contributor: Clément DEMOULINS <clement at archivel.fr>
 pkgname=texstudio
-pkgver=4.0.0
+pkgver=4.0.1
 pkgrel=1
 pkgdesc="Integrated writing environment for creating LaTeX documents"
 arch=('x86_64')
@@ -14,15 +14,15 @@
 replaces=('texmakerx')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/texstudio-org/texstudio/archive/${pkgver}.tar.gz"
         fs54269.patch
-        fs56433.patch)
-sha512sums=('9025e0709145ed9c352f9cfd748087b331fd2894c913d7b7707254050ea41d5df74077c8f94cc3fb19c4700d468d55e91895da1ea474759d83af499ef436cdbc'
+        fs72345.patch)
+sha512sums=('cb993027950a525ac8cc5eac4ca95e0c9ffa712aab6f27d8c22b46e52d4edc3e05b2ba16efbf5d8c0e40d6ef75abcdd6dbd86ef59fd0f7b87ab4cbbd03f83b85'
             '247e85f668b06c8a2def4e7456f0ddc8d35c7990484c1c037f7cf43fdee91419b5df66e968ef1e0c637fe685722bbad9171bdd79fad7a10912ae329aff088b68'
-            '1b7e67e42c9d95f4c89aa8e8f7406df7ad94124415c34ad526d5095c9ad76368357ea3d0df83b356b3bdb86949544d3fcc15845bc2106883800985d36b56d23c')
+            '6975eebd43b32fb7aa04f973562e66f6a83df0fb6a0b4d8221e124c9cc6959df11ec517e4c862921619c8b1c55800257017e26001c03186b84c567fc19c98726')
 
 prepare() {
     cd texstudio-${pkgver}/src
-    patch -Np1 < "${srcdir}"/fs54269.patch
-    patch -Np1 < "${srcdir}"/fs56433.patch
+    patch -Np1 -i "${srcdir}"/fs54269.patch
+    patch -Np1 -i "${srcdir}"/fs72345.patch
 }
 
 build() {

Deleted: fs56433.patch
===================================================================
--- fs56433.patch	2021-10-12 01:03:41 UTC (rev 1029729)
+++ fs56433.patch	2021-10-12 02:05:28 UTC (rev 1029730)
@@ -1,12 +0,0 @@
-diff -r 184eb474c083 configmanager.cpp
---- a/configmanager.cpp	Sun Nov 26 21:13:19 2017 +0100
-+++ b/configmanager.cpp	Fri Dec 01 21:07:57 2017 +0100
-@@ -603,7 +603,7 @@
- #else
- 	registerOption("Grammar/Language Tool URL", &grammarCheckerConfig->languageToolURL, "http://localhost:8081/", &pseudoDialog->lineEditGrammarLTUrl);
- #endif
--	registerOption("Grammar/Language Tool Path", &grammarCheckerConfig->languageToolPath, "", &pseudoDialog->lineEditGrammarLTPath);
-+    registerOption("Grammar/Language Tool Path", &grammarCheckerConfig->languageToolPath, "/usr/share/languagetool:/usr/share/java/languagetool/*", &pseudoDialog->lineEditGrammarLTPath);
- 	registerOption("Grammar/Language Tool Arguments", &grammarCheckerConfig->languageToolArguments, "org.languagetool.server.HTTPServer -p 8081", &pseudoDialog->lineEditGrammarLTArguments);
- 	registerOption("Grammar/Language Tool Java Path", &grammarCheckerConfig->languageToolJavaPath, "java", &pseudoDialog->lineEditGrammarLTJava);
- 	registerOption("Grammar/Language Tool Autorun", &grammarCheckerConfig->languageToolAutorun, true, &pseudoDialog->checkBoxGrammarLTAutorun);

Added: fs72345.patch
===================================================================
--- fs72345.patch	                        (rev 0)
+++ fs72345.patch	2021-10-12 02:05:28 UTC (rev 1029730)
@@ -0,0 +1,25 @@
+--- a/configmanager.cpp
++++ b/configmanager.cpp
+@@ -631,7 +631,7 @@ ConfigManager::ConfigManager(QObject *pa
+ #else
+ 	registerOption("Grammar/Language Tool URL", &grammarCheckerConfig->languageToolURL, "http://localhost:8081/", &pseudoDialog->lineEditGrammarLTUrl);
+ #endif
+-	registerOption("Grammar/Language Tool Path", &grammarCheckerConfig->languageToolPath, "", &pseudoDialog->lineEditGrammarLTPath);
++	registerOption("Grammar/Language Tool Path", &grammarCheckerConfig->languageToolPath, "/usr/share/languagetool:/usr/share/java/languagetool/*", &pseudoDialog->lineEditGrammarLTPath);
+ 	registerOption("Grammar/Language Tool Arguments", &grammarCheckerConfig->languageToolArguments, "org.languagetool.server.HTTPServer -p 8081", &pseudoDialog->lineEditGrammarLTArguments);
+ 	registerOption("Grammar/Language Tool Java Path", &grammarCheckerConfig->languageToolJavaPath, "java", &pseudoDialog->lineEditGrammarLTJava);
+ 	registerOption("Grammar/Language Tool Autorun", &grammarCheckerConfig->languageToolAutorun, true, &pseudoDialog->checkBoxGrammarLTAutorun);
+--- a/grammarcheck.cpp
++++ b/grammarcheck.cpp
+@@ -639,11 +639,6 @@ void GrammarCheckLanguageToolJSON::tryTo
+     startTime = 0;
+     if (ltPath == "")
+         return;
+-    if(!QFileInfo::exists(ltPath)){
+-        errorText=QString("LT path \" %1 \" not found !").arg(ltPath);
+-        emit errorMessage(errorText);
+-        return;
+-    }
+     javaProcess = new QProcess();
+     connect(javaProcess, SIGNAL(finished(int,QProcess::ExitStatus)), javaProcess, SLOT(deleteLater()));
+     connect(this, SIGNAL(destroyed()), javaProcess, SLOT(deleteLater()));