Hello community, here is the log from the commit of package xdg-utils for openSUSE:Factory checked in at 2019-11-08 15:21:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdg-utils (Old) and /work/SRC/openSUSE:Factory/.xdg-utils.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdg-utils" Fri Nov 8 15:21:24 2019 rev:50 rq:745125 version:1.1.3+20190413 Changes: -------- --- /work/SRC/openSUSE:Factory/xdg-utils/xdg-utils.changes 2019-10-14 12:31:39.116245360 +0200 +++ /work/SRC/openSUSE:Factory/.xdg-utils.new.2990/xdg-utils.changes 2019-11-08 15:21:27.222723624 +0100 @@ -1,0 +2,6 @@ +Wed Oct 30 16:12:34 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Add 0001-Don-t-run-kreadconfig-if-KDE_SESSION_VERSION-is-5.patch + to read the KDE Frameworks config file if necessary (boo#1155462) + +------------------------------------------------------------------- New: ---- 0001-Don-t-run-kreadconfig-if-KDE_SESSION_VERSION-is-5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdg-utils.spec ++++++ --- /var/tmp/diff_new_pack.Y8dlR8/_old 2019-11-08 15:21:27.818724254 +0100 +++ /var/tmp/diff_new_pack.Y8dlR8/_new 2019-11-08 15:21:27.818724254 +0100 @@ -27,6 +27,8 @@ Source: xdg-utils-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE install-some-more-scripts.diff [email protected] Patch0: install-some-more-scripts.diff +# PATCH-FIX-UPSTREAM 0001-Don-t-run-kreadconfig-if-KDE_SESSION_VERSION-is-5.patch +Patch1: 0001-Don-t-run-kreadconfig-if-KDE_SESSION_VERSION-is-5.patch BuildRequires: make # for xmlto to be able to generate text from html BuildRequires: w3m @@ -55,8 +57,7 @@ environment. %prep -%setup -q -%autopatch -p1 +%autosetup -p1 %build %configure ++++++ 0001-Don-t-run-kreadconfig-if-KDE_SESSION_VERSION-is-5.patch ++++++ >From e47c61cb3c780cd091038c8b580eca6e10679a11 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Wed, 30 Oct 2019 17:11:08 +0100 Subject: [PATCH] Don't run 'kreadconfig' if KDE_SESSION_VERSION is >= 5. '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 36a9833..05a3c44 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=`which $terminal 2>/dev/null` -- 2.23.0
