marco: update to 1.24.2

(Two of the three code changes had already been applied in pkgsrc.)

Change log:

marco 1.24.2

  * update translations
  * compositor-xrender.c: Make sure tooltips are visible
  * window: do not unfocus on new window.
  * Do not call cairo paint on generate_pixmaps.

4 files changed, 7 insertions, 58 deletions

diff --git a/wm/marco/Makefile b/wm/marco/Makefile
index 45462318c73..02388278044 100644
--- a/wm/marco/Makefile
+++ b/wm/marco/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2020/11/21 03:48:07 gutteridge Exp $
+# $NetBSD: Makefile,v 1.28 2021/04/29 03:06:02 gutteridge Exp $
 
-PKGREVISION= 3
 .include "../../meta-pkgs/mate/Makefile.common"
 
-DISTNAME=	marco-${VERSION:R}.1
+DISTNAME=	marco-${VERSION:R}.2
 CATEGORIES=	wm
 
 COMMENT=	Fork of GNOME Metacity
diff --git a/wm/marco/distinfo b/wm/marco/distinfo
index 1676f084f05..7b7c05f23af 100644
--- a/wm/marco/distinfo
+++ b/wm/marco/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.14 2020/11/21 03:48:07 gutteridge Exp $
+$NetBSD: distinfo,v 1.15 2021/04/29 03:06:02 gutteridge Exp $
 
-SHA1 (marco-1.24.1.tar.xz) = a5109201f9113f0d8802ece48d801e7a35fc5341
-RMD160 (marco-1.24.1.tar.xz) = ecf0cb023fdfee703ea0ff8d451293aa2edb8a5d
-SHA512 (marco-1.24.1.tar.xz) = 55607898b64f0da3a85dd8d7fd092d847c8f67cefa096a63dbe074c197157a3d661fcb3f2a495b4425340b583b600cda3d1c92ac08b7327904dbd4aab8e92c85
-Size (marco-1.24.1.tar.xz) = 1860008 bytes
+SHA1 (marco-1.24.2.tar.xz) = 387a367a11f20b4cc6357aff6154bd654e861f87
+RMD160 (marco-1.24.2.tar.xz) = 913782192c1e778c8381ebbf5a3101067cced584
+SHA512 (marco-1.24.2.tar.xz) = 2e699935fb72ddc34aa1f98f5771f252141245ad8fd0983aafe5ea55aeeb3f90b5d68a61c27704adf0b929565180367aae46486d45e789d7de101ec9a7bc9f96
+Size (marco-1.24.2.tar.xz) = 1845356 bytes
 SHA1 (patch-src_compositor_compositor-xrender.c) = 5cb7e98d8e2b1dda2842f422ad2268bb258c35ee
 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
deleted file mode 100644
index f08ddd7d0df..00000000000
--- a/wm/marco/patches/patch-src_core_window.c
+++ /dev/null
@@ -1,32 +0,0 @@
-$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
deleted file mode 100644
index 27f3f0b7be7..00000000000
--- a/wm/marco/patches/patch-src_ui_frames.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$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);