Compare commits
1 Commits
63622c2eee
...
ae06ade717
| Author | SHA256 | Date | |
|---|---|---|---|
| ae06ade717 |
@@ -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
|
||||
|
||||
18
_service
18
_service
@@ -1,18 +0,0 @@
|
||||
<services>
|
||||
<service mode="disabled" name="obs_scm">
|
||||
<param name="url">git://anongit.freedesktop.org/xdg/xdg-utils</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="filename">xdg-utils</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 name="tar" mode="buildtime"/>
|
||||
<service name="recompress" mode="buildtime">
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">xz</param>
|
||||
</service>
|
||||
</services>
|
||||
@@ -1,4 +0,0 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">git://anongit.freedesktop.org/xdg/xdg-utils</param>
|
||||
<param name="changesrevision">1a58bc28f6844898532daf9ee1bf6da7764955a9</param></service></servicedata>
|
||||
@@ -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.
@@ -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
|
||||
|
||||
BIN
xdg-utils-v1.2.1.tar.gz
(Stored with Git LFS)
Normal file
BIN
xdg-utils-v1.2.1.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
@@ -1,3 +1,117 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 21 08:08:07 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
|
||||
|
||||
- Separate xdg-screensaver into a subpackage to isolate Perl
|
||||
dependency (bsc#1216537).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 13 09:52:36 UTC 2024 - christophe@krop.fr
|
||||
|
||||
- Update to version 1.2.1:
|
||||
* Better shellcheck tooling
|
||||
* Use 1.2.99 for the Version in the development branch while
|
||||
not releasing.
|
||||
* Update ChangeLog
|
||||
* Adapt the script the places the _MANUALPAGE and _USAGE
|
||||
sections to handle the new quotes
|
||||
* Quote all _MANUALPAGE and _USAGE openers to interpret them
|
||||
as literals
|
||||
* Made slightly misleading command example easier to
|
||||
understand. (Hopefully)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 01 09:48:12 UTC 2024 - sflees@suse.de
|
||||
|
||||
- Update to version 1.2.0+20240130:
|
||||
* xdg-icon-resource: unbreak syntax by removing stray grave accent
|
||||
(boo#1219420)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 30 03:49:59 UTC 2024 - Simon Lees <sflees@suse.de>
|
||||
|
||||
- Update to Version 1.2.0 (Lining up with the upstream release)
|
||||
* all: Add xdg-realpath to better handle Canonicalizing filenames (#66)
|
||||
* xdg-open: Use url.dll as url opener on wsl (#242)
|
||||
* tests: Fix quoting issues in t-xdg-open.sh
|
||||
* xdg-open: Added a reporting issues section to xdg-open in the hopes
|
||||
that more issues will be attributed correctly
|
||||
* xdg-mime: Added a secutity note on xdg-mime default to warn against confusing
|
||||
openers and runners
|
||||
* xdg-open: Added paragraph explaining the wiered return behaviour of xdg-open
|
||||
* xdg-email: shellcheck
|
||||
* xdg-mime: shellcheck
|
||||
* xdg-settings: Add support for deeping-desktop browser setting in
|
||||
xdg-settings.
|
||||
* all: Fix config.status warning about ignored --datarootdir setting
|
||||
* all: Shellchecked xdg-utils-common.in
|
||||
* xdg-open: shellcheck
|
||||
* xdg-mime: Create a generic implementation for KDE
|
||||
* all: Move to markdown for README's
|
||||
* xdg-mime: Improve Documentation around query file/default
|
||||
* xdg-open: Document not handling '-' at the start of filenames
|
||||
* xdg-open: Deduplicate URL recognition
|
||||
* xdg-open: remove unused open_generic_xdg_file_mime
|
||||
* xdg-open: use LC_ALL=C with URLs
|
||||
* xdg-open: Fix URI/URL handling
|
||||
* xdg-email: Remove default BROWSER logic, no longer needed
|
||||
* xdg-mime: Improve synopsis
|
||||
* xdg-settings: read KDE browser settings the right way around
|
||||
* xdg-open: Improve WSL support
|
||||
* xdg-mime: actually handle lists in mimeapps.list correctly
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 29 08:50:42 UTC 2023 - Simon Lees <sflees@suse.de>
|
||||
|
||||
- Update to version 1.2.0-beta1+20230929:
|
||||
* Set Version to 1.2.0-beta1
|
||||
* Update Changes and Release Notes
|
||||
* fix(xdg-open): handle spaces in .desktop file path
|
||||
* Quote Browser variable to avod unintentional code execution
|
||||
* Add missing result gathering
|
||||
* Enhance LXQt Desktop Enviromment support
|
||||
* xdg-terminal: don't run 'kreadconfig' if KDE_SESSION_VERSION is >= 5
|
||||
- Drop the following fix, now actually included upstream
|
||||
* xdg-terminal-don-t-run-kreadconfig-if-KDE_SESSION_VE.patch
|
||||
- The following entries may have been missed in previous changelog
|
||||
versions
|
||||
* all: shellcheck fixes; make xdg-mime DASH-compatible
|
||||
* xdg-email: do not run BROWSER if xdg-open failed
|
||||
* Ensure POSIX-compliant shell scripting to support DASH
|
||||
* all: spelling fixes
|
||||
* Fix set_url_scheme_handler_gnome3 to not associate text/html handler
|
||||
* xdg-screensaver: fix the freedesktop screensaver
|
||||
* xdg-screensaver: implement support for "gnome3" DE
|
||||
* xdg-screensaver: better error detection for freedesktop 'status' command
|
||||
* xdg-desktop-menu: Drop obsolete GNOME support
|
||||
* xdg-open: support WSL (FDO#108975)
|
||||
* xdg-su: support deepin
|
||||
* xdg-mime: If mimeapps.list is a symlink, retain the symlink (#7)
|
||||
* xdg-open: fix search_desktop_file's logic
|
||||
* xdg-open: handle local hostname in `file:` URLs
|
||||
* xdg-desk-menu: Check if defaults file exists during installation
|
||||
* xdg-su: Remove quotes for lxqt-sudo cmd arg
|
||||
* xdg-open: handle opening files when DE=flatpak
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
- 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>
|
||||
|
||||
@@ -20,7 +134,7 @@ Mon Aug 30 08:54:16 UTC 2021 - jslaby@suse.cz
|
||||
-------------------------------------------------------------------
|
||||
Sat Apr 24 12:51:58 UTC 2021 - Hillwood Yang <hillwood@opensuse.org>
|
||||
|
||||
- Add support-deepin-desktop.patch
|
||||
- Add support-deepin-desktop.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 30 15:09:47 UTC 2020 - Frederic Crozat <fcrozat@suse.com>
|
||||
@@ -113,9 +227,9 @@ Tue Nov 15 00:26:14 UTC 2016 - sflees@suse.de
|
||||
|
||||
- Update to 20160610
|
||||
* Fixes for last update
|
||||
- boo#1004321 desktop files with a - are still valid, issue in
|
||||
- boo#1004321 desktop files with a - are still valid, issue in
|
||||
common-vendor-dirs-in-desktop_to_binary.patch
|
||||
- boo#959912 Introduce LXQt support, renamed
|
||||
- boo#959912 Introduce LXQt support, renamed
|
||||
fix-enlightenment-support.patch to fix-enlightenment-lxqt-support.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
@@ -129,7 +243,7 @@ Fri May 20 04:54:39 UTC 2016 - sflees@suse.de
|
||||
- Fix issues related to xdg-open/xdg-mime generic code paths.
|
||||
* common-vendor-dirs-in-desktop_to_binary.patch
|
||||
* xdg-mime-return-existing-desktop-files.patch
|
||||
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Feb 6 11:12:43 UTC 2016 - sor.alexei@meowr.ru
|
||||
|
||||
@@ -157,7 +271,7 @@ Sun Dec 6 10:23:11 UTC 2015 - jslaby@suse.com
|
||||
Thu Dec 3 17:08:12 UTC 2015 - ronisbr@gmail.com
|
||||
|
||||
- Add patch `xdg-terminal-fix-gsettings.patch` to fix upstream
|
||||
bfo#93231
|
||||
bfo#93231
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 3 10:55:15 UTC 2015 - jslaby@suse.com
|
||||
@@ -328,7 +442,7 @@ Tue Jan 20 12:14:38 UTC 2015 - jslaby@suse.com
|
||||
-------------------------------------------------------------------
|
||||
Sun Dec 28 08:43:50 UTC 2014 - simon@simotek.net
|
||||
|
||||
- add fix-enlightenment-support.patch
|
||||
- add fix-enlightenment-support.patch
|
||||
* xdg-su and xdg-terminal both detected enlightenment then did nothing
|
||||
* xdg-su and xdg-terminal both use terminology rather then xterm now
|
||||
|
||||
@@ -439,12 +553,12 @@ Tue Jul 20 21:21:59 UTC 2010 - reddwarf@opensuse.org
|
||||
-------------------------------------------------------------------
|
||||
Sun Mar 28 17:43:15 UTC 2010 - andrea@opensuse.org
|
||||
|
||||
- added xdg-utils-1.0.2-bnc591714.patch to fix bnc#591714
|
||||
- added xdg-utils-1.0.2-bnc591714.patch to fix bnc#591714
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 14 18:01:21 UTC 2010 - andrea@opensuse.org
|
||||
|
||||
- added LXDE support
|
||||
- added LXDE support
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Aug 16 13:43:52 CEST 2009 - aj@suse.de
|
||||
@@ -460,20 +574,20 @@ Thu Feb 7 13:13:48 CET 2008 - dmueller@suse.de
|
||||
Mon Oct 22 14:25:40 CEST 2007 - stbinner@suse.de
|
||||
|
||||
- update to 1.0.2:
|
||||
* SVG icons are not supported but doc still mentioned SVG
|
||||
* xdg-email can now be used without any e-mail address
|
||||
* SVG icons are not supported but doc still mentioned SVG
|
||||
* xdg-email can now be used without any e-mail address
|
||||
* do not use mktemp without arguments, it breaks on systems with
|
||||
certain older versions of mktemp
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 20 18:57:34 CEST 2007 - dmueller@suse.de
|
||||
|
||||
- fix xdg-su outside KDE/GNOME (#309164)
|
||||
- fix xdg-su outside KDE/GNOME (#309164)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 30 11:35:02 CEST 2007 - dmueller@suse.de
|
||||
|
||||
- fix xdg-su for XFCE (#304753)
|
||||
- fix xdg-su for XFCE (#304753)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 22 14:25:00 CEST 2007 - dmueller@suse.de
|
||||
@@ -486,7 +600,7 @@ Mon Nov 6 09:48:46 CET 2006 - dmueller@suse.de
|
||||
- update to 1.0.1:
|
||||
* Several shell syntax issues causing failures on Ubuntu 6.10
|
||||
* Spurious output on stdout when running xdg-desktop-menu
|
||||
* Non-ascii mailto URI handling of xdg-email on non-UTF8 locales
|
||||
* Non-ascii mailto URI handling of xdg-email on non-UTF8 locales
|
||||
under KDE
|
||||
|
||||
-------------------------------------------------------------------
|
||||
@@ -503,5 +617,5 @@ Wed Sep 27 11:58:49 CEST 2006 - dmueller@suse.de
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 22 13:27:51 CEST 2006 - dmueller@suse.de
|
||||
|
||||
- Initial package (TP1)
|
||||
- Initial package (TP1)
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
name: xdg-utils
|
||||
version: 1.1.3+20210805
|
||||
mtime: 1628200120
|
||||
commit: 1a58bc28f6844898532daf9ee1bf6da7764955a9
|
||||
version: 1.2.1+20240208
|
||||
mtime: 1707369507
|
||||
commit: 54b6c1e4da163598c8e903978a29b543f97b0cda
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package xdg-utils
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -17,29 +17,21 @@
|
||||
|
||||
|
||||
Name: xdg-utils
|
||||
Version: 1.1.3+20210805
|
||||
Version: 1.2.1
|
||||
Release: 0
|
||||
Summary: Utilities to uniformly interface desktop environments
|
||||
License: MIT
|
||||
Group: System/GUI/Other
|
||||
URL: https://www.freedesktop.org/wiki/Software/xdg-utils/
|
||||
# http://portland.freedesktop.org/download/xdg-utils-%%{version}.tar.gz
|
||||
Source: xdg-utils-%{version}.tar.xz
|
||||
Source: https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/v%{version}/xdg-utils-v%{version}.tar.gz
|
||||
# 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
|
||||
BuildRequires: xmlto
|
||||
Requires: perl
|
||||
Requires: perl-Net-DBus
|
||||
Requires: perl-X11-Protocol
|
||||
Requires: which
|
||||
Recommends: %{name}-screensaver
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
@@ -59,8 +51,24 @@ This means that:
|
||||
simply make sure that these utilities work properly in their
|
||||
environment.
|
||||
|
||||
%package screensaver
|
||||
Summary: Command line tool for controlling the screensaver
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Provides: xdg-utils:%{_bindir}/xdg-screensaver
|
||||
Requires: perl
|
||||
Requires: perl-Net-DBus
|
||||
Requires: perl-X11-Protocol
|
||||
|
||||
%description screensaver
|
||||
xdg-screensaver provides commands to control the screensaver.
|
||||
|
||||
For use inside a desktop session only. It is not recommended to
|
||||
use xdg-screensaver as root.
|
||||
|
||||
Separated from the main package to isolate Perl dependency.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%autosetup -p1 -n %{name}-v%{version}
|
||||
|
||||
%build
|
||||
%configure
|
||||
@@ -75,7 +83,7 @@ ln -snf xdg-open %{buildroot}%{_bindir}/desktop-launch
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc ChangeLog README TODO
|
||||
%doc ChangeLog README.md TODO
|
||||
%license LICENSE
|
||||
%{_bindir}/call-browser
|
||||
%{_bindir}/desktop-launch
|
||||
@@ -86,7 +94,6 @@ ln -snf xdg-open %{buildroot}%{_bindir}/desktop-launch
|
||||
%{_bindir}/xdg-mime
|
||||
%{_bindir}/xdg-open
|
||||
%{_bindir}/xdg-su
|
||||
%{_bindir}/xdg-screensaver
|
||||
%{_bindir}/xdg-settings
|
||||
%{_bindir}/xdg-terminal
|
||||
%{_mandir}/man1/xdg-desktop-icon.1%{?ext_man}
|
||||
@@ -96,8 +103,12 @@ ln -snf xdg-open %{buildroot}%{_bindir}/desktop-launch
|
||||
%{_mandir}/man1/xdg-mime.1%{?ext_man}
|
||||
%{_mandir}/man1/xdg-open.1%{?ext_man}
|
||||
%{_mandir}/man1/xdg-terminal.1%{?ext_man}
|
||||
%{_mandir}/man1/xdg-screensaver.1%{?ext_man}
|
||||
%{_mandir}/man1/xdg-settings.1%{?ext_man}
|
||||
%{_mandir}/man1/xdg-su.1%{?ext_man}
|
||||
|
||||
%files screensaver
|
||||
%license LICENSE
|
||||
%{_bindir}/xdg-screensaver
|
||||
%{_mandir}/man1/xdg-screensaver.1%{?ext_man}
|
||||
|
||||
%changelog
|
||||
|
||||
Reference in New Issue
Block a user