[arch-commits] Commit in muffin/trunk (PKGBUILD context_menu_position_fix.patch)

[Alexandre Filgueira]

    Date: Monday, April 25, 2016 @ 01:41:15
  Author: faidoc
Revision: 171740

upgpkg: muffin 3.0.0-1

Modified:
  muffin/trunk/PKGBUILD
Deleted:
  muffin/trunk/context_menu_position_fix.patch

---------------------------------+
 PKGBUILD                        |   13 +++-------
 context_menu_position_fix.patch |   48 --------------------------------------
 2 files changed, 4 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-24 23:37:02 UTC (rev 171739)
+++ PKGBUILD	2016-04-24 23:41:15 UTC (rev 171740)
@@ -4,8 +4,8 @@
 # Contributor: Ner0
 
 pkgname=muffin
-pkgver=2.8.5
-pkgrel=2
+pkgver=3.0.0
+pkgrel=1
 pkgdesc="Cinnamon window manager based on Mutter"
 arch=('i686' 'x86_64')
 url="https://github.com/linuxmint/muffin"
@@ -15,17 +15,12 @@
 makedepends=('intltool' 'gnome-doc-utils' 'gnome-common' 'gobject-introspection' 'gtk-doc') 
 options=('!emptydirs')
 install=$pkgname.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz"
-		"context_menu_position_fix.patch")
-sha256sums=('0ae19de74111f222b44f7bf8d159437a83c6ae2e7ce70b327c0296365d69aba4'
-            '228aa59317b7495abe8099e6b3ce01e037f3f045274ec4de93aad79fe4d3d6a0')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz")
+sha256sums=('ddd514d9447576ec1dd9fd9a9ea7166109af44a08b8e5a962b49b4ec7d080b60')
 
 prepare() {
   cd ${pkgname}-${pkgver}
 
-  # window.c: don't send configure notifies for OR windows (https://github.com/linuxmint/Cinnamon/issues/5202)
-  patch -Np1 -i ../context_menu_position_fix.patch
-
 }
 
 build() {

Deleted: context_menu_position_fix.patch
===================================================================
--- context_menu_position_fix.patch	2016-04-24 23:37:02 UTC (rev 171739)
+++ context_menu_position_fix.patch	2016-04-24 23:41:15 UTC (rev 171740)
@@ -1,48 +0,0 @@
-From 65fd5fe41436ccfa74ea37b886f96adee6f258c1 Mon Sep 17 00:00:00 2001
-From: itzexor <itzexor at gmail.com>
-Date: Mon, 18 Apr 2016 20:46:59 -0700
-Subject: [PATCH] window.c: don't send configure notifies for OR windows this
- causes popup placement issues with gtk 3.20 as described in the mutter commit
- this is based on. the assertion is left out, as we still need to send
- configure notifies for OR windows in other cases.
-
-based on:
-https://github.com/GNOME/mutter/commit/e3622275147181a2876e45397f5fc7ed063b8bb8
----
- src/core/window.c | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/src/core/window.c b/src/core/window.c
-index 90b0e3b..8d96cb2 100644
---- a/src/core/window.c
-+++ b/src/core/window.c
-@@ -1817,12 +1817,6 @@ meta_window_unmanage (MetaWindow  *window,
-       window->tile_type != META_WINDOW_TILE_TYPE_NONE)
-     unmaximize_window_before_freeing (window);
- 
--  /* The XReparentWindow call in meta_window_destroy_frame() moves the
--   * window so we need to send a configure notify; see bug 399552.  (We
--   * also do this just in case a window got unmaximized.)
--   */
--  send_configure_notify (window);
--
-   meta_window_unqueue (window, META_QUEUE_CALC_SHOWING |
-                                META_QUEUE_MOVE_RESIZE |
-                                META_QUEUE_UPDATE_ICON);
-@@ -1859,7 +1853,15 @@ meta_window_unmanage (MetaWindow  *window,
-   meta_window_destroy_sync_request_alarm (window);
- 
-   if (window->frame)
--    meta_window_destroy_frame (window);
-+    {
-+      /* The XReparentWindow call in meta_window_destroy_frame() moves the
-+       * window so we need to send a configure notify; see bug 399552.  (We
-+       * also do this just in case a window got unmaximized.)
-+       */
-+      send_configure_notify (window);
-+
-+      meta_window_destroy_frame (window);
-+    }
- 
-   /* If an undecorated window is being withdrawn, that will change the
-    * stack as presented to the compositing manager, without actually