forked from pool/xdg-utils
up to 1.1.3+20190401
OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=65
This commit is contained in:
Git OBS Bridge
parent
de58e5d6f6
commit
1275532588
4
_service
4
_service
@ -4,7 +4,9 @@
|
||||
<param name="changesgenerate">enable</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="filename">xdg-utils</param>
|
||||
<param name="versionformat">%cd</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="recompress">
|
||||
<param name="file">*.tar</param>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">git://anongit.freedesktop.org/xdg/xdg-utils</param>
|
||||
<param name="changesrevision">159fc37075db2decf446f453fe1a796da6921aad</param></service></servicedata>
|
||||
<param name="changesrevision">bfcefa162b1dcd6d62e193019969ff2f5ff331cf</param></service></servicedata>
|
||||
@ -1,30 +0,0 @@
|
||||
From: Ronan Arraes Jardim Chagas <ronisbr@gmail.com>
|
||||
References: bfo#93231
|
||||
Subject: Fix a bug when xdg-terminal needs gsettings to get the default terminal
|
||||
|
||||
xdg-terminal is not working when it needs gsettings to obtain the
|
||||
default terminal. Thus, xdg-terminal cannot be used in MATE, Cinnamon
|
||||
or GNOME. This issue was already reported in:
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=93231
|
||||
|
||||
Thus, this patch provides a temporary workaround until upstream fixes
|
||||
it.
|
||||
|
||||
Link: https://bugs.freedesktop.org/show_bug.cgi?id=93231
|
||||
---
|
||||
scripts/xdg-terminal.in | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/scripts/xdg-terminal.in
|
||||
+++ b/scripts/xdg-terminal.in
|
||||
@@ -86,8 +86,8 @@ terminal_gsettings()
|
||||
{
|
||||
term_schema="$1"; shift
|
||||
|
||||
- term_exec=`gsettings get ${term_schema} exec`
|
||||
- term_exec_arg=`gsettings get ${term_schema} exec-arg`
|
||||
+ term_exec=`gsettings get ${term_schema} exec | sed -r "s/^'(.*)'$/\1/"`
|
||||
+ term_exec_arg=`gsettings get ${term_schema} exec-arg | sed -r "s/^'(.*)'$/\1/"`
|
||||
|
||||
terminal_exec=`which $term_exec 2>/dev/null`
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
From: sor.alexei@meowr.ru
|
||||
Subject: Fixes -x argument, which is the default for {gnome,mate}-terminal
|
||||
References: fdo#93231
|
||||
|
||||
---
|
||||
|
||||
--- a/scripts/xdg-terminal.in
|
||||
+++ b/scripts/xdg-terminal.in
|
||||
@@ -65,11 +65,17 @@ terminal_gnome()
|
||||
if [ x"$1" = x"" ]; then
|
||||
$terminal_exec
|
||||
else
|
||||
- if [ x"$term_exec_arg" = x"" ]; then
|
||||
- $terminal_exec "$1"
|
||||
- else
|
||||
- $terminal_exec "$term_exec_arg" "$1"
|
||||
- fi
|
||||
+ case "$term_exec_arg" in
|
||||
+ "")
|
||||
+ "$terminal_exec" "$1"
|
||||
+ ;;
|
||||
+ *-x*)
|
||||
+ "$terminal_exec" "$term_exec_arg" sh -c "$1"
|
||||
+ ;;
|
||||
+ *)
|
||||
+ "$terminal_exec" "$term_exec_arg" "$1"
|
||||
+ ;;
|
||||
+ esac
|
||||
fi
|
||||
|
||||
if [ $? -eq 0 ]; then
|
||||
@@ -93,13 +99,19 @@ terminal_gsettings()
|
||||
|
||||
if [ -x "$terminal_exec" ]; then
|
||||
if [ x"$1" = x"" ]; then
|
||||
- $terminal_exec
|
||||
+ "$terminal_exec"
|
||||
else
|
||||
- if [ x"$term_exec_arg" = x"" ]; then
|
||||
- $terminal_exec "$1"
|
||||
- else
|
||||
- $terminal_exec "$term_exec_arg" "$1"
|
||||
- fi
|
||||
+ case "$term_exec_arg" in
|
||||
+ "")
|
||||
+ "$terminal_exec" "$1"
|
||||
+ ;;
|
||||
+ *-x*)
|
||||
+ "$terminal_exec" "$term_exec_arg" sh -c "$1"
|
||||
+ ;;
|
||||
+ *)
|
||||
+ "$terminal_exec" "$term_exec_arg" "$1"
|
||||
+ ;;
|
||||
+ esac
|
||||
fi
|
||||
|
||||
if [ $? -eq 0 ]; then
|
||||
3
xdg-utils-1.1.3+20190401.tar.xz
Normal file
3
xdg-utils-1.1.3+20190401.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a072c724cc3530f09ec4ea8fd8314ef1f22da053913a1a63e1b78cab0f3079e5
|
||||
size 269924
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4d8527598ee63e1b5a2fdd569f16ee15934756a84cb6d551a1e02b21c8bc46c1
|
||||
size 269664
|
||||
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 23 04:44:28 UTC 2019 - jslaby@suse.com
|
||||
|
||||
- Update to version 1.1.3+20190401:
|
||||
* support digits in uri scheme regex
|
||||
* Enable cinnamon screensaver for xdg aware desktop environments (eg lxqt)
|
||||
* xdg-open: fix comment typo
|
||||
* xdg-su: fix some easy TODOs
|
||||
* xdg-screensaver: Sanitise window name before sending it over the bus
|
||||
* Fixes -x argument, which is the default for {gnome,mate}-terminal
|
||||
* Fix a bug when xdg-terminal needs gsettings to get the default terminal
|
||||
* test-lib.sh: run: eat xdg-open's exit code
|
||||
* xdg-open: handle file://localhost/
|
||||
* Restore matching of older deepin names
|
||||
* xdg-email: Support for Deepin
|
||||
* xdg-open: better pcmanfm check (BR106636,BR106161)
|
||||
* open for post 1.1.3 development
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 23 09:17:31 UTC 2018 - alarrosa@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package xdg-utils
|
||||
#
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -12,12 +12,12 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: xdg-utils
|
||||
Version: 20180510
|
||||
Version: 1.1.3+20190401
|
||||
Release: 0
|
||||
Summary: Utilities to uniformly interface desktop environments
|
||||
License: MIT
|
||||
@ -27,10 +27,6 @@ Url: http://portland.freedesktop.org/
|
||||
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 xdg-terminal-fix-gsettings.patch fdo#93231 ronisbr@gmail.com
|
||||
Patch1: xdg-terminal-fix-gsettings.patch
|
||||
# PATCH-FIX-UPSTREAM xdg-terminal-fix-terminal--x-arg.patch fdo#93231 sor.alexei@meowr.ru -- https://bugs.freedesktop.org/show_bug.cgi?id=93231#c5
|
||||
Patch3: xdg-terminal-fix-terminal--x-arg.patch
|
||||
BuildRequires: make
|
||||
# for xmlto to be able to generate text from html
|
||||
BuildRequires: w3m
|
||||
@ -39,12 +35,7 @@ Requires: perl
|
||||
Requires: perl-Net-DBus
|
||||
Requires: perl-X11-Protocol
|
||||
Requires: which
|
||||
%if 0%{?suse_version} > 1110
|
||||
BuildArch: noarch
|
||||
%else
|
||||
BuildRequires: xz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%endif
|
||||
|
||||
%description
|
||||
The xdg-utils package is a set of simple scripts that provide basic
|
||||
|
||||
Loading…
Reference in New Issue
Block a user