marco: add two upstream bug fixes

These haven't made it to a branch yet, but have been carried elsewhere,
e.g., Fedora applied them two months ago.

4 files changed, 53 insertions, 3 deletions

diff --git a/wm/marco/Makefile b/wm/marco/Makefile
index d3d125a3c87..45462318c73 100644
--- a/wm/marco/Makefile
+++ b/wm/marco/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2020/08/24 04:41:41 gutteridge Exp $
+# $NetBSD: Makefile,v 1.27 2020/11/21 03:48:07 gutteridge Exp $
 
-PKGREVISION= 2
+PKGREVISION= 3
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=	marco-${VERSION:R}.1
diff --git a/wm/marco/distinfo b/wm/marco/distinfo
index 3d0121b2fd6..1676f084f05 100644
--- a/wm/marco/distinfo
+++ b/wm/marco/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2020/08/16 03:54:46 gutteridge Exp $
+$NetBSD: distinfo,v 1.14 2020/11/21 03:48:07 gutteridge Exp $
 
 SHA1 (marco-1.24.1.tar.xz) = a5109201f9113f0d8802ece48d801e7a35fc5341
 RMD160 (marco-1.24.1.tar.xz) = ecf0cb023fdfee703ea0ff8d451293aa2edb8a5d
@@ -9,3 +9,5 @@ SHA1 (patch-src_core_delete.c) = ace180e80d63bbf0a35abc18bf6501061e09d158
 SHA1 (patch-src_core_keybindings.c) = 98235897926d017994e1fa01c754419d14432b08
 SHA1 (patch-src_core_main.c) = 2ca845168633a2856a86453407b3a165f66e8863
 SHA1 (patch-src_core_window-props.c) = 23d7c68e3e2c89004c610046378bd855d1d6358a
+SHA1 (patch-src_core_window.c) = 7bb190da380deebbde8b634898a79a4fa7b0da00
+SHA1 (patch-src_ui_frames.c) = 2fb610e63da0394923d66100e1515f4cb7a80107
diff --git a/wm/marco/patches/patch-src_core_window.c b/wm/marco/patches/patch-src_core_window.c
new file mode 100644
index 00000000000..f08ddd7d0df
--- /dev/null
+++ b/wm/marco/patches/patch-src_core_window.c
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_core_window.c,v 1.1 2020/11/21 03:48:07 gutteridge Exp $
+
+window: do not unfocus on new window. Fix keyboard input on fullscreen VLC.
+https://github.com/mate-desktop/marco/commit/6ea23df6aa8a42973a1bb42c5c618b322d47488e
+
+--- src/core/window.c.orig	2020-08-04 18:35:42.000000000 +0000
++++ src/core/window.c
+@@ -2175,23 +2175,7 @@ meta_window_show (MetaWindow *window)
+       ( (!place_on_top_on_map && !takes_focus_on_map) ||
+       will_be_covered )
+     ) {
+-      if (meta_window_is_ancestor_of_transient (focus_window, window))
+-        {
+-          /* This happens for error dialogs or alerts; these need to remain on
+-           * top, but it would be confusing to have its ancestor remain
+-           * focused.
+-           */
+-          meta_topic (META_DEBUG_STARTUP,
+-                      "The focus window %s is an ancestor of the newly mapped "
+-                      "window %s which isn't being focused.  Unfocusing the "
+-                      "ancestor.\n",
+-                      focus_window->desc, window->desc);
+-
+-          meta_display_focus_the_no_focus_window (window->display,
+-                                                  window->screen,
+-                                                  timestamp);
+-        }
+-      else
++      if (!meta_window_is_ancestor_of_transient (focus_window, window))
+         {
+           needs_stacking_adjustment = TRUE;
+           if (!window->placed)
diff --git a/wm/marco/patches/patch-src_ui_frames.c b/wm/marco/patches/patch-src_ui_frames.c
new file mode 100644
index 00000000000..27f3f0b7be7
--- /dev/null
+++ b/wm/marco/patches/patch-src_ui_frames.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_ui_frames.c,v 1.1 2020/11/21 03:48:07 gutteridge Exp $
+
+Do not call cairo_paint() on generate_pixmaps. Fixes transparent windows.
+https://github.com/mate-desktop/marco/commit/0c2baf71f18f39058edc8459990da27c4d448d81
+
+--- src/ui/frames.c.orig	2020-08-04 18:35:42.000000000 +0000
++++ src/ui/frames.c
+@@ -2282,8 +2282,6 @@ generate_pixmap (MetaFrames            *
+   cr = cairo_create (result);
+   cairo_translate (cr, -rect->x, -rect->y);
+ 
+-  cairo_paint (cr);
+-
+   meta_frames_paint_to_drawable (frames, frame, cr);
+ 
+   cairo_destroy (cr);