!3 metacity

Merge pull request !3 from shirely/master

metacity-ggo04.patch

@@ -1,72 +0,0 @@
-From 074af8f87ef89b13ff326fb5d04ee424bbfd4ced Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com>
-Date: Thu, 29 Nov 2018 15:17:58 +0200
-Subject: [PATCH] revert "unminimize windows with initial IconicState if first
- known on MapRequest"
-
-According to ICCCM client is allowed to go from Withdrawn to Iconic
-state. Also there are x11 apps that has -iconic command line option
-that was broken.
-
-Revert 6875256e63fbfd4500ddd27a7bf1aafc8d4c1ca3 commit to restore
-previous behaviour.
-
-https://gitlab.gnome.org/GNOME/metacity/issues/4
----
- src/core/display.c | 38 +++++++++++++-------------------------
- 1 file changed, 13 insertions(+), 25 deletions(-)
-
-diff --git a/src/core/display.c b/src/core/display.c
-index ed0aaf7f..273c97c5 100644
---- a/src/core/display.c
-+++ b/src/core/display.c
-@@ -2297,34 +2297,22 @@ event_callback (XEvent   *event,
-         {
-           window = meta_window_new (display, event->xmaprequest.window, FALSE,
-                                     META_EFFECT_TYPE_CREATE);
--
--          /* The window might have initial iconic state, but this is a
--           * MapRequest, fall through to ensure it is unminimized in
--           * that case.
--           */
-         }
--      else if (frame_was_receiver)
-+      /* if frame was receiver it's some malicious send event or something */
-+      else if (!frame_was_receiver && window)
-         {
--          g_warning ("Map requests on the frame window are unexpected");
--          break;
--        }
--
--      /* Double check that creating the MetaWindow succeeded */
--      if (window == NULL)
--        break;
--
--      meta_verbose ("MapRequest on %s mapped = %d minimized = %d\n",
--                    window->desc, window->mapped, window->minimized);
--
--      if (window->minimized)
--        {
--          meta_window_unminimize (window);
--          if (window->workspace != window->screen->active_workspace)
-+          meta_verbose ("MapRequest on %s mapped = %d minimized = %d\n",
-+                        window->desc, window->mapped, window->minimized);
-+          if (window->minimized)
-             {
--              meta_verbose ("Changing workspace due to MapRequest mapped = %d minimized = %d\n",
--                            window->mapped, window->minimized);
--              meta_window_change_workspace (window,
--                                            window->screen->active_workspace);
-+              meta_window_unminimize (window);
-+              if (window->workspace != window->screen->active_workspace)
-+                {
-+                  meta_verbose ("Changing workspace due to MapRequest mapped = %d minimized = %d\n",
-+                                window->mapped, window->minimized);
-+                  meta_window_change_workspace (window,
-+                                                window->screen->active_workspace);
-+                }
-             }
-         }
-       break;
--- 
-2.18.1

metacity.spec

@@ -1,19 +1,20 @@
 Name:           metacity
-Version:        3.30.1
-Release:        2
+Version:        3.36.1
+Release:        1
 Summary:        Window Manager for the MATE and GNOME Flashback desktops
 License:        GPLv2+
 URL:            https://download.gnome.org/sources/metacity/
-Source0:        https://download.gnome.org/sources/metacity/3.30/%{name}-%{version}.tar.xz
-# PATCH-FEATURE-UPSTREAM --revert unminimize windows with initial IconicState
-# https://gitlab.gnome.org/GNOME/metacity/issues/4 
-Patch1:         metacity-ggo04.patch
+Source0:        https://download.gnome.org/sources/metacity/3.36/%{name}-%{version}.tar.xz
 
 BuildRequires:  gtk3-devel glib2-devel gsettings-desktop-schemas-devel pango-devel libcanberra-devel
 BuildRequires:  startup-notification-devel libXcomposite-devel libXfixes-devel libXrender-devel
 BuildRequires:  libXrender-devel libXdamage-devel libXrender-devel libXcursor-devel libgtop2-devel
 BuildRequires:  libXinerama-devel libSM-devel libICE-devel libX11-devel desktop-file-utils itstool
 BuildRequires:  autoconf, automake, gettext-devel, libtool, gnome-common yelp-tools zenity
+BuildRequires:  vulkan-devel pkgconfig(gtk+-3.0) >= 3.22.0 pkgconfig(gio-2.0) >= 2.44.0
+BuildRequires:  pkgconfig(gsettings-desktop-schemas) pkgconfig(pango) pkgconfig(libcanberra-gtk3)
+BuildRequires:  pkgconfig(libstartup-notification-1.0) pkgconfig(xcomposite) pkgconfig(xfixes) pkgconfig(xrender)
+BuildRequires:  pkgconfig(xdamage) pkgconfig(xrender) pkgconfig(xcursor) pkgconfig(libgtop-2.0)
 
 Requires:       startup-notification gsettings-desktop-schemas zenity
 Provides:       firstboot(windowmanager) = metacity
@@ -76,6 +77,9 @@ make CPPFLAGS="$CPPFLAGS" LIBS="$LIBS" %{?_smp_mflags}
 %{_datadir}/metacity/icons/*
 
 %changelog
+* Thu Jul 30 2020 hanhui <hanhui15@huawei.com> - 3.37.1-1
+- update to 3.36.1
+
 * Sat Oct 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 3.30.1-2
 - Type:bugfix
 - Id:NA