diff --git a/.gitignore b/.gitignore index 7fb1b1d..ad7b712 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /marco-1.24.0.tar.xz /marco-1.24.1.tar.xz /marco-1.24.2.tar.xz +/marco-1.26.0.tar.xz diff --git a/marco.spec b/marco.spec index 0bb083f..38ad67b 100644 --- a/marco.spec +++ b/marco.spec @@ -2,7 +2,7 @@ %global rel_build 1 # This is needed, because src-url contains branched part of versioning-scheme. -%global branch 1.24 +%global branch 1.26 # Settings used for build from snapshots. %{!?rel_build:%global commit 62a708d461e08275d6b85985f5fa13fa8fbc85f7} @@ -13,9 +13,9 @@ %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz} Name: marco -Version: %{branch}.2 +Version: %{branch}.0 %if 0%{?rel_build} -Release: 3%{?dist} +Release: 1%{?dist} %else Release: 0.15%{?git_rel}%{?dist} %endif @@ -29,10 +29,6 @@ URL: http://mate-desktop.org # Source for snapshot-builds. %{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} -# https://github.com/mate-desktop/marco/commit/76da06f -Patch1: marco_0001-tabpopup-fix-cairo-surface-leak-1.24.patch - -BuildRequires: make BuildRequires: desktop-file-utils BuildRequires: gtk3-devel BuildRequires: libcanberra-devel @@ -41,6 +37,7 @@ BuildRequires: libSM-devel BuildRequireS: libsoup-devel BuildRequires: libXdamage-devel BuildRequires: libXpresent-devel +BuildRequires: make BuildRequires: mate-common BuildRequires: mate-desktop-devel BuildRequires: zenity @@ -154,6 +151,9 @@ desktop-file-install \ %changelog +* Wed Aug 04 2021 Wolfgang Ulbrich - 1.26.0-1 +- update to 1.26.0 + * Thu Jul 22 2021 Fedora Release Engineering - 1.24.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/marco_0001-tabpopup-fix-cairo-surface-leak-1.24.patch b/marco_0001-tabpopup-fix-cairo-surface-leak-1.24.patch deleted file mode 100644 index e50cc87..0000000 --- a/marco_0001-tabpopup-fix-cairo-surface-leak-1.24.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 76da06f80107bd554f22be3dfe6798a35dc1bb83 Mon Sep 17 00:00:00 2001 -From: Faidon Liambotis -Date: Sat, 3 Jul 2021 01:10:22 +0300 -Subject: [PATCH] tabpopup: fix cairo surface leak - -Commit 6b05da5e49996a2101edfd703dd3f5d91011d726 introduced a Cairo -surface leak, by calling gdk_cairo_surface_create_from_pixbuf() but then -never freeing those surfaces with cairo_surface_destroy(). - -This manifested in leaking resources when switching between virtual -desktops, as observed using xrestop ("Pxms" column), which made the -desktop slow and ultimately unusable after a few weeks of uptime. - -Fixes #685 ---- - src/ui/draw-workspace.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/ui/draw-workspace.c b/src/ui/draw-workspace.c -index aca58440..efced123 100644 ---- a/src/ui/draw-workspace.c -+++ b/src/ui/draw-workspace.c -@@ -131,6 +131,7 @@ draw_window (GtkWidget *widget, - /* 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 *widget, - - /* 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 *widget, - cairo_clip (cr); - cairo_paint (cr); - cairo_restore (cr); -+ -+ cairo_surface_destroy (icon); - } - - gtk_style_context_get_color (style, state, &color); --- -2.31.1 - diff --git a/sources b/sources index 646cba9..6830e28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (marco-1.24.2.tar.xz) = 2e699935fb72ddc34aa1f98f5771f252141245ad8fd0983aafe5ea55aeeb3f90b5d68a61c27704adf0b929565180367aae46486d45e789d7de101ec9a7bc9f96 +SHA512 (marco-1.26.0.tar.xz) = 013ba12dc7f4affe24bc5763ae88e44ede3f1454e74b5a642503d3741ce935f6757eba3f9def56670414c5a9c03b38384b5b54a494f9cb8f5bfd480e43300e76