Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / mate-desktop
Commits:
-
0ddaac56
by Mike Gabriel at 2023-07-10T05:59:36+02:00
-
3befaf22
by Mike Gabriel at 2023-07-10T05:59:47+02:00
-
892266be
by Mike Gabriel at 2023-07-10T06:08:55+02:00
-
d1bcc4e0
by Mike Gabriel at 2023-07-10T06:14:34+02:00
6 changed files:
- debian/changelog
- debian/control
- − debian/patches/0001_mate-bg-fix-memory-leak.patch
- − debian/patches/0002_mate-desktop-thumbnail-fix-memory-leak.patch
- − debian/patches/0003_revert-small-cleanup.patch
- debian/patches/series
Changes:
| 1 | +mate-desktop (1.26.1-1) unstable; urgency=medium
|
|
| 2 | + |
|
| 3 | + * New upstream release.
|
|
| 4 | + * debian/control:
|
|
| 5 | + + Bump Standards-Version: to 4.6.2. No changes needed.
|
|
| 6 | + * debian/patches:
|
|
| 7 | + + Drop patches 0001, 0002 and 0003. All applied upstream.
|
|
| 8 | + |
|
| 9 | + -- Mike Gabriel <sunweaver@debian.org> Mon, 10 Jul 2023 06:04:57 +0200
|
|
| 10 | + |
|
| 1 | 11 | mate-desktop (1.26.0-2) unstable; urgency=medium
|
| 2 | 12 | |
| 3 | 13 | * debian/patches:
|
| ... | ... | @@ -27,7 +27,7 @@ Build-Depends: autoconf-archive, |
| 27 | 27 | libxml2-dev,
|
| 28 | 28 | libxrandr-dev (>= 1.3),
|
| 29 | 29 | mate-common (>= 1.18),
|
| 30 | -Standards-Version: 4.6.0
|
|
| 30 | +Standards-Version: 4.6.2
|
|
| 31 | 31 | Rules-Requires-Root: no
|
| 32 | 32 | Homepage: http://www.mate-desktop.org/
|
| 33 | 33 | Vcs-Browser: https://salsa.debian.org/debian-mate-team/mate-desktop
|
| 1 | -From 2fbe25e7ad9c7678db2f3e34f76c9ee4e37d80d9 Mon Sep 17 00:00:00 2001
|
|
| 2 | -From: rbuj <robert.buj@gmail.com>
|
|
| 3 | -Date: Mon, 8 Nov 2021 12:44:21 +0100
|
|
| 4 | -Subject: [PATCH] mate-bg: fix memory leak
|
|
| 5 | - |
|
| 6 | ----
|
|
| 7 | - libmate-desktop/mate-bg.c | 10 +++++++---
|
|
| 8 | - 1 file changed, 7 insertions(+), 3 deletions(-)
|
|
| 9 | - |
|
| 10 | -diff --git a/libmate-desktop/mate-bg.c b/libmate-desktop/mate-bg.c
|
|
| 11 | -index e5119759e..62cc5e59e 100644
|
|
| 12 | ---- a/libmate-desktop/mate-bg.c
|
|
| 13 | -+++ b/libmate-desktop/mate-bg.c
|
|
| 14 | -@@ -3197,9 +3197,13 @@ mate_bg_changes_with_time (MateBG *bg)
|
|
| 15 | - if (!bg->filename)
|
|
| 16 | - return FALSE;
|
|
| 17 | -
|
|
| 18 | -- show = get_as_slideshow (bg, bg->filename);
|
|
| 19 | -- if (show)
|
|
| 20 | -- return g_queue_get_length (show->slides) > 1;
|
|
| 21 | -+ if ((show = get_as_slideshow (bg, bg->filename)) != NULL) {
|
|
| 22 | -+ gboolean result;
|
|
| 23 | -+
|
|
| 24 | -+ result = (g_queue_get_length (show->slides) > 1) ? TRUE : FALSE;
|
|
| 25 | -+ slideshow_unref (show);
|
|
| 26 | -+ return result;
|
|
| 27 | -+ }
|
|
| 28 | -
|
|
| 29 | - return FALSE;
|
|
| 30 | - } |
| 1 | -From 7f9225f08b84d58ccddbc88c7c4cc176c151fdb9 Mon Sep 17 00:00:00 2001
|
|
| 2 | -From: rbuj <robert.buj@gmail.com>
|
|
| 3 | -Date: Fri, 22 Oct 2021 18:26:52 +0200
|
|
| 4 | -Subject: [PATCH] mate-desktop-thumbnail: fix memory leak
|
|
| 5 | - |
|
| 6 | ----
|
|
| 7 | - libmate-desktop/mate-desktop-thumbnail.c | 1 +
|
|
| 8 | - 1 file changed, 1 insertion(+)
|
|
| 9 | - |
|
| 10 | -diff --git a/libmate-desktop/mate-desktop-thumbnail.c b/libmate-desktop/mate-desktop-thumbnail.c
|
|
| 11 | -index 8d2670631..885ff420a 100644
|
|
| 12 | ---- a/libmate-desktop/mate-desktop-thumbnail.c
|
|
| 13 | -+++ b/libmate-desktop/mate-desktop-thumbnail.c
|
|
| 14 | -@@ -954,6 +954,7 @@ expand_thumbnailing_script (const char *script,
|
|
| 15 | -
|
|
| 16 | - g_ptr_array_add (array, expanded);
|
|
| 17 | - }
|
|
| 18 | -+ g_strfreev (script_elems);
|
|
| 19 | -
|
|
| 20 | - if (!got_in)
|
|
| 21 | - { |
| 1 | -From 6fcc78cd8e5aa807fa9d254d2e61a302096559cf Mon Sep 17 00:00:00 2001
|
|
| 2 | -From: Colomban Wendling <cwendling@hypra.fr>
|
|
| 3 | -Date: Mon, 7 Nov 2022 11:57:51 +0100
|
|
| 4 | -Subject: [PATCH] Revert "[mate-bg] small cleanup"
|
|
| 5 | - |
|
| 6 | -It is not possible to use the `list` pointer after it has been deleted,
|
|
| 7 | -so the "cleanup" this commit made lead to using freed memory if any
|
|
| 8 | -item actually got clean up.
|
|
| 9 | - |
|
| 10 | -This "cleanup" also don't seem meaningful to me, as all it does
|
|
| 11 | -otherwise is trade an assignation for a redundant test -- either of
|
|
| 12 | -which the compiler might happily optimize out.
|
|
| 13 | - |
|
| 14 | -This reverts commit 47426c90d10e9f738ecf89f35db94ca8deff55e0.
|
|
| 15 | ----
|
|
| 16 | - libmate-desktop/mate-bg.c | 17 ++++++++---------
|
|
| 17 | - 1 file changed, 8 insertions(+), 9 deletions(-)
|
|
| 18 | - |
|
| 19 | -diff --git a/libmate-desktop/mate-bg.c b/libmate-desktop/mate-bg.c
|
|
| 20 | -index 62cc5e59e..5cf2daf3a 100644
|
|
| 21 | ---- a/libmate-desktop/mate-bg.c
|
|
| 22 | -+++ b/libmate-desktop/mate-bg.c
|
|
| 23 | -@@ -2016,19 +2016,18 @@ static gboolean
|
|
| 24 | - blow_expensive_caches (gpointer data)
|
|
| 25 | - {
|
|
| 26 | - MateBG *bg = data;
|
|
| 27 | -- GList *list;
|
|
| 28 | -+ GList *list, *next;
|
|
| 29 | -
|
|
| 30 | - bg->blow_caches_id = 0;
|
|
| 31 | -
|
|
| 32 | -- if (bg->file_cache) {
|
|
| 33 | -- for (list = bg->file_cache; list != NULL; list = list->next) {
|
|
| 34 | -- FileCacheEntry *ent = list->data;
|
|
| 35 | -+ for (list = bg->file_cache; list != NULL; list = next) {
|
|
| 36 | -+ FileCacheEntry *ent = list->data;
|
|
| 37 | -+ next = list->next;
|
|
| 38 | -
|
|
| 39 | -- if (ent->type == PIXBUF) {
|
|
| 40 | -- file_cache_entry_delete (ent);
|
|
| 41 | -- bg->file_cache = g_list_delete_link (bg->file_cache,
|
|
| 42 | -- list);
|
|
| 43 | -- }
|
|
| 44 | -+ if (ent->type == PIXBUF) {
|
|
| 45 | -+ file_cache_entry_delete (ent);
|
|
| 46 | -+ bg->file_cache = g_list_delete_link (bg->file_cache,
|
|
| 47 | -+ list);
|
|
| 48 | - }
|
|
| 49 | - }
|
|
| 50 | - |
| 1 | 1 | 2001_prefer-x-terminal-emulator.patch |
| 2 | -0001_mate-bg-fix-memory-leak.patch
|
|
| 3 | -0002_mate-desktop-thumbnail-fix-memory-leak.patch
|
|
| 4 | -0003_revert-small-cleanup.patch |