CVS commit: pkgsrc/x11/xfce4-panel

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sun Jul 24 20:46:34 UTC 2022

Modified Files:
        pkgsrc/x11/xfce4-panel: Makefile distinfo
Added Files:
        pkgsrc/x11/xfce4-panel/patches: patch-plugins_systray_sn-item.c

Log Message:
xfce4-panel: fix crasher bug not yet on branch upstream


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 pkgsrc/x11/xfce4-panel/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/x11/xfce4-panel/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/xfce4-panel/patches/patch-plugins_systray_sn-item.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xfce4-panel/Makefile
diff -u pkgsrc/x11/xfce4-panel/Makefile:1.93 pkgsrc/x11/xfce4-panel/Makefile:1.94
--- pkgsrc/x11/xfce4-panel/Makefile:1.93        Tue Apr 26 00:25:40 2022
+++ pkgsrc/x11/xfce4-panel/Makefile     Sun Jul 24 20:46:33 2022
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.93 2022/04/26 00:25:40 gutteridge Exp $
+# $NetBSD: Makefile,v 1.94 2022/07/24 20:46:33 gutteridge Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=              xfce4-panel-4.16.4
+PKGREVISION=           1
 CATEGORIES=            x11
 MASTER_SITES+=         https://archive.xfce.org/src/xfce/xfce4-panel/4.16/
 

Index: pkgsrc/x11/xfce4-panel/distinfo
diff -u pkgsrc/x11/xfce4-panel/distinfo:1.37 pkgsrc/x11/xfce4-panel/distinfo:1.38
--- pkgsrc/x11/xfce4-panel/distinfo:1.37        Tue Apr 26 00:25:40 2022
+++ pkgsrc/x11/xfce4-panel/distinfo     Sun Jul 24 20:46:33 2022
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.37 2022/04/26 00:25:40 gutteridge Exp $
+$NetBSD: distinfo,v 1.38 2022/07/24 20:46:33 gutteridge Exp $
 
 BLAKE2s (xfce4-panel-4.16.4.tar.bz2) = 33c871f286627f035903b08379dc9febe9207c5786a671b2d32219a43b8f40c1
 SHA512 (xfce4-panel-4.16.4.tar.bz2) = a1ad5a528968c4b1a5d2fb1537f7774aeeb525d7cb2f77e261b187b94e9de22f018bbd47d462ce4ad09b360126548d5848e46643df40549f9f8a3c44a4a14564
 Size (xfce4-panel-4.16.4.tar.bz2) = 1383630 bytes
 SHA1 (patch-migrate_Makefile.in) = bf71d8ff41cfe4ce60e7e1887858b5474f1fe11c
+SHA1 (patch-plugins_systray_sn-item.c) = c1d32f965c6d2cc5fc0f219e5619ba532fdd8108

Added files:

Index: pkgsrc/x11/xfce4-panel/patches/patch-plugins_systray_sn-item.c
diff -u /dev/null pkgsrc/x11/xfce4-panel/patches/patch-plugins_systray_sn-item.c:1.1
--- /dev/null   Sun Jul 24 20:46:34 2022
+++ pkgsrc/x11/xfce4-panel/patches/patch-plugins_systray_sn-item.c      Sun Jul 24 20:46:33 2022
@@ -0,0 +1,21 @@
+$NetBSD: patch-plugins_systray_sn-item.c,v 1.1 2022/07/24 20:46:33 gutteridge Exp $
+
+Do not crash if a "NewStatus" signal is received. Xfce commit
+https://gitlab.xfce.org/xfce/xfce4-panel/-/commit/5ec17b6d1166e7dc4a9fe7d45169252335bdf1da
+
+--- plugins/systray/sn-item.c.orig     2022-04-16 11:39:02.000000000 +0000
++++ plugins/systray/sn-item.c
+@@ -565,6 +565,13 @@ sn_item_signal_received (GDBusProxy *pro
+     }
+   else if (!g_strcmp0 (signal_name, "NewStatus"))
+     {
++      finish_and_return_if_true (parameters == NULL);
++      if (! g_variant_check_format_string (parameters, "(s)", FALSE))
++        {
++          g_warning ("Could not parse properties for StatusNotifierItem.");
++          return;
++        }
++
+       g_variant_get (parameters, "(s)", &status);
+       exposed = sn_item_status_is_exposed (status);
+       g_free (status);