From nobody Tue May 23 07:46:32 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QQRGJ496cz4TD3K; Tue, 23 May 2023 07:46:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QQRGJ32sPz4FX1; Tue, 23 May 2023 07:46:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684827992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rOJDXv8/z5vjZl+0qrpWIwS81Q/eqnxdWRrw7AtB934=; b=wCLnu/aIiTSYjY7X14eNkLW1YtGqWXQaxVd37DJE+lNehteUdIgEoL3H7C/4qwP8s+oRTu ngz/BvXd/DQU/8QdqUDjnnJ5k9cGMGnpNb1ZA8dFiZCi1oXtTFS1+/X/Cg1JCD6UVppnOu V4JKPPWhPQs6OhM86Q6Z4wZ23knDt2rL5YhF6CM0s/d2Q9YqLiUQ//P5LmedJO0OWSGcJ5 ZbFw8J9mlswDBHLZwQNbWyVR3GhPV1xE96RRmoSBVbkAA5BBWR4XoxOIu4fPycmfJBjp+Y DUMjmSh+8H7z4oiBEjEznchFodBYKW19uAnnki14l7/IsWDz6Rbi2Bej91gDig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684827992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rOJDXv8/z5vjZl+0qrpWIwS81Q/eqnxdWRrw7AtB934=; b=FYJVZfQUouz6MEy2LqPUuuUhJU1XajmdwosWkQ+MTo+wc4DUaM3VzrJu+w41sib9wPQTQh M4oqttXZL4O4364lTZACXwI+6x5S91oW8bQY1M/BniOvFhB/OMySjeB9VuQYbSPoXgfN44 3vLdHeJlQqh7/N0hUGICkL7Wh+1c7jaj+FKBrsY3lANYrUAF57eR6wWvIQikIl6EJqladt 2w9dK82fkQzMSgV/9OuVqwP/N08xSVoLtTkr6PHsksglVtfgubB2QT8d9rmK2EuvZwfiWr 6qBhGzuK/GBsVI8Yl9vwvtVAqkrVN2qifVT2uJD9B8k13peB1nW40huRUQOthA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684827992; a=rsa-sha256; cv=none; b=ZYFDJq9ewJhNgyJl+sxcJ/05eDehAbKdmnZbxHeO10Ic6davpCV1wcpq+cjUv4TLNqUwKK PLFfaXlUkhAoU63PAtCkwkUJDIBp9EoBb/RNelNrRvis2geGsRTkBP3RPi5XOeXtWo5KOP XBeUTROdOUF/T9QgQniuY3rV5xWOHjVMsGUKGMPfEKkPtU1rTk3xwlShvCEssiWi+B4PV6 Up45Typi/sI4pkZKANrc0FHp4Vow/JhVt3lI7yluWY7vGWqfGmwpBP2iGGhSFd8VQYeWrl GzSxJE7EtosTwRwwbubXUG/JCGF7xGa8xYBftPzpiRALfE24jUqykyE08BMzhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QQRGJ1vJQzrlW; Tue, 23 May 2023 07:46:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34N7kWI9056710; Tue, 23 May 2023 07:46:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34N7kWW4056709; Tue, 23 May 2023 07:46:32 GMT (envelope-from git) Date: Tue, 23 May 2023 07:46:32 GMT Message-Id: <202305230746.34N7kWW4056709@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 9a5d9eaee3d3 - main - x11-wm/xfce4-panel: Update to 4.18.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a5d9eaee3d35e43184ea4f5a918d6e147735d4a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=9a5d9eaee3d35e43184ea4f5a918d6e147735d4a commit 9a5d9eaee3d35e43184ea4f5a918d6e147735d4a Author: Guido Falsi AuthorDate: 2023-05-23 07:45:58 +0000 Commit: Guido Falsi 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?= -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