commit:     b7a5322ca6893e2388e0a50dae5df71282ce26f4
Author:     Andrew Udvare <audvare <AT> gmail <DOT> com>
AuthorDate: Fri May  3 07:57:46 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 05:29:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7a5322c

net-irc/quassel: add patch to fix /exec scriptname

>From https://github.com/quassel/quassel/pull/609

Signed-off-by: Andrew Udvare <audvare <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/quassel-0.14.0-fix-exec-script.patch     | 29 ++++++++++++++++++++++
 net-irc/quassel/quassel-0.14.0-r2.ebuild           |  3 ++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/net-irc/quassel/files/quassel-0.14.0-fix-exec-script.patch 
b/net-irc/quassel/files/quassel-0.14.0-fix-exec-script.patch
new file mode 100644
index 000000000000..fcaa188effcb
--- /dev/null
+++ b/net-irc/quassel/files/quassel-0.14.0-fix-exec-script.patch
@@ -0,0 +1,29 @@
+From 247d7fe0a99a4e2a1c1b861455062c5630428492 Mon Sep 17 00:00:00 2001
+From: Max Audron <aud...@cocaine.farm>
+Date: Tue, 18 Oct 2022 15:04:17 +0200
+Subject: [PATCH] fix client execwrapper not using full path to script
+
+The clients execwrapper was using the scriptName instead of the full
+path fileName to execute scripts leading to scripts only being found and
+executed if the script directory was also in $PATH or a executable with
+the same name as the script was in $PATH.
+
+This could also lead to confusion as it executes whatever is in $PATH
+instead of the actual script in quassels directories.
+---
+ src/client/execwrapper.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/client/execwrapper.cpp b/src/client/execwrapper.cpp
+index 5cbecf675..6ec519c4d 100644
+--- a/src/client/execwrapper.cpp
++++ b/src/client/execwrapper.cpp
+@@ -73,7 +73,7 @@ void ExecWrapper::start(const BufferInfo& info, const 
QString& command)
+             if (!QFile::exists(fileName))
+                 continue;
+             _process.setWorkingDirectory(scriptDir);
+-            _process.start(_scriptName, params);
++            _process.start(fileName, params);
+             return;
+         }
+         emit error(tr("Could not find script \"%1\"").arg(_scriptName));

diff --git a/net-irc/quassel/quassel-0.14.0-r2.ebuild 
b/net-irc/quassel/quassel-0.14.0-r2.ebuild
index e0ce1c5cdfce..af4e2d872c26 100644
--- a/net-irc/quassel/quassel-0.14.0-r2.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -105,6 +105,7 @@ DOCS=( AUTHORS ChangeLog README.md )
 PATCHES=(
        "${FILESDIR}/${P}-cxxflags.patch"
        "${FILESDIR}/${P}-fix-desktop-application-name.patch"
+       "${FILESDIR}/${P}-fix-exec-script.patch"
 )
 
 src_configure() {

Reply via email to