diff --git a/gnome-session-check-dbus-update-activation-environment.patch b/gnome-session-check-dbus-update-activation-environment.patch index 81f4a29..e3bf06d 100644 --- a/gnome-session-check-dbus-update-activation-environment.patch +++ b/gnome-session-check-dbus-update-activation-environment.patch @@ -1,14 +1,20 @@ -From 515cada5b932e52b3d20e3194fac550c32a93c42 Mon Sep 17 00:00:00 2001 -From: Felix Zhang -Date: Tue, 16 Aug 2016 17:53:03 +0800 -Subject: [PATCH] remove dbus-update-activation-environment call +commit 4abdb7925c3bf91e0802e42bab6c90d9a3086b2e +Author: Dominique Leuenberger +Date: Tue Aug 16 16:15:21 2016 +0200 ---- - gnome-session/gnome-session.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + Do not report errors in absence of dbus-update-activation-environment + + dbus-update-activation-environment was introduced with dbus 1.10.4 + gnome-session by itself does not depend on any specific version of + dbus at all - but on dbus-glib-1 (DBUS_GLIB_REQUIRED=0.76) + + The latest version of dbus-glib (ver 106) requires dbus-1 1.8: it is + thus a valid setup to run not have dbus-update-activation-environment + on the system. Warning the user about its absence is alerting users + for not reason. diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in -index 6b2ba18..975b949 100644 +index 6b2ba18..5f4b303 100644 --- a/gnome-session/gnome-session.in +++ b/gnome-session/gnome-session.in @@ -12,6 +12,6 @@ if [ -n "$REGION" ]; then @@ -16,9 +22,6 @@ index 6b2ba18..975b949 100644 fi -dbus-update-activation-environment --all ||: -+which dbus-update-activation-environment > /dev/null 2>&1 && dbus-update-activation-environment --all ||: ++dbus-update-activation-environment --all >& /dev/null ||: exec @libexecdir@/gnome-session-binary "$@" --- -2.6.6 - diff --git a/gnome-session.changes b/gnome-session.changes index 9f49816..ccc3b8c 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Aug 18 13:08:30 UTC 2016 - dimstar@opensuse.org + +- Update + gnome-session-check-dbus-update-activation-environment.patch: use + the upstream commited solution + ------------------------------------------------------------------- Tue Aug 16 10:19:26 UTC 2016 - fezhang@suse.com