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,52 +1,51 @@ PORTNAME= xfce4-panel -PORTVERSION= 4.18.3 -PORTREVISION= 1 +PORTVERSION= 4.18.4 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Xfce's panel WWW= https://docs.xfce.org/xfce/xfce4-panel/start LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LIB LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libdbusmenu-gtk3.so:devel/libdbusmenu \ libharfbuzz.so:print/harfbuzz USES= compiler:c11 desktop-file-utils gettext-tools gmake gnome \ libtool pathfix perl5 pkgconfig tar:bzip2 xfce xorg USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool libwnck3 USE_LDCONFIG= yes USE_XFCE= garcon libexo xfconf USE_XORG= ice sm x11 xext GNU_CONFIGURE= yes INSTALL_TARGET= install-strip CONFIGURE_ARGS= --enable-gio-unix --without-html-dir PORTSCOUT= limitw:1,even OPTIONS_DEFINE= GIR NLS VAPI OPTIONS_DEFAULT= GIR VAPI OPTIONS_SUB= yes GIR_DESC= Use Gobject Introspection GIR_USE= gnome=introspection:build GIR_CONFIGURE_ON= --enable-introspection=yes GIR_CONFIGURE_OFF= --enable-introspection=no NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext-runtime VAPI_USES= vala:build VAPI_CONFIGURE_ENABLE= vala VAPI_IMPLIES= GIR .include 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?= -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 @@ -1,132 +1,208 @@ bin/xfce4-panel bin/xfce4-popup-applicationsmenu bin/xfce4-popup-directorymenu bin/xfce4-popup-windowmenu etc/xdg/xfce4/panel/default.xml include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel-config.h include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel-enum-types.h include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel-enums.h include/xfce4/libxfce4panel-2.0/libxfce4panel/libxfce4panel.h include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-arrow-button.h include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-convenience.h include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-image.h include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-macros.h include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-plugin-provider.h include/xfce4/libxfce4panel-2.0/libxfce4panel/xfce-panel-plugin.h %%GIR%%lib/girepository-1.0/Libxfce4panel-2.0.typelib lib/libxfce4panel-2.0.so lib/libxfce4panel-2.0.so.4 lib/libxfce4panel-2.0.so.4.0.0 lib/xfce4/panel/migrate lib/xfce4/panel/plugins/libactions.so lib/xfce4/panel/plugins/libapplicationsmenu.so lib/xfce4/panel/plugins/libclock.so lib/xfce4/panel/plugins/libdirectorymenu.so lib/xfce4/panel/plugins/liblauncher.so lib/xfce4/panel/plugins/libpager.so lib/xfce4/panel/plugins/libseparator.so lib/xfce4/panel/plugins/libshowdesktop.so lib/xfce4/panel/plugins/libsystray.so lib/xfce4/panel/plugins/libtasklist.so lib/xfce4/panel/plugins/libwindowmenu.so lib/xfce4/panel/wrapper-2.0 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 share/icons/hicolor/32x32/apps/org.xfce.panel.directorymenu.png share/icons/hicolor/32x32/apps/org.xfce.panel.launcher.png 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 %%NLS%%share/locale/be/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/bg/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/bn/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/cs/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/da/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/de/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/el/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/eo/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/es/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/et/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/eu/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/fi/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/fr/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/gl/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/he/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/hr/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/hy_AM/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/hye/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/id/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ie/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/is/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/it/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ja/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ka/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/kk/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ko/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/lt/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/lv/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ms/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/nb/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/nl/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/nn/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/oc/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/pa/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/pl/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ro/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/si/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/sl/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/sq/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/sr/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/te/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/th/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ug/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/uk/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ur/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/vi/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-panel.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo share/xfce4/panel/plugins/actions.desktop share/xfce4/panel/plugins/applicationsmenu.desktop share/xfce4/panel/plugins/clock.desktop share/xfce4/panel/plugins/directorymenu.desktop share/xfce4/panel/plugins/launcher.desktop share/xfce4/panel/plugins/pager.desktop share/xfce4/panel/plugins/separator.desktop share/xfce4/panel/plugins/showdesktop.desktop share/xfce4/panel/plugins/systray.desktop share/xfce4/panel/plugins/tasklist.desktop share/xfce4/panel/plugins/windowmenu.desktop %%VAPI%%share/vala/vapi/libxfce4panel-2.0.deps %%VAPI%%share/vala/vapi/libxfce4panel-2.0.vapi