Hello community,
here is the log from the commit of package gnome-settings-daemon for
openSUSE:Factory checked in at 2015-10-25 19:12:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-settings-daemon (Old)
and /work/SRC/openSUSE:Factory/.gnome-settings-daemon.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-settings-daemon"
Changes:
--------
---
/work/SRC/openSUSE:Factory/gnome-settings-daemon/gnome-settings-daemon.changes
2015-10-06 16:25:52.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.gnome-settings-daemon.new/gnome-settings-daemon.changes
2015-10-25 19:12:45.000000000 +0100
@@ -1,0 +2,15 @@
+Thu Oct 22 21:40:19 CEST 2015 - [email protected]
+
+- Add gnome-settings-daemon-dont-override-xim-presets.patch: Don't
+ override QT_IM_MODULE and XMODIFIERS if already set (boo#947576,
+ bgo#757013).
+
+-------------------------------------------------------------------
+Mon Oct 12 13:16:22 UTC 2015 - [email protected]
+
+- Update to version 3.18.1:
+ + Fix cursor-size changes being ignored.
+ + Build fixes.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
gnome-settings-daemon-3.18.0.tar.xz
New:
----
gnome-settings-daemon-3.18.1.tar.xz
gnome-settings-daemon-dont-override-xim-presets.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.KKrnH9/_old 2015-10-25 19:12:46.000000000 +0100
+++ /var/tmp/diff_new_pack.KKrnH9/_new 2015-10-25 19:12:46.000000000 +0100
@@ -30,7 +30,7 @@
%endif
Name: gnome-settings-daemon
-Version: 3.18.0
+Version: 3.18.1
Release: 0
Summary: Settings daemon for the GNOME desktop
License: GPL-2.0+
@@ -41,6 +41,8 @@
Patch10: gnome-settings-daemon-bnc462640-mute-action.patch
# PATCH-FEATURE-UPSTREAM gnome-settings-daemon-notify-idle-resumed.patch
bnc#439018 bnc#708182 bgo#575467 [email protected] -- notify user about auto
suspend when returning from sleep
Patch19: gnome-settings-daemon-notify-idle-resumed.patch
+# PATCH-FIX-UPSTREAM gnome-settings-daemon-dont-override-xim-presets.patch
boo#947576 bgo#757013 [email protected] -- Don't overwrite XIM presets
+Patch20: gnome-settings-daemon-dont-override-xim-presets.patch
BuildRequires: cups-devel
BuildRequires: fdupes
BuildRequires: gnome-common
@@ -129,6 +131,7 @@
#gnome-patch-translation-prepare
%patch10 -p0
%patch19 -p1
+%patch20 -p1
%build
autoreconf -f -i
++++++ gnome-settings-daemon-3.18.0.tar.xz ->
gnome-settings-daemon-3.18.1.tar.xz ++++++
++++ 11321 lines of diff (skipped)
++++++ gnome-settings-daemon-dont-override-xim-presets.patch ++++++
From: Takashi Iwai <[email protected]>
Subject: Don't override preset xim setups
References: boo#947576
When $QT_IM_MODULE or $XMODIFIERS has been already set beforehand,
we should honor it and not override brutally. This makes GNOME as
a good citizen coping with other IMs more smoothly.
Signed-off-by: Takashi Iwai <[email protected]>
---
gnome-settings-daemon/gnome-settings-daemon-localeexec.in | 4 ++--
gnome-settings-daemon/main.c | 11 +++++++++--
2 files changed, 11 insertions(+), 4 deletions(-)
--- a/gnome-settings-daemon/gnome-settings-daemon-localeexec.in
+++ b/gnome-settings-daemon/gnome-settings-daemon-localeexec.in
@@ -13,8 +13,8 @@ if [ -n "$REGION" ]; then
fi
if [ -x @prefix@/bin/ibus-daemon ]; then
- export QT_IM_MODULE=ibus
- export XMODIFIERS=@im=ibus
+ test -z "$QT_IM_MODULE" && export QT_IM_MODULE=ibus
+ test -z "$XMODIFIERS" && export XMODIFIERS=@im=ibus
fi
exec @libexecdir@/gnome-settings-daemon
--- a/gnome-settings-daemon/main.c
+++ b/gnome-settings-daemon/main.c
@@ -255,9 +255,16 @@ is_program_in_path (const char *binary)
static void
set_legacy_ibus_env_vars (GDBusProxy *proxy)
{
+ const char *p;
if (is_program_in_path ("ibus-daemon")) {
- set_session_env (proxy, "QT_IM_MODULE", "ibus");
- set_session_env (proxy, "XMODIFIERS", "@im=ibus");
+ p = getenv ("QT_IM_MODULE");
+ if (!p || !*p)
+ p = "ibus";
+ set_session_env (proxy, "QT_IM_MODULE", p);
+ p = getenv ("XMODIFIERS");
+ if (!p || !*p)
+ p = "@im=ibus";
+ set_session_env (proxy, "XMODIFIERS", p);
}
}
