From 1cad24231eab1d581e6c7f5d79a927c5bbb14be544addb51e04b2f9b6b28dc15 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 21 Sep 2023 05:51:28 +0000 Subject: [PATCH 1/3] up to 1.1.3+20230831 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=88 --- _service | 2 +- _servicedata | 4 ++-- xdg-utils-1.1.3+20230830.obscpio | 3 --- xdg-utils-1.1.3+20230831.obscpio | 3 +++ xdg-utils.changes | 7 +++++++ xdg-utils.obsinfo | 6 +++--- xdg-utils.spec | 2 +- 7 files changed, 17 insertions(+), 10 deletions(-) delete mode 100644 xdg-utils-1.1.3+20230830.obscpio create mode 100644 xdg-utils-1.1.3+20230831.obscpio diff --git a/_service b/_service index d08360d..74d0809 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ https://gitlab.freedesktop.org/xdg/xdg-utils.git git + enable xdg-utils - master @PARENT_TAG@+%cd v(.*) \1 diff --git a/_servicedata b/_servicedata index d428b02..617f7b2 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ - git://anongit.freedesktop.org/xdg/xdg-utils - 1a58bc28f6844898532daf9ee1bf6da7764955a9 \ No newline at end of file + https://gitlab.freedesktop.org/xdg/xdg-utils.git + adf064ae472b4cacf11f04f5265a0a86980e4ced \ No newline at end of file diff --git a/xdg-utils-1.1.3+20230830.obscpio b/xdg-utils-1.1.3+20230830.obscpio deleted file mode 100644 index b9817b6..0000000 --- a/xdg-utils-1.1.3+20230830.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e7bfd6d8e6f8dd3a87ec18c358b9f7e1f6fc08580cde36cfc6fa2fab5e068aae -size 788492 diff --git a/xdg-utils-1.1.3+20230831.obscpio b/xdg-utils-1.1.3+20230831.obscpio new file mode 100644 index 0000000..692bc08 --- /dev/null +++ b/xdg-utils-1.1.3+20230831.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7fd032ddc1824cad90363c07c5bcda4b9dd51453f0a4f99a054c066d34ed8be +size 789516 diff --git a/xdg-utils.changes b/xdg-utils.changes index 5edd8ba..e1eea11 100644 --- a/xdg-utils.changes +++ b/xdg-utils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Thu Aug 31 18:12:21 UTC 2023 - Enrico Belleri diff --git a/xdg-utils.obsinfo b/xdg-utils.obsinfo index f3fe832..40cef83 100644 --- a/xdg-utils.obsinfo +++ b/xdg-utils.obsinfo @@ -1,4 +1,4 @@ name: xdg-utils -version: 1.1.3+20230830 -mtime: 1693370134 -commit: d0b765f4879ea784bfa3c4cb91e5c9240e5df52e +version: 1.1.3+20230831 +mtime: 1693446718 +commit: adf064ae472b4cacf11f04f5265a0a86980e4ced diff --git a/xdg-utils.spec b/xdg-utils.spec index 16ff8eb..5a314e1 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -17,7 +17,7 @@ Name: xdg-utils -Version: 1.1.3+20230830 +Version: 1.1.3+20230831 Release: 0 Summary: Utilities to uniformly interface desktop environments License: MIT From c89750a1ea43b437b7844da7195e413784403daea0cb5dc44d972b75da7f34e5 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 21 Sep 2023 05:54:53 +0000 Subject: [PATCH 2/3] 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 +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 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 From 0ec89ad5d673ac0cf84a2877c35ca3689e6b291fafdf3a20394dbb1661154a12 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 21 Sep 2023 06:53:31 +0000 Subject: [PATCH 3/3] git clean OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=90 --- xdg-utils-1.1.3+20230831.obscpio | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xdg-utils-1.1.3+20230831.obscpio b/xdg-utils-1.1.3+20230831.obscpio index 692bc08..d80ae56 100644 --- a/xdg-utils-1.1.3+20230831.obscpio +++ b/xdg-utils-1.1.3+20230831.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7fd032ddc1824cad90363c07c5bcda4b9dd51453f0a4f99a054c066d34ed8be -size 789516 +oid sha256:fd295b51ff690d790b1075c38111c7446c4b74be08d814f239f1e7abc1e65b2d +size 788492