forked from pool/xdg-utils
Accepting request 1108331 from home:iDesmI:kf6
- Update to 1.1.3+20230830
* Patches:
- 0001-Don-t-run-kreadconfig-if-KDE_SESSION_VERSION-is-5.patch
- support-deepin-desktop.patch
- xdg-utils-egrep.patch
are merged upstream
* Support for KDE Plasma 6
OBS-URL: https://build.opensuse.org/request/show/1108331
OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=86
This commit is contained in:
Git OBS Bridge
parent
cddf45b0a1
commit
a10b957fe9
@ -1,40 +0,0 @@
|
||||
From e47c61cb3c780cd091038c8b580eca6e10679a11 Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Giboudeaux <christophe@krop.fr>
|
||||
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
|
||||
|
||||
9
_service
9
_service
@ -1,15 +1,14 @@
|
||||
<services>
|
||||
<service mode="disabled" name="obs_scm">
|
||||
<param name="url">git://anongit.freedesktop.org/xdg/xdg-utils</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
<service mode="manual" name="obs_scm">
|
||||
<param name="url">https://gitlab.freedesktop.org/xdg/xdg-utils.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="filename">xdg-utils</param>
|
||||
<param name="revision">master</param>
|
||||
<param name="versionformat">@PARENT_TAG@+%cd</param>
|
||||
<param name="versionrewrite-pattern">v(.*)</param>
|
||||
<param name="versionrewrite-replacement">\1</param>
|
||||
</service>
|
||||
<service mode="disabled" name="set_version"/>
|
||||
|
||||
<service mode="manual" name="set_version"/>
|
||||
<service name="tar" mode="buildtime"/>
|
||||
<service name="recompress" mode="buildtime">
|
||||
<param name="file">*.tar</param>
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Nur xdg-utils-1.1.3+20200220/scripts/xdg-su.in xdg-utils-1.1.3+20200220-new/scripts/xdg-su.in
|
||||
--- xdg-utils-1.1.3+20200220/scripts/xdg-su.in 2020-02-21 05:01:04.000000000 +0800
|
||||
+++ xdg-utils-1.1.3+20200220-new/scripts/xdg-su.in 2021-04-24 20:48:46.501510379 +0800
|
||||
@@ -198,7 +198,7 @@
|
||||
su_kde
|
||||
;;
|
||||
|
||||
- gnome*|cinnamon|lxde|mate)
|
||||
+ gnome*|cinnamon|lxde|mate|deepin)
|
||||
su_gnome
|
||||
;;
|
||||
|
||||
BIN
xdg-utils-1.1.3+20210805.obscpio
(Stored with Git LFS)
BIN
xdg-utils-1.1.3+20210805.obscpio
(Stored with Git LFS)
Binary file not shown.
3
xdg-utils-1.1.3+20230830.obscpio
Normal file
3
xdg-utils-1.1.3+20230830.obscpio
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e7bfd6d8e6f8dd3a87ec18c358b9f7e1f6fc08580cde36cfc6fa2fab5e068aae
|
||||
size 788492
|
||||
@ -1,29 +0,0 @@
|
||||
From 7538458c6c8999296a272c40bd4ec24132a51877 Mon Sep 17 00:00:00 2001
|
||||
From: E5ten <ethancsommer@gmail.com>
|
||||
Date: Thu, 16 Jan 2020 02:06:09 +0000
|
||||
Subject: [PATCH] switch from non-standard "egrep" to POSIX "grep -E"
|
||||
References: https://bugzilla.opensuse.org/show_bug.cgi?id=1203092
|
||||
https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/21
|
||||
https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/44
|
||||
https://gitlab.freedesktop.org/xdg/xdg-utils/-/issues/207
|
||||
|
||||
---
|
||||
scripts/xdg-open.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
|
||||
index 202f3e3..35b0522 100644
|
||||
--- a/scripts/xdg-open.in
|
||||
+++ b/scripts/xdg-open.in
|
||||
@@ -72,7 +72,7 @@ get_key()
|
||||
is_file_url_or_path()
|
||||
{
|
||||
if echo "$1" | grep -q '^file://' \
|
||||
- || ! echo "$1" | egrep -q '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then
|
||||
+ || ! echo "$1" | grep -Eq '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
--
|
||||
GitLab
|
||||
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 31 18:12:21 UTC 2023 - Enrico Belleri <kilgore.trout@idesmi.eu>
|
||||
|
||||
- Update to 1.1.3+20230830
|
||||
* Patches:
|
||||
- 0001-Don-t-run-kreadconfig-if-KDE_SESSION_VERSION-is-5.patch
|
||||
- support-deepin-desktop.patch
|
||||
- xdg-utils-egrep.patch
|
||||
are merged upstream
|
||||
* Support for KDE Plasma 6
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 4 17:29:24 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
name: xdg-utils
|
||||
version: 1.1.3+20210805
|
||||
mtime: 1628200120
|
||||
commit: 1a58bc28f6844898532daf9ee1bf6da7764955a9
|
||||
version: 1.1.3+20230830
|
||||
mtime: 1693370134
|
||||
commit: d0b765f4879ea784bfa3c4cb91e5c9240e5df52e
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package xdg-utils
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: xdg-utils
|
||||
Version: 1.1.3+20210805
|
||||
Version: 1.1.3+20230830
|
||||
Release: 0
|
||||
Summary: Utilities to uniformly interface desktop environments
|
||||
License: MIT
|
||||
@ -27,11 +27,6 @@ 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
|
||||
# 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
|
||||
# PATCH-FIX-OPENSUSE support-deepin-desktop.patch hillwood@opensuse.org
|
||||
Patch2: support-deepin-desktop.patch
|
||||
Patch3: xdg-utils-egrep.patch
|
||||
BuildRequires: make
|
||||
# for xmlto to be able to generate text from html
|
||||
BuildRequires: w3m
|
||||
|
||||
Loading…
Reference in New Issue
Block a user