r45925 - in /desktop/experimental/mutter/debian: changelog patches/git_launcher-fix-vt-switch.patch patches/git_launcher-format-string.patch patches/series
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Thu Sep 17 11:54:38 UTC 2015
Author: ah
Date: Thu Sep 17 11:54:38 2015
New Revision: 45925
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45925
Log:
* New upstream release candidante
* Add two patches cherry-picked from upstream git:
- debian/patches/git_launcher-format-string.patch
"launcher: Don't pass variable as format string"
- debian/patches/git_launcher-fix-vt-switch.patch
"Revert "launcher: simplify getting session dbus proxy""
Added:
desktop/experimental/mutter/debian/patches/git_launcher-fix-vt-switch.patch
desktop/experimental/mutter/debian/patches/git_launcher-format-string.patch
Modified:
desktop/experimental/mutter/debian/changelog
desktop/experimental/mutter/debian/patches/series
Modified: desktop/experimental/mutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/changelog?rev=45925&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/changelog [utf-8] (original)
+++ desktop/experimental/mutter/debian/changelog [utf-8] Thu Sep 17 11:54:38 2015
@@ -1,10 +1,19 @@
-mutter (3.17.90-2) UNRELEASED; urgency=medium
-
+mutter (3.17.92-1) experimental; urgency=medium
+
+ [ Dmitry Shachnev ]
* Remove now useless dependency on gnome-themes-standard.
* Instead, bump libgtk-3-dev build-dependency to 3.14 to make sure mutter will
depend on a version of libgtk-3-common that contains the Adwaita theme.
- -- Dmitry Shachnev <mitya57 at debian.org> Tue, 08 Sep 2015 17:50:32 +0300
+ [ Andreas Henriksson ]
+ * New upstream release candidante
+ * Add two patches cherry-picked from upstream git:
+ - debian/patches/git_launcher-format-string.patch
+ "launcher: Don't pass variable as format string"
+ - debian/patches/git_launcher-fix-vt-switch.patch
+ "Revert "launcher: simplify getting session dbus proxy""
+
+ -- Andreas Henriksson <andreas at fatal.se> Thu, 17 Sep 2015 13:42:48 +0200
mutter (3.17.90-1) experimental; urgency=medium
Added: desktop/experimental/mutter/debian/patches/git_launcher-fix-vt-switch.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/git_launcher-fix-vt-switch.patch?rev=45925&op=file
==============================================================================
--- desktop/experimental/mutter/debian/patches/git_launcher-fix-vt-switch.patch (added)
+++ desktop/experimental/mutter/debian/patches/git_launcher-fix-vt-switch.patch [utf-8] Thu Sep 17 11:54:38 2015
@@ -0,0 +1,47 @@
+From b7aca078447031ac85550216a3836b6d5e81576a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl at gmail.com>
+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
+
Added: desktop/experimental/mutter/debian/patches/git_launcher-format-string.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/git_launcher-format-string.patch?rev=45925&op=file
==============================================================================
--- desktop/experimental/mutter/debian/patches/git_launcher-format-string.patch (added)
+++ desktop/experimental/mutter/debian/patches/git_launcher-format-string.patch [utf-8] Thu Sep 17 11:54:38 2015
@@ -0,0 +1,24 @@
+From dc780d2c4450385a2fba4df34be62e0bfc838c72 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
+Date: Wed, 16 Sep 2015 17:38:10 +0200
+Subject: launcher: Don't pass variable as format string
+
+We know the variable only contains one or another string literal,
+but keep compilers happy as well.
+
+diff --git a/src/backends/native/meta-launcher.c b/src/backends/native/meta-launcher.c
+index 5ceeda7..6fc4505 100644
+--- a/src/backends/native/meta-launcher.c
++++ b/src/backends/native/meta-launcher.c
+@@ -63,7 +63,7 @@ report_error_and_die (const char *prefix,
+ if (error)
+ g_error ("%s: %s", prefix, error->message);
+ else
+- g_error (prefix);
++ g_error ("%s", prefix);
+
+ /* the error is not freed, but it is ok as g_error aborts the process */
+ }
+--
+cgit v0.10.2
+
Modified: desktop/experimental/mutter/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/series?rev=45925&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/patches/series [utf-8] (original)
+++ desktop/experimental/mutter/debian/patches/series [utf-8] Thu Sep 17 11:54:38 2015
@@ -1 +1,3 @@
01_Wcast-align.patch
+git_launcher-format-string.patch
+git_launcher-fix-vt-switch.patch
More information about the pkg-gnome-commits
mailing list