[arch-commits] Commit in metacity/trunk (PKGBUILD metacity-ggo04.patch)
Balló György
bgyorgy at archlinux.org
Thu Mar 28 22:50:34 UTC 2019
Date: Thursday, March 28, 2019 @ 22:50:33
Author: bgyorgy
Revision: 445646
upgpkg: metacity 3.30.1-2
Add upstream fix for Sugar regression
Added:
metacity/trunk/metacity-ggo04.patch
Modified:
metacity/trunk/PKGBUILD
----------------------+
PKGBUILD | 16 ++++++++--
metacity-ggo04.patch | 72 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 85 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-03-28 21:48:59 UTC (rev 445645)
+++ PKGBUILD 2019-03-28 22:50:33 UTC (rev 445646)
@@ -3,7 +3,7 @@
pkgname=metacity
pkgver=3.30.1
-pkgrel=1
+pkgrel=2
pkgdesc="Window manager of GNOME Flashback"
arch=('x86_64')
license=('GPL')
@@ -10,9 +10,19 @@
depends=('dconf' 'libcanberra' 'libgtop' 'libsm' 'gsettings-desktop-schemas' 'gtk3' 'startup-notification' 'zenity')
makedepends=('intltool')
url="https://wiki.gnome.org/Projects/Metacity"
-source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0f1311b7aa38de71c66080bd2b744de2cd9580afcaee9c6097a7d3f5c421798a')
+source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+ metacity-ggo04.patch)
+sha256sums=('0f1311b7aa38de71c66080bd2b744de2cd9580afcaee9c6097a7d3f5c421798a'
+ '611b9d91cad84626495390a6a7d7c5a4eed00c49f90debad0aec14d86b0fbb50')
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Add upstream fix for Sugar regression
+ # https://gitlab.gnome.org/GNOME/metacity/issues/4
+ patch -Np1 -i ../metacity-ggo04.patch
+}
+
build() {
cd $pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
Added: metacity-ggo04.patch
===================================================================
--- metacity-ggo04.patch (rev 0)
+++ metacity-ggo04.patch 2019-03-28 22:50:33 UTC (rev 445646)
@@ -0,0 +1,72 @@
+From 074af8f87ef89b13ff326fb5d04ee424bbfd4ced Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels at 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
More information about the arch-commits
mailing list