From ce6f3f8e1a3e1cd9a258b6d14d16c0030c3e8f99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Sat, 7 Mar 2020 23:21:50 +0100
Subject: [PATCH] Update to 3.36.0

---
 .gitignore  |  1 +
 1110.patch  | 54 -----------------------------------------------------
 mutter.spec | 11 +++++------
 sources     |  2 +-
 4 files changed, 7 insertions(+), 61 deletions(-)
 delete mode 100644 1110.patch

diff --git a/.gitignore b/.gitignore
index 333f80f..16b7bd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -167,3 +167,4 @@ mutter-2.31.5.tar.bz2
 /mutter-3.35.90.tar.xz
 /mutter-3.35.91.tar.xz
 /mutter-3.35.92.tar.xz
+/mutter-3.36.0.tar.xz
diff --git a/1110.patch b/1110.patch
deleted file mode 100644
index 9a1104d..0000000
--- a/1110.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 6cd0aa429f0e042477ca89a5a9c0176f36ad117b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
-Date: Fri, 6 Mar 2020 17:24:35 +0100
-Subject: [PATCH] window: Force placement for first placement rule
-
-If we don't force the placement, we enter the constrain machinery with
-the position (0, 0), meaning we always get the "current work area" setup
-to correspond to whatever logical monitor was at that position.
-
-Avoid this by doing the same as "meta_window_force_placement()" and set
-"window->calc_placement" to TRUE while move-resizing, causing the
-move-resize to first calculate the initial position.
-
-Fixes: https://gitlab.gnome.org/GNOME/mutter/issues/1098
-
-https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1110
----
- src/wayland/meta-window-wayland.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/wayland/meta-window-wayland.c b/src/wayland/meta-window-wayland.c
-index 9864d2fd4..86cdbf86e 100644
---- a/src/wayland/meta-window-wayland.c
-+++ b/src/wayland/meta-window-wayland.c
-@@ -1001,6 +1001,10 @@ void
- meta_window_place_with_placement_rule (MetaWindow        *window,
-                                        MetaPlacementRule *placement_rule)
- {
-+  gboolean first_placement;
-+
-+  first_placement = !window->placement.rule;
-+
-   g_clear_pointer (&window->placement.rule, g_free);
-   window->placement.rule = g_new0 (MetaPlacementRule, 1);
-   *window->placement.rule = *placement_rule;
-@@ -1009,12 +1013,15 @@ meta_window_place_with_placement_rule (MetaWindow        *window,
-   window->unconstrained_rect.y = window->rect.y;
-   window->unconstrained_rect.width = placement_rule->width;
-   window->unconstrained_rect.height = placement_rule->height;
-+
-+  window->calc_placement = first_placement;
-   meta_window_move_resize_internal (window,
-                                     (META_MOVE_RESIZE_MOVE_ACTION |
-                                      META_MOVE_RESIZE_RESIZE_ACTION |
-                                      META_MOVE_RESIZE_PLACEMENT_CHANGED),
-                                     META_GRAVITY_NORTH_WEST,
-                                     window->unconstrained_rect);
-+  window->calc_placement = FALSE;
- }
- 
- void
--- 
-2.24.1
-
diff --git a/mutter.spec b/mutter.spec
index 6b31b55..4765181 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -7,8 +7,8 @@
 %global mutter_api_version 6
 
 Name:          mutter
-Version:       3.35.92
-Release:       3%{?dist}
+Version:       3.36.0
+Release:       1%{?dist}
 Summary:       Window and compositing manager based on Clutter
 
 License:       GPLv2+
@@ -18,10 +18,6 @@ Source0:       http://download.gnome.org/sources/%{name}/3.35/%{name}-%{version}
 
 # Work-around for OpenJDK's compliance test
 Patch0:        0001-window-actor-Special-case-shaped-Java-windows.patch
-# Fix pop-up menus on secondary heads:
-# https://gitlab.gnome.org/GNOME/mutter/issues/1098
-# https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1110
-Patch1:        1110.patch
 
 BuildRequires: chrpath
 BuildRequires: pango-devel
@@ -167,6 +163,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 %{_datadir}/mutter-%{mutter_api_version}/tests
 
 %changelog
+* Sat Mar 07 2020 Florian Müllner <fmuellner@redhat.com> - 3.36.0-1
+- Update to 3.36.0
+
 * Fri Mar 06 2020 Adam Williamson <awilliam@redhat.com> - 3.35.92-3
 - Backport fix for pop-up menus on secondary heads (Gitlab #1098)
 
diff --git a/sources b/sources
index 3d11eb0..d6cd9f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mutter-3.35.92.tar.xz) = e7c8c493732d4663156bcbdeea1e4b349724a40954df40e72b5ac759a9e006163a5a2c7f8e6c087f076ee71bbf2000a80128a4c6dbb7cd109163984dbe4f25dc
+SHA512 (mutter-3.36.0.tar.xz) = 4b68f1ff36d954ef757384b0c6ec9ff299002ab50be58a35d952c5cf77433d1bac171447c0c48faf58e9acb0671ecea5598c098391731dcc5283bb8475a77e52