From 128b302f1a97acd1eefccb7ab8da01645c04805d3d6bd3d3bb9d2b0d3704b823 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.com>
Date: Sun, 6 Dec 2015 10:38:46 +0000
Subject: [PATCH] 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
---
 xdg-terminal-fix-gsettings.patch | 15 +++++++++++++++
 xdg-utils.changes                | 13 +++++++++++++
 xdg-utils.spec                   |  7 ++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 xdg-terminal-fix-gsettings.patch

diff --git a/xdg-terminal-fix-gsettings.patch b/xdg-terminal-fix-gsettings.patch
new file mode 100644
index 0000000..08c0295
--- /dev/null
+++ b/xdg-terminal-fix-gsettings.patch
@@ -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`
+ 
diff --git a/xdg-utils.changes b/xdg-utils.changes
index 8ab4dd9..51aaf4c 100644
--- a/xdg-utils.changes
+++ b/xdg-utils.changes
@@ -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
 
diff --git a/xdg-utils.spec b/xdg-utils.spec
index ce02564..5890e7a 100644
--- a/xdg-utils.spec
+++ b/xdg-utils.spec
@@ -33,7 +33,11 @@ Url:            http://portland.freedesktop.org/
 # http://portland.freedesktop.org/download/xdg-utils-%%{version}.tgz
 Source0:        xdg-utils-%{version}.tar.xz
 Patch0:         install-some-more-scripts.diff
-Patch3:         fix-enlightenment-support.patch 
+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