SHA256
1
0
forked from pool/xdg-utils

Accepting request 347378 from home:Ronis_BR

Add patch `xdg-terminal-fix-gsettings.patch` to fix upstream bnc#93231.

xdg-terminal is not working when it needs settings 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.

OBS-URL: https://build.opensuse.org/request/show/347378
OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=46
This commit is contained in:
Jiri Slaby 2015-12-06 10:38:46 +00:00 committed by Git OBS Bridge
parent 7785cb70a3
commit 128b302f1a
3 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,15 @@
Index: xdg-utils-20151005/scripts/xdg-terminal.in
===================================================================
--- xdg-utils-20151005.orig/scripts/xdg-terminal.in
+++ xdg-utils-20151005/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`

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Dec 3 17:08:12 UTC 2015 - ronisbr@gmail.com
- Add patch `xdg-terminal-fix-gsettings.patch` to fix upstream
bnc#93231
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.
-------------------------------------------------------------------
Tue Nov 3 10:55:15 UTC 2015 - jslaby@suse.com

View File

@ -34,6 +34,10 @@ Url: http://portland.freedesktop.org/
Source0: xdg-utils-%{version}.tar.xz
Patch0: install-some-more-scripts.diff
Patch3: fix-enlightenment-support.patch
# PATCH-FIX-UPSTREAM xdg-terminal-fix-gsettings.patch bnc#93231
# Fix a bug when xdg-terminal needs gsettings to get the default terminal.
# See: https://bugs.freedesktop.org/show_bug.cgi?id=93231
Patch4: xdg-terminal-fix-gsettings.patch
Requires: perl
Requires: perl-Net-DBus
Requires: perl-X11-Protocol
@ -62,6 +66,7 @@ They are intended to provide a set of defacto standards. This means that:
%setup -q -n %name-%{version}
%patch0 -p1
%patch3 -p1
%patch4 -p1
%build
%configure