diff --git a/Revert-launcher-simplify-getting-session-dbus-proxy.patch b/Revert-launcher-simplify-getting-session-dbus-proxy.patch new file mode 100644 index 0000000..f80a7b7 --- /dev/null +++ b/Revert-launcher-simplify-getting-session-dbus-proxy.patch @@ -0,0 +1,47 @@ +From b7aca078447031ac85550216a3836b6d5e81576a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jonas=20=C3=85dahl?= +Date: Thu, 17 Sep 2015 11:40:59 +0800 +Subject: Revert "launcher: simplify getting session dbus proxy" + +Signals are sent to a specific ID, so we can't use "self" here. After +this revert, VT switching works again. + +This reverts commit 8e22bf5bc96a7d9ff1aba8ea8217a4c3ca06b4ce. + +https://bugzilla.gnome.org/show_bug.cgi?id=753434 + +diff --git a/src/backends/native/meta-launcher.c b/src/backends/native/meta-launcher.c +index 6fc4505..618bd68 100644 +--- a/src/backends/native/meta-launcher.c ++++ b/src/backends/native/meta-launcher.c +@@ -71,17 +71,26 @@ report_error_and_die (const char *prefix, + static Login1Session * + get_session_proxy (GCancellable *cancellable) + { ++ char *proxy_path; ++ char *session_id; + Login1Session *session_proxy; + GError *error = NULL; + ++ if (sd_pid_get_session (getpid (), &session_id) < 0) ++ return NULL; ++ ++ proxy_path = get_escaped_dbus_path ("/org/freedesktop/login1/session", session_id); ++ + session_proxy = login1_session_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, + G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START, + "org.freedesktop.login1", +- "/org/freedesktop/login1/session/self", ++ proxy_path, + cancellable, &error); + if (!session_proxy) + report_error_and_die ("Failed getting session proxy", error); + ++ free (proxy_path); ++ + return session_proxy; + } + +-- +cgit v0.10.2 + diff --git a/mutter.changes b/mutter.changes index 6de0adc..9e6257d 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Sep 19 11:08:06 UTC 2015 - zaitor@opensuse.org + +- Add Revert-launcher-simplify-getting-session-dbus-proxy.patch: + fix VT switching with wayland, patch from upstream git. + ------------------------------------------------------------------- Wed Sep 16 17:45:23 UTC 2015 - dimstar@opensuse.org diff --git a/mutter.spec b/mutter.spec index 3564b38..fa2db91 100644 --- a/mutter.spec +++ b/mutter.spec @@ -30,6 +30,8 @@ License: GPL-2.0+ Group: System/GUI/GNOME Url: http://www.gnome.org Source: http://download.gnome.org/sources/mutter/3.17/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM Revert-launcher-simplify-getting-session-dbus-proxy.patch zaitor@opensuse.org -- Fix VT switching with wayland. +Patch0: Revert-launcher-simplify-getting-session-dbus-proxy.patch BuildRequires: fdupes BuildRequires: gobject-introspection-devel >= 0.9.5 BuildRequires: intltool @@ -135,6 +137,7 @@ to develop applications that require these. %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build