Date: Tue, 23 May 2023 07:46:32 GMT From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9a5d9eaee3d3 - main - x11-wm/xfce4-panel: Update to 4.18.4 Message-ID: <202305230746.34N7kWW4056709@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=9a5d9eaee3d35e43184ea4f5a918d6e147735d4a commit 9a5d9eaee3d35e43184ea4f5a918d6e147735d4a Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2023-05-23 07:45:58 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> CommitDate: 2023-05-23 07:45:58 +0000 x11-wm/xfce4-panel: Update to 4.18.4 Remove patch now included in release. --- x11-wm/xfce4-panel/Makefile | 3 +- x11-wm/xfce4-panel/distinfo | 6 +- x11-wm/xfce4-panel/files/patch-upstream-crash-fix | 50 --------------- x11-wm/xfce4-panel/pkg-plist | 78 ++++++++++++++++++++++- 4 files changed, 81 insertions(+), 56 deletions(-) diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile index 797080a0eff5..0c81bf9c09a1 100644 --- a/x11-wm/xfce4-panel/Makefile +++ b/x11-wm/xfce4-panel/Makefile @@ -1,6 +1,5 @@ PORTNAME= xfce4-panel -PORTVERSION= 4.18.3 -PORTREVISION= 1 +PORTVERSION= 4.18.4 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo index cdd39262eea7..3d9720d2b2d1 100644 --- a/x11-wm/xfce4-panel/distinfo +++ b/x11-wm/xfce4-panel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680029758 -SHA256 (xfce4/xfce4-panel-4.18.3.tar.bz2) = 4ae0b8615c9811194bbda0172a63567ed7fdb5519ea48f7a4637f4e6e5365e1b -SIZE (xfce4/xfce4-panel-4.18.3.tar.bz2) = 1452647 +TIMESTAMP = 1684782278 +SHA256 (xfce4/xfce4-panel-4.18.4.tar.bz2) = 32304f82094ea3779741f968dc851032d8790eb78f3aa01676520b96cfacfb54 +SIZE (xfce4/xfce4-panel-4.18.4.tar.bz2) = 1624451 diff --git a/x11-wm/xfce4-panel/files/patch-upstream-crash-fix b/x11-wm/xfce4-panel/files/patch-upstream-crash-fix deleted file mode 100644 index 160b26daa431..000000000000 --- a/x11-wm/xfce4-panel/files/patch-upstream-crash-fix +++ /dev/null @@ -1,50 +0,0 @@ -From 3bf948cc2618632aaaaabefae1b1be50d5a607c3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org> -Date: Sun, 16 Apr 2023 17:55:54 +0200 -Subject: [PATCH] tasklist: Fix use-after-free on tasklist child - -This was running smoothly since 2010 but the update to GLib 2.76, which -makes g_slice_free() a simple wrapper around g_free_sized(), revealed -this bug. - -Fixes: #730 -(cherry picked from commit a5a289ede6c2175b97059ead5d63a59dbde04ea0) ---- - plugins/tasklist/tasklist-widget.c | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/plugins/tasklist/tasklist-widget.c b/plugins/tasklist/tasklist-widget.c -index 24dfdb7db..c0095d70d 100644 ---- plugins/tasklist/tasklist-widget.c -+++ plugins/tasklist/tasklist-widget.c -@@ -1501,6 +1501,15 @@ xfce_tasklist_scroll_event (GtkWidget *widget, - - - -+static gboolean -+xfce_tasklist_free_child (gpointer data) -+{ -+ g_slice_free (XfceTasklistChild, data); -+ return FALSE; -+} -+ -+ -+ - static void - xfce_tasklist_remove (GtkContainer *container, - GtkWidget *widget) -@@ -1528,7 +1537,10 @@ xfce_tasklist_remove (GtkContainer *container, - if (child->pixbuf != NULL) - g_object_unref (child->pixbuf); - -- g_slice_free (XfceTasklistChild, child); -+ /* allow time for signal handlers connected to the destroy/dispose signals of -+ * child members to run, they could refer to these members via child, e.g. -+ * child->button as above to test for equality */ -+ g_idle_add (xfce_tasklist_free_child, child); - - /* queue a resize if needed */ - if (G_LIKELY (was_visible)) --- -GitLab - diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist index cae1ea4a06ae..6b6fc84c87bb 100644 --- a/x11-wm/xfce4-panel/pkg-plist +++ b/x11-wm/xfce4-panel/pkg-plist @@ -34,11 +34,42 @@ libdata/pkgconfig/libxfce4panel-2.0.pc share/applications/panel-desktop-handler.desktop share/applications/panel-preferences.desktop %%GIR%%share/gir-1.0/Libxfce4panel-2.0.gir +share/icons/hicolor/128x128/apps/org.xfce.panel.actions.png +share/icons/hicolor/128x128/apps/org.xfce.panel.applicationsmenu.png +share/icons/hicolor/128x128/apps/org.xfce.panel.clock.png +share/icons/hicolor/128x128/apps/org.xfce.panel.directorymenu.png +share/icons/hicolor/128x128/apps/org.xfce.panel.launcher.png +share/icons/hicolor/128x128/apps/org.xfce.panel.pager.png share/icons/hicolor/128x128/apps/org.xfce.panel.png +share/icons/hicolor/128x128/apps/org.xfce.panel.separator.png +share/icons/hicolor/128x128/apps/org.xfce.panel.showdesktop.png +share/icons/hicolor/128x128/apps/org.xfce.panel.systray.png +share/icons/hicolor/128x128/apps/org.xfce.panel.tasklist.png +share/icons/hicolor/128x128/apps/org.xfce.panel.windowmenu.png +share/icons/hicolor/16x16/apps/org.xfce.panel.actions.png share/icons/hicolor/16x16/apps/org.xfce.panel.applicationsmenu.png +share/icons/hicolor/16x16/apps/org.xfce.panel.clock.png +share/icons/hicolor/16x16/apps/org.xfce.panel.directorymenu.png +share/icons/hicolor/16x16/apps/org.xfce.panel.launcher.png +share/icons/hicolor/16x16/apps/org.xfce.panel.pager.png share/icons/hicolor/16x16/apps/org.xfce.panel.png +share/icons/hicolor/16x16/apps/org.xfce.panel.separator.png +share/icons/hicolor/16x16/apps/org.xfce.panel.showdesktop.png +share/icons/hicolor/16x16/apps/org.xfce.panel.systray.png +share/icons/hicolor/16x16/apps/org.xfce.panel.tasklist.png +share/icons/hicolor/16x16/apps/org.xfce.panel.windowmenu.png +share/icons/hicolor/24x24/apps/org.xfce.panel.actions.png share/icons/hicolor/24x24/apps/org.xfce.panel.applicationsmenu.png +share/icons/hicolor/24x24/apps/org.xfce.panel.clock.png +share/icons/hicolor/24x24/apps/org.xfce.panel.directorymenu.png +share/icons/hicolor/24x24/apps/org.xfce.panel.launcher.png +share/icons/hicolor/24x24/apps/org.xfce.panel.pager.png share/icons/hicolor/24x24/apps/org.xfce.panel.png +share/icons/hicolor/24x24/apps/org.xfce.panel.separator.png +share/icons/hicolor/24x24/apps/org.xfce.panel.showdesktop.png +share/icons/hicolor/24x24/apps/org.xfce.panel.systray.png +share/icons/hicolor/24x24/apps/org.xfce.panel.tasklist.png +share/icons/hicolor/24x24/apps/org.xfce.panel.windowmenu.png share/icons/hicolor/32x32/apps/org.xfce.panel.actions.png share/icons/hicolor/32x32/apps/org.xfce.panel.applicationsmenu.png share/icons/hicolor/32x32/apps/org.xfce.panel.clock.png @@ -48,12 +79,57 @@ share/icons/hicolor/32x32/apps/org.xfce.panel.pager.png share/icons/hicolor/32x32/apps/org.xfce.panel.png share/icons/hicolor/32x32/apps/org.xfce.panel.separator.png share/icons/hicolor/32x32/apps/org.xfce.panel.showdesktop.png -share/icons/hicolor/32x32/apps/org.xfce.panel.statustray.png +share/icons/hicolor/32x32/apps/org.xfce.panel.systray.png share/icons/hicolor/32x32/apps/org.xfce.panel.tasklist.png share/icons/hicolor/32x32/apps/org.xfce.panel.windowmenu.png +share/icons/hicolor/48x48/apps/org.xfce.panel.actions.png share/icons/hicolor/48x48/apps/org.xfce.panel.applicationsmenu.png +share/icons/hicolor/48x48/apps/org.xfce.panel.clock.png +share/icons/hicolor/48x48/apps/org.xfce.panel.directorymenu.png +share/icons/hicolor/48x48/apps/org.xfce.panel.launcher.png +share/icons/hicolor/48x48/apps/org.xfce.panel.pager.png share/icons/hicolor/48x48/apps/org.xfce.panel.png +share/icons/hicolor/48x48/apps/org.xfce.panel.separator.png +share/icons/hicolor/48x48/apps/org.xfce.panel.showdesktop.png +share/icons/hicolor/48x48/apps/org.xfce.panel.systray.png +share/icons/hicolor/48x48/apps/org.xfce.panel.tasklist.png +share/icons/hicolor/48x48/apps/org.xfce.panel.windowmenu.png +share/icons/hicolor/64x64/apps/org.xfce.panel.actions.png +share/icons/hicolor/64x64/apps/org.xfce.panel.applicationsmenu.png +share/icons/hicolor/64x64/apps/org.xfce.panel.clock.png +share/icons/hicolor/64x64/apps/org.xfce.panel.directorymenu.png +share/icons/hicolor/64x64/apps/org.xfce.panel.launcher.png +share/icons/hicolor/64x64/apps/org.xfce.panel.pager.png +share/icons/hicolor/64x64/apps/org.xfce.panel.png +share/icons/hicolor/64x64/apps/org.xfce.panel.separator.png +share/icons/hicolor/64x64/apps/org.xfce.panel.showdesktop.png +share/icons/hicolor/64x64/apps/org.xfce.panel.systray.png +share/icons/hicolor/64x64/apps/org.xfce.panel.tasklist.png +share/icons/hicolor/64x64/apps/org.xfce.panel.windowmenu.png +share/icons/hicolor/96x96/apps/org.xfce.panel.actions.png +share/icons/hicolor/96x96/apps/org.xfce.panel.applicationsmenu.png +share/icons/hicolor/96x96/apps/org.xfce.panel.clock.png +share/icons/hicolor/96x96/apps/org.xfce.panel.directorymenu.png +share/icons/hicolor/96x96/apps/org.xfce.panel.launcher.png +share/icons/hicolor/96x96/apps/org.xfce.panel.pager.png +share/icons/hicolor/96x96/apps/org.xfce.panel.png +share/icons/hicolor/96x96/apps/org.xfce.panel.separator.png +share/icons/hicolor/96x96/apps/org.xfce.panel.showdesktop.png +share/icons/hicolor/96x96/apps/org.xfce.panel.systray.png +share/icons/hicolor/96x96/apps/org.xfce.panel.tasklist.png +share/icons/hicolor/96x96/apps/org.xfce.panel.windowmenu.png +share/icons/hicolor/scalable/apps/org.xfce.panel.actions.svg +share/icons/hicolor/scalable/apps/org.xfce.panel.applicationsmenu.svg +share/icons/hicolor/scalable/apps/org.xfce.panel.clock.svg +share/icons/hicolor/scalable/apps/org.xfce.panel.directorymenu.svg +share/icons/hicolor/scalable/apps/org.xfce.panel.launcher.svg +share/icons/hicolor/scalable/apps/org.xfce.panel.pager.svg +share/icons/hicolor/scalable/apps/org.xfce.panel.separator.svg +share/icons/hicolor/scalable/apps/org.xfce.panel.showdesktop.svg share/icons/hicolor/scalable/apps/org.xfce.panel.svg +share/icons/hicolor/scalable/apps/org.xfce.panel.systray.svg +share/icons/hicolor/scalable/apps/org.xfce.panel.tasklist.svg +share/icons/hicolor/scalable/apps/org.xfce.panel.windowmenu.svg %%NLS%%share/locale/am/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ar/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-panel.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305230746.34N7kWW4056709>