Received: by mail.netbsd.org (Postfix, from userid 605) id 8145A84EDA; Sun, 11 Jul 2021 03:32:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B89F084ECA for ; Sun, 11 Jul 2021 03:32:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id TCRlTKhY5eAu for ; Sun, 11 Jul 2021 03:32:49 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 21EA884EB0 for ; Sun, 11 Jul 2021 03:32:49 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 16444FA95; Sun, 11 Jul 2021 03:32:49 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1625974369118780" MIME-Version: 1.0 Date: Sun, 11 Jul 2021 03:32:49 +0000 From: "David H. Gutteridge" Subject: CVS commit: pkgsrc/wm/marco To: pkgsrc-changes@NetBSD.org Reply-To: gutteridge@netbsd.org X-Mailer: log_accum Message-Id: <20210711033249.16444FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1625974369118780 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gutteridge Date: Sun Jul 11 03:32:48 UTC 2021 Modified Files: pkgsrc/wm/marco: Makefile distinfo Added Files: pkgsrc/wm/marco/patches: patch-src_ui_draw-workspace.c Log Message: marco: apply an upstream fix for responsiveness issues To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 pkgsrc/wm/marco/Makefile cvs rdiff -u -r1.15 -r1.16 pkgsrc/wm/marco/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/wm/marco/patches/patch-src_ui_draw-workspace.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1625974369118780 Content-Disposition: inline Content-Length: 3048 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/wm/marco/Makefile diff -u pkgsrc/wm/marco/Makefile:1.29 pkgsrc/wm/marco/Makefile:1.30 --- pkgsrc/wm/marco/Makefile:1.29 Sun May 2 10:24:52 2021 +++ pkgsrc/wm/marco/Makefile Sun Jul 11 03:32:48 2021 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.29 2021/05/02 10:24:52 nia Exp $ +# $NetBSD: Makefile,v 1.30 2021/07/11 03:32:48 gutteridge Exp $ .include "../../meta-pkgs/mate/Makefile.common" DISTNAME= marco-${VERSION:R}.2 +PKGREVISION= 1 CATEGORIES= wm COMMENT= Fork of GNOME Metacity Index: pkgsrc/wm/marco/distinfo diff -u pkgsrc/wm/marco/distinfo:1.15 pkgsrc/wm/marco/distinfo:1.16 --- pkgsrc/wm/marco/distinfo:1.15 Thu Apr 29 03:06:02 2021 +++ pkgsrc/wm/marco/distinfo Sun Jul 11 03:32:48 2021 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2021/04/29 03:06:02 gutteridge Exp $ +$NetBSD: distinfo,v 1.16 2021/07/11 03:32:48 gutteridge Exp $ SHA1 (marco-1.24.2.tar.xz) = 387a367a11f20b4cc6357aff6154bd654e861f87 RMD160 (marco-1.24.2.tar.xz) = 913782192c1e778c8381ebbf5a3101067cced584 @@ -9,3 +9,4 @@ SHA1 (patch-src_core_delete.c) = ace180e 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_ui_draw-workspace.c) = e48653b9143e14a3ba9ed2582dee10751db30278 Added files: Index: pkgsrc/wm/marco/patches/patch-src_ui_draw-workspace.c diff -u /dev/null pkgsrc/wm/marco/patches/patch-src_ui_draw-workspace.c:1.1 --- /dev/null Sun Jul 11 03:32:49 2021 +++ pkgsrc/wm/marco/patches/patch-src_ui_draw-workspace.c Sun Jul 11 03:32:48 2021 @@ -0,0 +1,37 @@ +$NetBSD: patch-src_ui_draw-workspace.c,v 1.1 2021/07/11 03:32:48 gutteridge Exp $ + +Fix memory leaks that can lead to significant responsiveness issues. +https://github.com/mate-desktop/marco/commit/76da06f +https://github.com/mate-desktop/marco/issues/685 + +--- src/ui/draw-workspace.c.orig 2021-03-23 15:55:18.000000000 +0000 ++++ src/ui/draw-workspace.c +@@ -131,6 +131,7 @@ draw_window (GtkWidget + /* If the icon is too big, fall back to mini icon. */ + if (icon_w > (winrect->width - 2) || icon_h > (winrect->height - 2)) + { ++ cairo_surface_destroy (icon); + icon = gdk_cairo_surface_create_from_pixbuf (win->mini_icon, scale, NULL); + if (icon) + { +@@ -139,7 +140,10 @@ draw_window (GtkWidget + + /* Give up. */ + if (icon_w > (winrect->width - 2) || icon_h > (winrect->height - 2)) +- icon = NULL; ++ { ++ cairo_surface_destroy (icon); ++ icon = NULL; ++ } + } + } + } +@@ -155,6 +159,8 @@ draw_window (GtkWidget + cairo_clip (cr); + cairo_paint (cr); + cairo_restore (cr); ++ ++ cairo_surface_destroy (icon); + } + + gtk_style_context_get_color (style, state, &color); --_----------=_1625974369118780--