r54347 - in /desktop/experimental/mutter/debian: ./ patches/
jbicha at users.alioth.debian.org
jbicha at users.alioth.debian.org
Fri Oct 13 13:43:51 UTC 2017
Author: jbicha
Date: Fri Oct 13 13:43:50 2017
New Revision: 54347
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54347
Log:
Cherry-pick more fixes from gnome-3-26 branch (LP: #1722811)
- 0001-wayland-dma-buf-Don-t-send-modifiers-to-old-clients.patch
- 0007-settings-Get-UI-scaling-factor-from-primary-logical-.patch
- 0008-backends-add-monitors-updated-internal-signal-to-onl.patch
- 0009-monitor-manager-use-g_return_val_if_fail-if-trying-t.patch
- 0010-backend-move-the-cursor-render-update-on-screen-chan.patch
- 0011-workspace-ensure-that-workarea-data-is-valid-when-fe.patch
Added:
desktop/experimental/mutter/debian/patches/0001-wayland-dma-buf-Don-t-send-modifiers-to-old-clients.patch
desktop/experimental/mutter/debian/patches/0007-settings-Get-UI-scaling-factor-from-primary-logical-.patch
desktop/experimental/mutter/debian/patches/0008-backends-add-monitors-updated-internal-signal-to-onl.patch
desktop/experimental/mutter/debian/patches/0009-monitor-manager-use-g_return_val_if_fail-if-trying-t.patch
desktop/experimental/mutter/debian/patches/0010-backend-move-the-cursor-render-update-on-screen-chan.patch
desktop/experimental/mutter/debian/patches/0011-workspace-ensure-that-workarea-data-is-valid-when-fe.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=54347&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/changelog [utf-8] (original)
+++ desktop/experimental/mutter/debian/changelog [utf-8] Fri Oct 13 13:43:50 2017
@@ -1,3 +1,15 @@
+mutter (3.26.1-3) UNRELEASED; urgency=medium
+
+ * Cherry-pick more fixes from gnome-3-26 branch (LP: #1722811):
+ - 0001-wayland-dma-buf-Don-t-send-modifiers-to-old-clients.patch
+ - 0007-settings-Get-UI-scaling-factor-from-primary-logical-.patch
+ - 0008-backends-add-monitors-updated-internal-signal-to-onl.patch
+ - 0009-monitor-manager-use-g_return_val_if_fail-if-trying-t.patch
+ - 0010-backend-move-the-cursor-render-update-on-screen-chan.patch
+ - 0011-workspace-ensure-that-workarea-data-is-valid-when-fe.patch
+
+ -- Jeremy Bicha <jeremy at Juffair> Fri, 13 Oct 2017 09:38:22 -0400
+
mutter (3.26.1-2) experimental; urgency=medium
* Add git_fix_xorg_maximize_crash.patch:
Added: desktop/experimental/mutter/debian/patches/0001-wayland-dma-buf-Don-t-send-modifiers-to-old-clients.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/0001-wayland-dma-buf-Don-t-send-modifiers-to-old-clients.patch?rev=54347&op=file
==============================================================================
--- desktop/experimental/mutter/debian/patches/0001-wayland-dma-buf-Don-t-send-modifiers-to-old-clients.patch (added)
+++ desktop/experimental/mutter/debian/patches/0001-wayland-dma-buf-Don-t-send-modifiers-to-old-clients.patch [utf-8] Fri Oct 13 13:43:50 2017
@@ -0,0 +1,45 @@
+From edfd15b32daca9fef707a25bf312441349506b05 Mon Sep 17 00:00:00 2001
+From: Daniel Stone <daniels at collabora.com>
+Date: Mon, 2 Oct 2017 16:46:17 +0100
+Subject: [PATCH 01/11] wayland-dma-buf: Don't send modifiers to old clients
+
+The modifier event was only added in v3 of the client; sending it to
+older clients (e.g. GStreamer waylandsink) causes them to disconnect
+immediately.
+
+Send the older 'format' event to all clients, and only send the newer
+'modifier' event to resource versions 3 or above.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=788558
+---
+ src/wayland/meta-wayland-dma-buf.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/wayland/meta-wayland-dma-buf.c b/src/wayland/meta-wayland-dma-buf.c
+index e5d2f7c35..76b8aa219 100644
+--- a/src/wayland/meta-wayland-dma-buf.c
++++ b/src/wayland/meta-wayland-dma-buf.c
+@@ -473,12 +473,19 @@ send_modifiers (struct wl_resource *resource,
+ gboolean ret;
+ int i;
+
++ zwp_linux_dmabuf_v1_send_format (resource, format);
++
++ /* The modifier event was only added in v3; v1 and v2 only have the format
++ * event. */
++ if (wl_resource_get_version (resource) < ZWP_LINUX_DMABUF_V1_MODIFIER_SINCE_VERSION)
++ return;
++
+ /* First query the number of available modifiers, then allocate an array,
+ * then fill the array. */
+ ret = meta_egl_query_dma_buf_modifiers (egl, egl_display, format, 0, NULL,
+ NULL, &num_modifiers, NULL);
+ if (!ret || num_modifiers == 0)
+- return;
++ return;
+
+ modifiers = g_new0 (uint64_t, num_modifiers);
+ ret = meta_egl_query_dma_buf_modifiers (egl, egl_display, format,
+--
+2.14.1
+
Added: desktop/experimental/mutter/debian/patches/0007-settings-Get-UI-scaling-factor-from-primary-logical-.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/0007-settings-Get-UI-scaling-factor-from-primary-logical-.patch?rev=54347&op=file
==============================================================================
--- desktop/experimental/mutter/debian/patches/0007-settings-Get-UI-scaling-factor-from-primary-logical-.patch (added)
+++ desktop/experimental/mutter/debian/patches/0007-settings-Get-UI-scaling-factor-from-primary-logical-.patch [utf-8] Fri Oct 13 13:43:50 2017
@@ -0,0 +1,52 @@
+From 65d3e479875348978d0137e9913f19fa8b0174d9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl at gmail.com>
+Date: Wed, 11 Oct 2017 17:55:50 +0800
+Subject: [PATCH 07/11] settings: Get UI scaling factor from primary logical
+ monitor
+
+Don't use MAX(logical monitor scales) to determine the UI scaling
+factor, just use the primary logical monitor. That's where the shell UI
+will most likely be.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=788820
+---
+ src/backends/meta-settings.c | 21 ++++++---------------
+ 1 file changed, 6 insertions(+), 15 deletions(-)
+
+diff --git a/src/backends/meta-settings.c b/src/backends/meta-settings.c
+index cf66334f1..73741fd5a 100644
+--- a/src/backends/meta-settings.c
++++ b/src/backends/meta-settings.c
+@@ -67,23 +67,14 @@ calculate_ui_scaling_factor (MetaSettings *settings)
+ {
+ MetaMonitorManager *monitor_manager =
+ meta_backend_get_monitor_manager (settings->backend);
+- GList *logical_monitors;
+- GList *l;
+- float max_scale = 1.0;
++ MetaLogicalMonitor *primary_logical_monitor;
+
+- logical_monitors =
+- meta_monitor_manager_get_logical_monitors (monitor_manager);
+- for (l = logical_monitors; l; l = l->next)
+- {
+- MetaLogicalMonitor *logical_monitor = l->data;
+-
+- max_scale = MAX (meta_logical_monitor_get_scale (logical_monitor),
+- max_scale);
+- }
+-
+- g_warn_if_fail (fmodf (max_scale, 1.0) == 0.0);
++ primary_logical_monitor =
++ meta_monitor_manager_get_primary_logical_monitor (monitor_manager);
++ if (!primary_logical_monitor)
++ return 1;
+
+- return (int) max_scale;
++ return (int) meta_logical_monitor_get_scale (primary_logical_monitor);
+ }
+
+ static gboolean
+--
+2.14.1
+
Added: desktop/experimental/mutter/debian/patches/0008-backends-add-monitors-updated-internal-signal-to-onl.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/0008-backends-add-monitors-updated-internal-signal-to-onl.patch?rev=54347&op=file
==============================================================================
--- desktop/experimental/mutter/debian/patches/0008-backends-add-monitors-updated-internal-signal-to-onl.patch (added)
+++ desktop/experimental/mutter/debian/patches/0008-backends-add-monitors-updated-internal-signal-to-onl.patch [utf-8] Fri Oct 13 13:43:50 2017
@@ -0,0 +1,220 @@
+From 0a3549da0658e46811aab5051d58526b3a578443 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail at 3v1n0.net>
+Date: Thu, 12 Oct 2017 19:14:40 -0500
+Subject: [PATCH 08/11] backends: add 'monitors-updated-internal' signal to
+ only update internal state
+
+Adding an internal signal and use it to update the internal state before
+emitting "monitors-changed" which will be repeated by the screen to the world.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=788860
+---
+ src/backends/meta-backend.c | 2 --
+ src/backends/meta-input-settings.c | 2 +-
+ src/backends/meta-monitor-manager.c | 11 +++++++++++
+ src/backends/meta-screen-cast-monitor-stream.c | 2 +-
+ src/backends/meta-settings.c | 14 ++++++++++++++
+ src/backends/native/meta-cursor-renderer-native.c | 2 +-
+ src/backends/x11/meta-backend-x11.c | 2 +-
+ src/core/screen.c | 18 ++++++++++++++----
+ src/wayland/meta-wayland-outputs.c | 2 +-
+ 9 files changed, 44 insertions(+), 11 deletions(-)
+
+diff --git a/src/backends/meta-backend.c b/src/backends/meta-backend.c
+index faa8d6fdc..89d47eb80 100644
+--- a/src/backends/meta-backend.c
++++ b/src/backends/meta-backend.c
+@@ -196,8 +196,6 @@ meta_backend_monitors_changed (MetaBackend *backend)
+ priv->is_pointer_position_initialized = TRUE;
+ }
+ }
+-
+- meta_settings_update_ui_scaling_factor (priv->settings);
+ }
+
+ void
+diff --git a/src/backends/meta-input-settings.c b/src/backends/meta-input-settings.c
+index d6c7b57b6..065875552 100644
+--- a/src/backends/meta-input-settings.c
++++ b/src/backends/meta-input-settings.c
+@@ -1617,7 +1617,7 @@ meta_input_settings_init (MetaInputSettings *settings)
+ g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) device_mapping_info_free);
+
+ priv->monitor_manager = g_object_ref (meta_monitor_manager_get ());
+- g_signal_connect (priv->monitor_manager, "monitors-changed",
++ g_signal_connect (priv->monitor_manager, "monitors-changed-internal",
+ G_CALLBACK (monitors_changed_cb), settings);
+
+ #ifdef HAVE_LIBWACOM
+diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
+index 2caec1b57..fd2aca969 100644
+--- a/src/backends/meta-monitor-manager.c
++++ b/src/backends/meta-monitor-manager.c
+@@ -46,6 +46,7 @@
+ #define DEFAULT_DISPLAY_CONFIGURATION_TIMEOUT 20
+
+ enum {
++ MONITORS_CHANGED_INTERNAL,
+ CONFIRM_DISPLAY_CHANGE,
+ SIGNALS_LAST
+ };
+@@ -851,6 +852,14 @@ meta_monitor_manager_class_init (MetaMonitorManagerClass *klass)
+ klass->read_edid = meta_monitor_manager_real_read_edid;
+ klass->is_lid_closed = meta_monitor_manager_real_is_lid_closed;
+
++ signals[MONITORS_CHANGED_INTERNAL] =
++ g_signal_new ("monitors-changed-internal",
++ G_TYPE_FROM_CLASS (object_class),
++ G_SIGNAL_RUN_LAST,
++ 0,
++ NULL, NULL, NULL,
++ G_TYPE_NONE, 0);
++
+ signals[CONFIRM_DISPLAY_CHANGE] =
+ g_signal_new ("confirm-display-change",
+ G_TYPE_FROM_CLASS (object_class),
+@@ -2574,6 +2583,8 @@ meta_monitor_manager_notify_monitors_changed (MetaMonitorManager *manager)
+ manager->current_switch_config = META_MONITOR_SWITCH_CONFIG_UNKNOWN;
+
+ meta_backend_monitors_changed (backend);
++
++ g_signal_emit (manager, signals[MONITORS_CHANGED_INTERNAL], 0);
+ g_signal_emit_by_name (manager, "monitors-changed");
+ }
+
+diff --git a/src/backends/meta-screen-cast-monitor-stream.c b/src/backends/meta-screen-cast-monitor-stream.c
+index ece7efcdd..853090a43 100644
+--- a/src/backends/meta-screen-cast-monitor-stream.c
++++ b/src/backends/meta-screen-cast-monitor-stream.c
+@@ -130,7 +130,7 @@ meta_screen_cast_monitor_stream_new (GDBusConnection *connection,
+
+ monitor_stream->stage = stage;
+
+- g_signal_connect_object (monitor_manager, "monitors-changed",
++ g_signal_connect_object (monitor_manager, "monitors-changed-internal",
+ G_CALLBACK (on_monitors_changed),
+ monitor_stream, 0);
+
+diff --git a/src/backends/meta-settings.c b/src/backends/meta-settings.c
+index 73741fd5a..cb22bf33c 100644
+--- a/src/backends/meta-settings.c
++++ b/src/backends/meta-settings.c
+@@ -343,11 +343,25 @@ meta_settings_init (MetaSettings *settings)
+ update_experimental_features (settings);
+ }
+
++static void
++on_monitors_changed (MetaMonitorManager *monitor_manager,
++ MetaSettings *settings)
++{
++ meta_settings_update_ui_scaling_factor (settings);
++}
++
+ void
+ meta_settings_post_init (MetaSettings *settings)
+ {
++ MetaMonitorManager *monitor_manager =
++ meta_backend_get_monitor_manager (settings->backend);
++
+ update_ui_scaling_factor (settings);
+ update_font_dpi (settings);
++
++ g_signal_connect_object (monitor_manager, "monitors-changed-internal",
++ G_CALLBACK (on_monitors_changed),
++ settings, G_CONNECT_AFTER);
+ }
+
+ static void
+diff --git a/src/backends/native/meta-cursor-renderer-native.c b/src/backends/native/meta-cursor-renderer-native.c
+index 72276ebe2..9b2c03aaa 100644
+--- a/src/backends/native/meta-cursor-renderer-native.c
++++ b/src/backends/native/meta-cursor-renderer-native.c
+@@ -850,7 +850,7 @@ meta_cursor_renderer_native_init (MetaCursorRendererNative *native)
+ MetaMonitorManager *monitors;
+
+ monitors = meta_monitor_manager_get ();
+- g_signal_connect_object (monitors, "monitors-changed",
++ g_signal_connect_object (monitors, "monitors-changed-internal",
+ G_CALLBACK (on_monitors_changed), native, 0);
+
+ priv->hw_state_invalidated = TRUE;
+diff --git a/src/backends/x11/meta-backend-x11.c b/src/backends/x11/meta-backend-x11.c
+index 2c49690d7..233532435 100644
+--- a/src/backends/x11/meta-backend-x11.c
++++ b/src/backends/x11/meta-backend-x11.c
+@@ -454,7 +454,7 @@ meta_backend_x11_post_init (MetaBackend *backend)
+ META_BACKEND_CLASS (meta_backend_x11_parent_class)->post_init (backend);
+
+ monitor_manager = meta_backend_get_monitor_manager (backend);
+- g_signal_connect (monitor_manager, "monitors-changed",
++ g_signal_connect (monitor_manager, "monitors-changed-internal",
+ G_CALLBACK (on_monitors_changed), backend);
+ }
+
+diff --git a/src/core/screen.c b/src/core/screen.c
+index 890002340..be4394349 100644
+--- a/src/core/screen.c
++++ b/src/core/screen.c
+@@ -73,8 +73,10 @@ static void prefs_changed_callback (MetaPreference pref,
+ static void set_desktop_geometry_hint (MetaScreen *screen);
+ static void set_desktop_viewport_hint (MetaScreen *screen);
+
+-static void on_monitors_changed (MetaMonitorManager *manager,
+- MetaScreen *screen);
++static void on_monitors_changed_internal (MetaMonitorManager *manager,
++ MetaScreen *screen);
++static void on_monitors_changed (MetaMonitorManager *manager,
++ MetaScreen *screen);
+
+ enum
+ {
+@@ -710,6 +712,8 @@ meta_screen_new (MetaDisplay *display,
+ screen->rect.x = screen->rect.y = 0;
+
+ manager = meta_monitor_manager_get ();
++ g_signal_connect (manager, "monitors-changed-internal",
++ G_CALLBACK (on_monitors_changed_internal), screen);
+ g_signal_connect (manager, "monitors-changed",
+ G_CALLBACK (on_monitors_changed), screen);
+
+@@ -2266,8 +2270,8 @@ meta_screen_resize_func (MetaWindow *window,
+ }
+
+ static void
+-on_monitors_changed (MetaMonitorManager *manager,
+- MetaScreen *screen)
++on_monitors_changed_internal (MetaMonitorManager *manager,
++ MetaScreen *screen)
+ {
+ MetaBackend *backend;
+ MetaCursorRenderer *cursor_renderer;
+@@ -2306,7 +2310,13 @@ on_monitors_changed (MetaMonitorManager *manager,
+ backend = meta_get_backend ();
+ cursor_renderer = meta_backend_get_cursor_renderer (backend);
+ meta_cursor_renderer_force_update (cursor_renderer);
++}
+
++static void
++on_monitors_changed (MetaMonitorManager *manager,
++ MetaScreen *screen)
++{
++ /* Inform the external world about what has happened */
+ g_signal_emit (screen, screen_signals[MONITORS_CHANGED], 0);
+ }
+
+diff --git a/src/wayland/meta-wayland-outputs.c b/src/wayland/meta-wayland-outputs.c
+index db8d240f2..51f62f98f 100644
+--- a/src/wayland/meta-wayland-outputs.c
++++ b/src/wayland/meta-wayland-outputs.c
+@@ -422,7 +422,7 @@ meta_wayland_outputs_init (MetaWaylandCompositor *compositor)
+ MetaMonitorManager *monitors;
+
+ monitors = meta_monitor_manager_get ();
+- g_signal_connect (monitors, "monitors-changed",
++ g_signal_connect (monitors, "monitors-changed-internal",
+ G_CALLBACK (on_monitors_changed), compositor);
+
+ compositor->outputs = g_hash_table_new_full (NULL, NULL, NULL, wayland_output_destroy_notify);
+--
+2.14.1
+
Added: desktop/experimental/mutter/debian/patches/0009-monitor-manager-use-g_return_val_if_fail-if-trying-t.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/0009-monitor-manager-use-g_return_val_if_fail-if-trying-t.patch?rev=54347&op=file
==============================================================================
--- desktop/experimental/mutter/debian/patches/0009-monitor-manager-use-g_return_val_if_fail-if-trying-t.patch (added)
+++ desktop/experimental/mutter/debian/patches/0009-monitor-manager-use-g_return_val_if_fail-if-trying-t.patch [utf-8] Fri Oct 13 13:43:50 2017
@@ -0,0 +1,27 @@
+From bef9829229295ab72c623f748e225edfd66d5272 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail at 3v1n0.net>
+Date: Fri, 13 Oct 2017 00:10:22 -0500
+Subject: [PATCH 09/11] monitor-manager: use g_return_val_if_fail if trying to
+ fetch an invalid monitor
+
+https://bugzilla.gnome.org/show_bug.cgi?id=788860
+---
+ src/backends/meta-monitor-manager.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
+index fd2aca969..343bb060a 100644
+--- a/src/backends/meta-monitor-manager.c
++++ b/src/backends/meta-monitor-manager.c
+@@ -2273,7 +2273,7 @@ MetaLogicalMonitor *
+ meta_monitor_manager_get_logical_monitor_from_number (MetaMonitorManager *manager,
+ int number)
+ {
+- g_assert ((unsigned int) number < g_list_length (manager->logical_monitors));
++ g_return_val_if_fail ((unsigned int) number < g_list_length (manager->logical_monitors), NULL);
+
+ return g_list_nth (manager->logical_monitors, number)->data;
+ }
+--
+2.14.1
+
Added: desktop/experimental/mutter/debian/patches/0010-backend-move-the-cursor-render-update-on-screen-chan.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/0010-backend-move-the-cursor-render-update-on-screen-chan.patch?rev=54347&op=file
==============================================================================
--- desktop/experimental/mutter/debian/patches/0010-backend-move-the-cursor-render-update-on-screen-chan.patch (added)
+++ desktop/experimental/mutter/debian/patches/0010-backend-move-the-cursor-render-update-on-screen-chan.patch [utf-8] Fri Oct 13 13:43:50 2017
@@ -0,0 +1,53 @@
+From c6c777a604a077359e8c1659ed3468e1f53692d5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail at 3v1n0.net>
+Date: Fri, 13 Oct 2017 00:12:50 -0500
+Subject: [PATCH 10/11] backend: move the cursor render update on screen
+ changes here
+
+https://bugzilla.gnome.org/show_bug.cgi?id=788860
+---
+ src/backends/meta-backend.c | 2 ++
+ src/core/screen.c | 7 -------
+ 2 files changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/src/backends/meta-backend.c b/src/backends/meta-backend.c
+index 89d47eb80..c856823e2 100644
+--- a/src/backends/meta-backend.c
++++ b/src/backends/meta-backend.c
+@@ -196,6 +196,8 @@ meta_backend_monitors_changed (MetaBackend *backend)
+ priv->is_pointer_position_initialized = TRUE;
+ }
+ }
++
++ meta_cursor_renderer_force_update (priv->cursor_renderer);
+ }
+
+ void
+diff --git a/src/core/screen.c b/src/core/screen.c
+index be4394349..c14bba0cf 100644
+--- a/src/core/screen.c
++++ b/src/core/screen.c
+@@ -2273,9 +2273,6 @@ static void
+ on_monitors_changed_internal (MetaMonitorManager *manager,
+ MetaScreen *screen)
+ {
+- MetaBackend *backend;
+- MetaCursorRenderer *cursor_renderer;
+-
+ meta_monitor_manager_get_screen_size (manager,
+ &screen->rect.width,
+ &screen->rect.height);
+@@ -2306,10 +2303,6 @@ on_monitors_changed_internal (MetaMonitorManager *manager,
+ meta_screen_foreach_window (screen, META_LIST_DEFAULT, meta_screen_resize_func, 0);
+
+ meta_screen_queue_check_fullscreen (screen);
+-
+- backend = meta_get_backend ();
+- cursor_renderer = meta_backend_get_cursor_renderer (backend);
+- meta_cursor_renderer_force_update (cursor_renderer);
+ }
+
+ static void
+--
+2.14.1
+
Added: desktop/experimental/mutter/debian/patches/0011-workspace-ensure-that-workarea-data-is-valid-when-fe.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/0011-workspace-ensure-that-workarea-data-is-valid-when-fe.patch?rev=54347&op=file
==============================================================================
--- desktop/experimental/mutter/debian/patches/0011-workspace-ensure-that-workarea-data-is-valid-when-fe.patch (added)
+++ desktop/experimental/mutter/debian/patches/0011-workspace-ensure-that-workarea-data-is-valid-when-fe.patch [utf-8] Fri Oct 13 13:43:50 2017
@@ -0,0 +1,37 @@
+From d6e3193c2a22024e213025523d2abba36f4b7bb3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail at 3v1n0.net>
+Date: Thu, 12 Oct 2017 20:07:12 -0500
+Subject: [PATCH 11/11] workspace: ensure that workarea data is valid when
+ fetching by monitor num
+
+https://bugzilla.gnome.org/show_bug.cgi?id=788860
+---
+ src/core/workspace.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/workspace.c b/src/core/workspace.c
+index f6d3c9619..901de4541 100644
+--- a/src/core/workspace.c
++++ b/src/core/workspace.c
+@@ -1099,13 +1099,16 @@ meta_workspace_get_work_area_for_monitor (MetaWorkspace *workspace,
+ MetaLogicalMonitor *logical_monitor;
+ MetaWorkspaceLogicalMonitorData *data;
+
+- ensure_work_areas_validated (workspace);
+-
+ logical_monitor =
+ meta_monitor_manager_get_logical_monitor_from_number (monitor_manager,
+ which_monitor);
++ g_return_if_fail (logical_monitor != NULL);
++
++ ensure_work_areas_validated (workspace);
+ data = meta_workspace_get_logical_monitor_data (workspace, logical_monitor);
+
++ g_return_if_fail (data != NULL);
++
+ *area = data->logical_monitor_work_area;
+ }
+
+--
+2.14.1
+
Modified: desktop/experimental/mutter/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/series?rev=54347&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/patches/series [utf-8] (original)
+++ desktop/experimental/mutter/debian/patches/series [utf-8] Fri Oct 13 13:43:50 2017
@@ -2,3 +2,9 @@
skip-failing-tests.patch
skip-failing-tests-325.patch
git_fix_xorg_maximize_crash.patch
+0001-wayland-dma-buf-Don-t-send-modifiers-to-old-clients.patch
+0007-settings-Get-UI-scaling-factor-from-primary-logical-.patch
+0008-backends-add-monitors-updated-internal-signal-to-onl.patch
+0009-monitor-manager-use-g_return_val_if_fail-if-trying-t.patch
+0010-backend-move-the-cursor-render-update-on-screen-chan.patch
+0011-workspace-ensure-that-workarea-data-is-valid-when-fe.patch
More information about the pkg-gnome-commits
mailing list