SHA256
1
0
forked from pool/xdg-utils

Accepting request 1001164 from X11:common:Factory

OBS-URL: https://build.opensuse.org/request/show/1001164
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xdg-utils?expand=0&rev=57
This commit is contained in:
Dominique Leuenberger 2022-09-06 11:00:43 +00:00 committed by Git OBS Bridge
commit 6e44638c3c
3 changed files with 36 additions and 0 deletions

29
xdg-utils-egrep.patch Normal file
View File

@ -0,0 +1,29 @@
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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Sep 4 17:29:24 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
- xdg-open: convert usage of obsolete egrep to grep -E
add xdg-utils-egrep.patch, boo#1203092
-------------------------------------------------------------------
Tue Jul 26 07:16:43 UTC 2022 - jslaby@suse.cz

View File

@ -31,6 +31,7 @@ Patch0: install-some-more-scripts.diff
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