Merge lp:~noskcaj/gnome-session/3.16 into lp:~ubuntu-desktop/gnome-session/ubuntu

Proposed by Jackson Doak on 2015-06-05
Status: Merged
Merged at revision: 333
Proposed branch: lp:~noskcaj/gnome-session/3.16
Merge into: lp:~ubuntu-desktop/gnome-session/ubuntu
Diff against target: 646 lines (+155/-241)
9 files modified
debian/changelog (+62/-0)
debian/control (+4/-5)
debian/control.in (+3/-4)
debian/patches/0001-configure.ac-Add-support-for-new-versions-of-systemd.patch (+0/-31)
debian/patches/103_kill_the_fail_whale.patch (+16/-9)
debian/patches/22_support_autostart_delay.patch (+42/-32)
debian/patches/95_dbus_request_shutdown.patch (+28/-24)
debian/patches/git_add_disable_acceleration_option.patch (+0/-134)
debian/patches/series (+0/-2)
To merge this branch: bzr merge lp:~noskcaj/gnome-session/3.16
Reviewer Review Type Date Requested Status
Daniel Holbach 2015-06-05 Approve on 2015-06-08
Review via email: mp+261279@code.launchpad.net

Description of the change

Merge from debian 3.16

To post a comment you must log in.
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-05-20 01:27:38 +0000
3+++ debian/changelog 2015-06-05 20:00:45 +0000
4@@ -1,3 +1,64 @@
5+gnome-session (3.16.0-1ubuntu1) wily; urgency=low
6+
7+ * Merge from Debian unstable. Remaining changes:
8+ - debian/control.in:
9+ + Recommend session-migration
10+ + don't depend on xwayland
11+ + Remove gnome-shell circular dep to ease uprades
12+ - Split ubuntu-session out of gnome-session.
13+ - Add upstart user session
14+ - debian/gnome-session-bin.postinst, debian/gnome-session-bin.prerm:
15+ Moved registering gnome-session binary as a session manager to
16+ gnome-session-bin package
17+ - don't install defaults.list (installed by desktop-file-utils in ubuntu):
18+ debian/gnome-session-common.dirs and gnome-session-common.install
19+ - debian/patches/22_support_autostart_delay.patch:
20+ Bugzilla patch to support adding a delay to autostart apps, using
21+ a "X-GNOME-Autostart-Delay" key in the desktop file
22+ - debian/patches/50_ubuntu_sessions.patch:
23+ + Add Ubuntu session
24+ + gnome-shell.desktop adds --session=gnome now that the "ubuntu" session
25+ is the default. Use TryExec to test if gnome-shell is installed.
26+ - debian/patches/51_remove_session_saving_from_gui.patch:
27+ add GNOME_SESSION_SAVE environment variable for people wanting to
28+ use the save session still, knowing that it can break your system
29+ if used unwisely
30+ - debian/patches/52_xdg_current_desktop.patch:
31+ Set XDG_CURRENT_DESKTOP inside gnome-session based on a new key
32+ 'DesktopName' in gnome-session .desktop files.
33+ - debian/patches/53_add_sessionmigration.patch, debian/control:
34+ recommends and launch the session-migration if present at the start of
35+ the session. This sync tool is running different session migration
36+ scripts that can be provided in various desktop packages.
37+ - debian/patches/95_dbus_request_shutdown.patch: Add "RequestShutdown" and
38+ "RequestReboot" DBus methods to allow other applications to shutdown or
39+ reboot the machine via the session manager.
40+ - debian/patches/103_kill_the_fail_whale.patch: Kill the Fail Whale as it
41+ tends to be more annoying than helpful
42+ - debian/gnome-session-bin.user-session.upstart: Disable acceleration check
43+ when launching a GNOME Flashback (Metacity) session.
44+ - Split wayland session into gnome-session-wayland
45+ + control.in: add gnome-session-wayland package and depend on xwayland
46+ + gnome-session-wayland.install: install wayland session
47+
48+ -- Jackson Doak <noskcaj@ubuntu.com> Fri, 05 Jun 2015 20:08:47 +1000
49+
50+gnome-session (3.16.0-1) unstable; urgency=medium
51+
52+ * New upstream release.
53+ - Adds new --disable-acceleration-check option (closes: #771513).
54+ * Drop 0001-configure.ac-Add-support-for-new-versions-of-systemd.patch,
55+ applied upstream.
56+ * Upstream has disabled support for consolekit even on non-systemd
57+ systems with this release. We follow upstream and do not enable it
58+ forcefully. Please file a bug if you think this change is wrong.
59+ - Drop libdbus-glib-1-dev build-dependency, it is now only used by
60+ consolekit support code.
61+ - Drop consolekit recommends from gnome-session-bin.
62+ * Bump Standards-Version to 3.9.6, no changes needed.
63+
64+ -- Dmitry Shachnev <mitya57@debian.org> Tue, 26 May 2015 17:34:09 +0300
65+
66 gnome-session (3.14.0-3ubuntu2) wily; urgency=medium
67
68 * debian/50-ubuntu.conf:
69@@ -3019,3 +3080,4 @@
70 * Initial Release.
71
72 -- Jim Pick <jim@jimpick.com> Mon, 16 Mar 1998 15:27:43 -0800
73+
74
75=== modified file 'debian/control'
76--- debian/control 2015-05-18 12:40:04 +0000
77+++ debian/control 2015-06-05 20:00:45 +0000
78@@ -7,8 +7,8 @@
79 Priority: optional
80 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
81 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
82-Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Michael Biebl <biebl@debian.org>
83-Standards-Version: 3.9.5
84+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Dmitry Shachnev <mitya57@debian.org>, Michael Biebl <biebl@debian.org>
85+Standards-Version: 3.9.6
86 Build-Depends: cdbs (>= 0.4.41),
87 dh-autoreconf,
88 debhelper (>= 8),
89@@ -17,7 +17,6 @@
90 intltool (>= 0.40.6),
91 libglib2.0-dev (>= 2.39.90),
92 libgtk-3-dev (>= 2.90.7),
93- libdbus-glib-1-dev (>= 0.76),
94 libjson-glib-dev (>= 0.10),
95 libgnome-desktop-3-dev (>= 3.9.91),
96 libsm-dev,
97@@ -111,9 +110,9 @@
98 dbus-x11,
99 gsettings-desktop-schemas,
100 upower (>= 0.9.0),
101-Recommends: libpam-systemd [linux-any], consolekit [!linux-any]
102+Recommends: libpam-systemd [linux-any]
103 Conflicts: gnome-session (<< 3.9.90-0ubuntu8)
104-Breaks: gdm (<< 3.8)
105+Breaks: gdm3 (<< 3.8)
106 Description: GNOME Session Manager - Minimal runtime
107 The GNOME Session Manager is in charge of starting the core components
108 of the GNOME desktop, and applications that should be launched at
109
110=== modified file 'debian/control.in'
111--- debian/control.in 2015-05-18 12:40:04 +0000
112+++ debian/control.in 2015-06-05 20:00:45 +0000
113@@ -4,7 +4,7 @@
114 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
115 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
116 Uploaders: @GNOME_TEAM@
117-Standards-Version: 3.9.5
118+Standards-Version: 3.9.6
119 Build-Depends: cdbs (>= 0.4.41),
120 dh-autoreconf,
121 debhelper (>= 8),
122@@ -13,7 +13,6 @@
123 intltool (>= 0.40.6),
124 libglib2.0-dev (>= 2.39.90),
125 libgtk-3-dev (>= 2.90.7),
126- libdbus-glib-1-dev (>= 0.76),
127 libjson-glib-dev (>= 0.10),
128 libgnome-desktop-3-dev (>= 3.9.91),
129 libsm-dev,
130@@ -107,9 +106,9 @@
131 dbus-x11,
132 gsettings-desktop-schemas,
133 upower (>= 0.9.0),
134-Recommends: libpam-systemd [linux-any], consolekit [!linux-any]
135+Recommends: libpam-systemd [linux-any]
136 Conflicts: gnome-session (<< 3.9.90-0ubuntu8)
137-Breaks: gdm (<< 3.8)
138+Breaks: gdm3 (<< 3.8)
139 Description: GNOME Session Manager - Minimal runtime
140 The GNOME Session Manager is in charge of starting the core components
141 of the GNOME desktop, and applications that should be launched at
142
143=== removed file 'debian/patches/0001-configure.ac-Add-support-for-new-versions-of-systemd.patch'
144--- debian/patches/0001-configure.ac-Add-support-for-new-versions-of-systemd.patch 2015-05-18 12:40:04 +0000
145+++ debian/patches/0001-configure.ac-Add-support-for-new-versions-of-systemd.patch 1970-01-01 00:00:00 +0000
146@@ -1,31 +0,0 @@
147-From a9d7b5dc95c5fa52453fe7c2fe1be2163e4d93ca Mon Sep 17 00:00:00 2001
148-From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
149-Date: Tue, 10 Feb 2015 16:34:38 +0000
150-Subject: [PATCH] configure.ac: Add support for new versions of systemd
151-
152-(cherry picked from commit 3474df12baedcdf09743cdff60e59b4b78539601)
153----
154- configure.ac | 7 +++++--
155- 1 file changed, 5 insertions(+), 2 deletions(-)
156-
157-diff --git a/configure.ac b/configure.ac
158-index 6485d57..9b95b26 100644
159---- a/configure.ac
160-+++ b/configure.ac
161-@@ -121,8 +121,11 @@ AC_ARG_ENABLE([systemd],
162- [enable_systemd=auto])
163-
164- PKG_CHECK_MODULES(SYSTEMD,
165-- [gio-unix-2.0 libsystemd-login >= 183 libsystemd-daemon libsystemd-journal],
166-- [have_systemd=yes], [have_systemd=no])
167-+ [gio-unix-2.0 libsystemd >= 209],
168-+ [have_systemd=yes],
169-+ [PKG_CHECK_MODULES([SYSTEMD],
170-+ [gio-unix-2.0 libsystemd-login >= 183 libsystemd-daemon libsystemd-journal],
171-+ [have_systemd=yes],[have_systemd=no])])
172-
173- AC_MSG_CHECKING([whether to use systemd])
174-
175---
176-2.1.4
177-
178
179=== modified file 'debian/patches/103_kill_the_fail_whale.patch'
180--- debian/patches/103_kill_the_fail_whale.patch 2015-03-10 05:14:29 +0000
181+++ debian/patches/103_kill_the_fail_whale.patch 2015-06-05 20:00:45 +0000
182@@ -1,22 +1,23 @@
183-Index: gnome-session-3.14.0/gnome-session/gsm-fail-whale.c
184+Index: gnome-session-3.15.92/gnome-session/gsm-fail-whale.c
185 ===================================================================
186---- gnome-session-3.14.0.orig/gnome-session/gsm-fail-whale.c
187-+++ gnome-session-3.14.0/gnome-session/gsm-fail-whale.c
188-@@ -18,6 +18,8 @@
189-
190- #include <config.h>
191+--- gnome-session-3.15.92.orig/gnome-session/gsm-fail-whale.c
192++++ gnome-session-3.15.92/gnome-session/gsm-fail-whale.c
193+@@ -21,6 +21,8 @@
194+ #include <signal.h>
195+ #include <stdlib.h>
196
197 +#include <stdlib.h>
198 +
199 #include <glib/gi18n.h>
200 #include <glib/gstdio.h>
201
202-@@ -28,18 +30,7 @@ gsm_fail_whale_dialog_we_failed (gboole
203+@@ -37,25 +39,6 @@ gsm_fail_whale_dialog_we_failed (gboole
204 gboolean allow_logout,
205 GsmShellExtensions *extensions)
206 {
207 - gint i;
208 - gchar *argv[5];
209+- GPid pid;
210 -
211 - i = 0;
212 - argv[i++] = LIBEXECDIR "/gnome-session-failed";
213@@ -27,8 +28,14 @@
214 - if (extensions != NULL && gsm_shell_extensions_n_extensions (extensions) > 0)
215 - argv[i++] = "--extensions";
216 - argv[i++] = NULL;
217-
218-- g_spawn_async (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL);
219+-
220+- if (!g_spawn_async (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &pid, NULL)) {
221+- exit (1);
222+- }
223+-
224+- g_child_watch_add (pid,
225+- (GChildWatchFunc)on_fail_whale_failed,
226+- NULL);
227 + g_critical ("We failed, but the fail whale is dead. Sorry....");
228 + exit (1);
229 }
230
231=== modified file 'debian/patches/22_support_autostart_delay.patch'
232--- debian/patches/22_support_autostart_delay.patch 2013-06-25 15:09:48 +0000
233+++ debian/patches/22_support_autostart_delay.patch 2015-06-05 20:00:45 +0000
234@@ -5,9 +5,11 @@
235 Author: Chris Coulson <chrisccoulson@ubuntu.com>
236 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608402
237
238---- a/gnome-session/gsm-app.c
239-+++ b/gnome-session/gsm-app.c
240-@@ -252,6 +252,7 @@
241+Index: gnome-session-3.15.3/gnome-session/gsm-app.c
242+===================================================================
243+--- gnome-session-3.15.3.orig/gnome-session/gsm-app.c
244++++ gnome-session-3.15.3/gnome-session/gsm-app.c
245+@@ -310,6 +310,7 @@ gsm_app_class_init (GsmAppClass *klass)
246 klass->impl_provides = NULL;
247 klass->impl_get_provides = NULL;
248 klass->impl_is_running = NULL;
249@@ -15,7 +17,7 @@
250
251 g_object_class_install_property (object_class,
252 PROP_PHASE,
253-@@ -456,7 +457,10 @@
254+@@ -513,7 +514,10 @@ gboolean
255 gsm_app_stop (GsmApp *app,
256 GError **error)
257 {
258@@ -27,8 +29,8 @@
259 }
260
261 void
262-@@ -467,6 +471,18 @@
263- g_signal_emit (app, signals[REGISTERED], 0);
264+@@ -524,6 +528,18 @@ gsm_app_registered (GsmApp *app)
265+ return GSM_APP_GET_CLASS (app)->impl_stop (app, error);
266 }
267
268 +int
269@@ -46,9 +48,11 @@
270 void
271 gsm_app_exited (GsmApp *app,
272 guchar exit_code)
273---- a/gnome-session/gsm-app.h
274-+++ b/gnome-session/gsm-app.h
275-@@ -66,6 +66,7 @@
276+Index: gnome-session-3.15.3/gnome-session/gsm-app.h
277+===================================================================
278+--- gnome-session-3.15.3.orig/gnome-session/gsm-app.h
279++++ gnome-session-3.15.3/gnome-session/gsm-app.h
280+@@ -64,6 +64,7 @@ struct _GsmAppClass
281 GError **error);
282 gboolean (*impl_stop) (GsmApp *app,
283 GError **error);
284@@ -56,17 +60,19 @@
285 gboolean (*impl_provides) (GsmApp *app,
286 const char *service);
287 char ** (*impl_get_provides) (GsmApp *app);
288-@@ -121,6 +122,7 @@
289- gboolean gsm_app_has_autostart_condition (GsmApp *app,
290- const char *condition);
291- void gsm_app_registered (GsmApp *app);
292+@@ -119,6 +120,7 @@ char **gsm_app_get_provides
293+ gboolean gsm_app_get_registered (GsmApp *app);
294+ void gsm_app_set_registered (GsmApp *app,
295+ gboolean registered);
296 +int gsm_app_peek_autostart_delay (GsmApp *app);
297
298- /* exported to bus */
299- gboolean gsm_app_get_app_id (GsmApp *app,
300---- a/gnome-session/gsm-autostart-app.c
301-+++ b/gnome-session/gsm-autostart-app.c
302-@@ -22,6 +22,7 @@
303+ G_END_DECLS
304+
305+Index: gnome-session-3.15.3/gnome-session/gsm-autostart-app.c
306+===================================================================
307+--- gnome-session-3.15.3.orig/gnome-session/gsm-autostart-app.c
308++++ gnome-session-3.15.3/gnome-session/gsm-autostart-app.c
309+@@ -20,6 +20,7 @@
310 #include <config.h>
311
312 #include <ctype.h>
313@@ -74,7 +80,7 @@
314 #include <string.h>
315 #include <sys/wait.h>
316 #include <errno.h>
317-@@ -70,6 +71,7 @@
318+@@ -68,6 +69,7 @@ struct _GsmAutostartAppPrivate {
319 char *condition_string;
320 gboolean condition;
321 gboolean autorestart;
322@@ -82,7 +88,7 @@
323
324 GFileMonitor *condition_monitor;
325 guint condition_notify_id;
326-@@ -110,6 +112,7 @@
327+@@ -105,6 +107,7 @@ gsm_autostart_app_init (GsmAutostartApp
328 app->priv->pid = -1;
329 app->priv->condition_monitor = NULL;
330 app->priv->condition = FALSE;
331@@ -90,7 +96,7 @@
332 }
333
334 static gboolean
335-@@ -665,6 +668,20 @@
336+@@ -678,6 +681,20 @@ load_desktop_file (GsmAutostartApp *app
337 "AutostartCondition");
338 setup_condition_monitor (app);
339
340@@ -111,7 +117,7 @@
341 g_object_set (app,
342 "phase", phase,
343 "startup-id", startup_id,
344-@@ -1361,6 +1378,14 @@
345+@@ -1347,6 +1364,14 @@ gsm_autostart_app_get_app_id (GsmApp *ap
346 }
347 }
348
349@@ -126,7 +132,7 @@
350 static gboolean
351 gsm_autostart_app_initable_init (GInitable *initable,
352 GCancellable *cancellable,
353-@@ -1408,6 +1433,7 @@
354+@@ -1394,6 +1419,7 @@ gsm_autostart_app_class_init (GsmAutosta
355 app_class->impl_has_autostart_condition = gsm_autostart_app_has_autostart_condition;
356 app_class->impl_get_app_id = gsm_autostart_app_get_app_id;
357 app_class->impl_get_autorestart = gsm_autostart_app_get_autorestart;
358@@ -134,9 +140,11 @@
359
360 g_object_class_install_property (object_class,
361 PROP_DESKTOP_FILENAME,
362---- a/gnome-session/gsm-manager.c
363-+++ b/gnome-session/gsm-manager.c
364-@@ -424,7 +424,8 @@
365+Index: gnome-session-3.15.3/gnome-session/gsm-manager.c
366+===================================================================
367+--- gnome-session-3.15.3.orig/gnome-session/gsm-manager.c
368++++ gnome-session-3.15.3/gnome-session/gsm-manager.c
369+@@ -420,7 +420,8 @@ app_condition_changed (GsmApp *app,
370 } else {
371 g_debug ("GsmManager: stopping app %s", gsm_app_peek_id (app));
372
373@@ -146,7 +154,7 @@
374 error = NULL;
375 res = gsm_app_stop (app, &error);
376 if (! res) {
377-@@ -724,10 +725,36 @@
378+@@ -741,10 +742,36 @@ on_phase_timeout (GsmManager *manager)
379 }
380
381 static gboolean
382@@ -183,7 +191,7 @@
383 if (gsm_app_peek_phase (app) != manager->priv->phase) {
384 goto out;
385 }
386-@@ -745,6 +772,18 @@
387+@@ -762,6 +789,18 @@ _start_app (const char *id,
388 goto out;
389 }
390
391@@ -202,7 +210,7 @@
392 if (!start_app_or_warn (manager, app))
393 goto out;
394
395-@@ -1554,11 +1593,12 @@
396+@@ -1376,11 +1415,12 @@ _debug_app_for_phase (const char *id,
397 return FALSE;
398 }
399
400@@ -217,9 +225,11 @@
401
402 return FALSE;
403 }
404---- a/gnome-session/gsm-autostart-app.h
405-+++ b/gnome-session/gsm-autostart-app.h
406-@@ -72,6 +72,7 @@
407+Index: gnome-session-3.15.3/gnome-session/gsm-autostart-app.h
408+===================================================================
409+--- gnome-session-3.15.3.orig/gnome-session/gsm-autostart-app.h
410++++ gnome-session-3.15.3/gnome-session/gsm-autostart-app.h
411+@@ -70,6 +70,7 @@ void gsm_autostart_app_add_provides
412 #define GSM_AUTOSTART_APP_DBUS_PATH_KEY "X-GNOME-DBus-Path"
413 #define GSM_AUTOSTART_APP_DBUS_ARGS_KEY "X-GNOME-DBus-Start-Arguments"
414 #define GSM_AUTOSTART_APP_DISCARD_KEY "X-GNOME-Autostart-discard-exec"
415
416=== modified file 'debian/patches/95_dbus_request_shutdown.patch'
417--- debian/patches/95_dbus_request_shutdown.patch 2014-10-31 04:29:34 +0000
418+++ debian/patches/95_dbus_request_shutdown.patch 2015-06-05 20:00:45 +0000
419@@ -2,12 +2,15 @@
420 other applications to shutdown or reboot the machine via the session manager
421 Author: Chris Coulson <chrisccoulson@ubuntu.com>
422
423---- a/gnome-session/gsm-manager.c
424-+++ b/gnome-session/gsm-manager.c
425-@@ -3116,6 +3116,48 @@
426+Index: gnome-session-3.15.3/gnome-session/gsm-manager.c
427+===================================================================
428+--- gnome-session-3.15.3.orig/gnome-session/gsm-manager.c
429++++ gnome-session-3.15.3/gnome-session/gsm-manager.c
430+@@ -2433,6 +2433,47 @@ request_logout (GsmManager *ma
431+ end_phase (manager);
432 }
433
434- gboolean
435++gboolean
436 +gsm_manager_request_shutdown (GsmManager *manager,
437 + GError **error)
438 +{
439@@ -39,37 +42,38 @@
440 + if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) {
441 + g_set_error (error,
442 + GSM_MANAGER_ERROR,
443-+ GSM_MANAGER_ERROR_NOT_IN_RUNNING,
444++ GSM_MANAGER_ERROR_NOT_IN_RUNNING,
445 + "RequestReboot interface is only available during the Running phase");
446 + return FALSE;
447 + }
448-+
449 + request_reboot (manager);
450 +
451 + return TRUE;
452 +}
453 +
454-+gboolean
455- gsm_manager_shutdown (GsmManager *manager,
456- DBusGMethodInvocation *context)
457- {
458---- a/gnome-session/gsm-manager.h
459-+++ b/gnome-session/gsm-manager.h
460-@@ -159,7 +159,10 @@
461- guint flags,
462- gboolean *is_inhibited,
463- GError *error);
464--
465+ static gboolean
466+ gsm_manager_shutdown (GsmExportedManager *skeleton,
467+ GDBusMethodInvocation *invocation,
468+Index: gnome-session-3.15.3/gnome-session/gsm-manager.h
469+===================================================================
470+--- gnome-session-3.15.3.orig/gnome-session/gsm-manager.h
471++++ gnome-session-3.15.3/gnome-session/gsm-manager.h
472+@@ -122,6 +122,10 @@ void _gsm_manager_set_act
473+ gboolean gsm_manager_logout (GsmManager *manager,
474+ guint logout_mode,
475+ GError **error);
476 +gboolean gsm_manager_request_shutdown (GsmManager *manager,
477 + GError **error);
478 +gboolean gsm_manager_request_reboot (GsmManager *manager,
479-+ GError **error);
480- gboolean gsm_manager_shutdown (GsmManager *manager,
481- DBusGMethodInvocation *context);
482- gboolean gsm_manager_reboot (GsmManager *manager,
483---- a/gnome-session/org.gnome.SessionManager.xml
484-+++ b/gnome-session/org.gnome.SessionManager.xml
485-@@ -348,6 +348,23 @@
486++ GError **error);
487+
488+ gboolean gsm_manager_set_phase (GsmManager *manager,
489+ GsmManagerPhase phase);
490+Index: gnome-session-3.15.3/gnome-session/org.gnome.SessionManager.xml
491+===================================================================
492+--- gnome-session-3.15.3.orig/gnome-session/org.gnome.SessionManager.xml
493++++ gnome-session-3.15.3/gnome-session/org.gnome.SessionManager.xml
494+@@ -342,6 +342,23 @@
495 </doc:doc>
496 </method>
497
498
499=== removed file 'debian/patches/git_add_disable_acceleration_option.patch'
500--- debian/patches/git_add_disable_acceleration_option.patch 2015-03-20 06:41:37 +0000
501+++ debian/patches/git_add_disable_acceleration_option.patch 1970-01-01 00:00:00 +0000
502@@ -1,134 +0,0 @@
503-From d44fe3181c82f4739fc37b745f6f0ac7b6f36efa Mon Sep 17 00:00:00 2001
504-From: Mike DePaulo <mikedep333@gmail.com>
505-Date: Sun, 9 Nov 2014 10:53:49 -0500
506-Subject: [PATCH] Add new commandline option - disable-acceleration-check
507-
508-Some other lines were moved around so that debug logging will work
509-at the time of acceleration check.
510----
511- gnome-session/main.c | 78 ++++++++++++++++++++++++++++------------------------
512- 1 file changed, 42 insertions(+), 36 deletions(-)
513-
514-diff --git a/gnome-session/main.c b/gnome-session/main.c
515-index fce5e86..f591a4a 100644
516---- a/gnome-session/main.c
517-+++ b/gnome-session/main.c
518-@@ -55,6 +55,7 @@ static gboolean failsafe = FALSE;
519- static gboolean show_version = FALSE;
520- static gboolean debug = FALSE;
521- static gboolean please_fail = FALSE;
522-+static gboolean disable_acceleration_check = FALSE;
523-
524- static DBusGProxy *bus_proxy = NULL;
525-
526-@@ -307,6 +308,7 @@ main (int argc, char **argv)
527- { "version", 0, 0, G_OPTION_ARG_NONE, &show_version, N_("Version of this application"), NULL },
528- /* Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong */
529- { "whale", 0, 0, G_OPTION_ARG_NONE, &please_fail, N_("Show the fail whale dialog for testing"), NULL },
530-+ { "disable-acceleration-check", 0, 0, G_OPTION_ARG_NONE, &disable_acceleration_check, N_("Disable hardware acceleration check"), NULL },
531- { NULL, 0, 0, 0, NULL, NULL, NULL }
532- };
533-
534-@@ -315,25 +317,6 @@ main (int argc, char **argv)
535- gsm_util_init_error (TRUE, "%s", error->message);
536- }
537-
538-- /* Check GL, if it doesn't work out then force software fallback */
539-- if (!check_gl (&error)) {
540-- gl_failed = TRUE;
541--
542-- g_debug ("hardware acceleration check failed: %s",
543-- error? error->message : "");
544-- g_clear_error (&error);
545-- if (g_getenv ("LIBGL_ALWAYS_SOFTWARE") == NULL) {
546-- g_setenv ("LIBGL_ALWAYS_SOFTWARE", "1", TRUE);
547-- if (!check_gl (&error)) {
548-- g_warning ("software acceleration check failed: %s",
549-- error? error->message : "");
550-- g_clear_error (&error);
551-- } else {
552-- gl_failed = FALSE;
553-- }
554-- }
555-- }
556--
557- bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
558- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
559- textdomain (GETTEXT_PACKAGE);
560-@@ -349,11 +332,6 @@ main (int argc, char **argv)
561-
562- g_option_context_free (options);
563-
564-- if (show_version) {
565-- g_print ("%s %s\n", argv [0], VERSION);
566-- exit (0);
567-- }
568--
569- /* Rebind stdout/stderr to the journal explicitly, so that
570- * journald picks ups the nicer "gnome-session" as the program
571- * name instead of whatever shell script GDM happened to use.
572-@@ -370,21 +348,49 @@ main (int argc, char **argv)
573- }
574- #endif
575-
576-- if (gl_failed) {
577-- gsm_fail_whale_dialog_we_failed (FALSE, TRUE, NULL);
578-- gsm_main ();
579-- exit (1);
580-- }
581--
582-- if (please_fail) {
583-- gsm_fail_whale_dialog_we_failed (TRUE, TRUE, NULL);
584-- gsm_main ();
585-- exit (1);
586-- }
587--
588- gdm_log_init ();
589- gdm_log_set_debug (debug);
590-
591-+ if (disable_acceleration_check) {
592-+ g_debug ("hardware acceleration check is disabled");
593-+ } else {
594-+ /* Check GL, if it doesn't work out then force software fallback */
595-+ if (!check_gl (&error)) {
596-+ gl_failed = TRUE;
597-+
598-+ g_debug ("hardware acceleration check failed: %s",
599-+ error? error->message : "");
600-+ g_clear_error (&error);
601-+ if (g_getenv ("LIBGL_ALWAYS_SOFTWARE") == NULL) {
602-+ g_setenv ("LIBGL_ALWAYS_SOFTWARE", "1", TRUE);
603-+ if (!check_gl (&error)) {
604-+ g_warning ("software acceleration check failed: %s",
605-+ error? error->message : "");
606-+ g_clear_error (&error);
607-+ } else {
608-+ gl_failed = FALSE;
609-+ }
610-+ }
611-+ }
612-+ }
613-+
614-+ if (show_version) {
615-+ g_print ("%s %s\n", argv [0], VERSION);
616-+ exit (0);
617-+ }
618-+
619-+ if (gl_failed) {
620-+ gsm_fail_whale_dialog_we_failed (FALSE, TRUE, NULL);
621-+ gsm_main ();
622-+ exit (1);
623-+ }
624-+
625-+ if (please_fail) {
626-+ gsm_fail_whale_dialog_we_failed (TRUE, TRUE, NULL);
627-+ gsm_main ();
628-+ exit (1);
629-+ }
630-+
631- /* From 3.14 GDM sets XDG_CURRENT_DESKTOP. For compatibility with
632- * older versions of GDM, other display managers, and startx,
633- * set a fallback value if we don't find it set.
634---
635-1.9.1
636-
637
638=== modified file 'debian/patches/series'
639--- debian/patches/series 2015-05-18 12:40:04 +0000
640+++ debian/patches/series 2015-06-05 20:00:45 +0000
641@@ -6,5 +6,3 @@
642 53_add_sessionmigration.patch
643 95_dbus_request_shutdown.patch
644 103_kill_the_fail_whale.patch
645-git_add_disable_acceleration_option.patch
646-0001-configure.ac-Add-support-for-new-versions-of-systemd.patch

Subscribers

People subscribed via source and target branches

to all changes: