From c89750a1ea43b437b7844da7195e413784403daea0cb5dc44d972b75da7f34e5 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.com>
Date: Thu, 21 Sep 2023 05:54:53 +0000
Subject: [PATCH] fix kde 6

OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=89
---
 ...-t-run-kreadconfig-if-KDE_SESSION_VE.patch | 41 +++++++++++++++++++
 xdg-utils.changes                             |  2 +
 xdg-utils.spec                                |  1 +
 3 files changed, 44 insertions(+)
 create mode 100644 xdg-terminal-don-t-run-kreadconfig-if-KDE_SESSION_VE.patch

diff --git a/xdg-terminal-don-t-run-kreadconfig-if-KDE_SESSION_VE.patch b/xdg-terminal-don-t-run-kreadconfig-if-KDE_SESSION_VE.patch
new file mode 100644
index 0000000..ce28dd3
--- /dev/null
+++ b/xdg-terminal-don-t-run-kreadconfig-if-KDE_SESSION_VE.patch
@@ -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
+
diff --git a/xdg-utils.changes b/xdg-utils.changes
index e1eea11..5a8d40c 100644
--- a/xdg-utils.changes
+++ b/xdg-utils.changes
@@ -4,6 +4,8 @@ Thu Sep 21 05:47:59 UTC 2023 - jslaby@suse.cz
 - Update to version 1.1.3+20230831:
   * Revert putting process in background from !55
 - 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>
diff --git a/xdg-utils.spec b/xdg-utils.spec
index 5a314e1..be03ed8 100644
--- a/xdg-utils.spec
+++ b/xdg-utils.spec
@@ -27,6 +27,7 @@ URL:            https://www.freedesktop.org/wiki/Software/xdg-utils/
 Source:         xdg-utils-%{version}.tar.xz
 # PATCH-FEATURE-OPENSUSE install-some-more-scripts.diff jslaby@suse.cz
 Patch0:         install-some-more-scripts.diff
+Patch1:         xdg-terminal-don-t-run-kreadconfig-if-KDE_SESSION_VE.patch
 BuildRequires:  make
 # for xmlto to be able to generate text from html
 BuildRequires:  w3m