SHA256
1
0
forked from pool/xdg-utils
Jiri Slaby 2023-09-21 05:54:53 +00:00 committed by Git OBS Bridge
parent 1cad24231e
commit c89750a1ea
3 changed files with 44 additions and 0 deletions

View File

@ -0,0 +1,41 @@
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Wed, 30 Oct 2019 17:11:08 +0100
Subject: xdg-terminal: don't run 'kreadconfig' if KDE_SESSION_VERSION is >= 5
Patch-mainline: not yet
References: bsc#1215384
'kreadconfig' is a KDE4 executable. The program is called 'kreadconfig5' in
KDE Frameworks 5.xx.
---
scripts/xdg-terminal.in | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/scripts/xdg-terminal.in b/scripts/xdg-terminal.in
index 71d56a595cfb..bd2529cde1ad 100644
--- a/scripts/xdg-terminal.in
+++ b/scripts/xdg-terminal.in
@@ -30,7 +30,20 @@ _USAGE
terminal_kde()
{
- terminal=`kreadconfig --file kdeglobals --group General --key TerminalApplication --default konsole`
+ if [ -n "$KDE_SESSION_VERSION" ] && [ "$KDE_SESSION_VERSION" -ge 5 ]; then
+ local kreadconfig=kreadconfig$KDE_SESSION_VERSION
+ else
+ local kreadconfig=kreadconfig
+ fi
+
+ if which $kreadconfig >/dev/null 2>&1; then
+ local terminal=$($kreadconfig --file kdeglobals \
+ --group General \
+ --key TerminalApplication \
+ --default konsole)
+ else
+ exit_failure_operation_impossible "'$kreadconfig' was not found or is not executable"
+ fi
terminal_exec=`command -v $terminal`
--
2.42.0

View File

@ -4,6 +4,8 @@ Thu Sep 21 05:47:59 UTC 2023 - jslaby@suse.cz
- Update to version 1.1.3+20230831: - Update to version 1.1.3+20230831:
* Revert putting process in background from !55 * Revert putting process in background from !55
- revert _service to the original state - revert _service to the original state
- revert drop of xdg-terminal-don-t-run-kreadconfig-if-KDE_SESSION_VE.patch
(bsc#1215384)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 31 18:12:21 UTC 2023 - Enrico Belleri <kilgore.trout@idesmi.eu> Thu Aug 31 18:12:21 UTC 2023 - Enrico Belleri <kilgore.trout@idesmi.eu>

View File

@ -27,6 +27,7 @@ URL: https://www.freedesktop.org/wiki/Software/xdg-utils/
Source: xdg-utils-%{version}.tar.xz Source: xdg-utils-%{version}.tar.xz
# PATCH-FEATURE-OPENSUSE install-some-more-scripts.diff jslaby@suse.cz # PATCH-FEATURE-OPENSUSE install-some-more-scripts.diff jslaby@suse.cz
Patch0: install-some-more-scripts.diff Patch0: install-some-more-scripts.diff
Patch1: xdg-terminal-don-t-run-kreadconfig-if-KDE_SESSION_VE.patch
BuildRequires: make BuildRequires: make
# for xmlto to be able to generate text from html # for xmlto to be able to generate text from html
BuildRequires: w3m BuildRequires: w3m