CVS commit: pkgsrc/sysutils/xfce4-systemload-plugin

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   martin
Date:           Sun Apr 30 22:09:38 UTC 2023

Modified Files:
        pkgsrc/sysutils/xfce4-systemload-plugin: Makefile distinfo
Added Files:
        pkgsrc/sysutils/xfce4-systemload-plugin/patches:
            patch-panel-plugin_network.cc

Log Message:
Fix compilation on architectures where gulong is not 64bit.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 pkgsrc/sysutils/xfce4-systemload-plugin/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/sysutils/xfce4-systemload-plugin/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/xfce4-systemload-plugin/patches/patch-panel-plugin_network.cc

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

Modified files:

Index: pkgsrc/sysutils/xfce4-systemload-plugin/Makefile
diff -u pkgsrc/sysutils/xfce4-systemload-plugin/Makefile:1.67 pkgsrc/sysutils/xfce4-systemload-plugin/Makefile:1.68
--- pkgsrc/sysutils/xfce4-systemload-plugin/Makefile:1.67       Sun Jan 29 21:17:52 2023
+++ pkgsrc/sysutils/xfce4-systemload-plugin/Makefile    Sun Apr 30 22:09:38 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.67 2023/01/29 21:17:52 ryoon Exp $
+# $NetBSD: Makefile,v 1.68 2023/04/30 22:09:38 martin Exp $
 
-PKGREVISION= 2
+PKGREVISION= 3
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 VERSION=       1.3.2

Index: pkgsrc/sysutils/xfce4-systemload-plugin/distinfo
diff -u pkgsrc/sysutils/xfce4-systemload-plugin/distinfo:1.20 pkgsrc/sysutils/xfce4-systemload-plugin/distinfo:1.21
--- pkgsrc/sysutils/xfce4-systemload-plugin/distinfo:1.20       Sun Jan  1 19:53:23 2023
+++ pkgsrc/sysutils/xfce4-systemload-plugin/distinfo    Sun Apr 30 22:09:38 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.20 2023/01/01 19:53:23 gutteridge Exp $
+$NetBSD: distinfo,v 1.21 2023/04/30 22:09:38 martin Exp $
 
 BLAKE2s (xfce4-systemload-plugin-1.3.2.tar.bz2) = 682040c26662c39574007a8f747bc7ec06c0c5932775f360cd825035dee64077
 SHA512 (xfce4-systemload-plugin-1.3.2.tar.bz2) = f432988f439e5fd7ada16b3e6eaa42b3351531ba3e2b63e2570387bf4d7e605ff9d5a97fde3f5f5eb323ff08aaf3c050f161a5768392b80aa99fabaabda82431
 Size (xfce4-systemload-plugin-1.3.2.tar.bz2) = 409767 bytes
+SHA1 (patch-panel-plugin_network.cc) = 8e296331721ebcec14948b8bcc997120d2ad65ae

Added files:

Index: pkgsrc/sysutils/xfce4-systemload-plugin/patches/patch-panel-plugin_network.cc
diff -u /dev/null pkgsrc/sysutils/xfce4-systemload-plugin/patches/patch-panel-plugin_network.cc:1.1
--- /dev/null   Sun Apr 30 22:09:38 2023
+++ pkgsrc/sysutils/xfce4-systemload-plugin/patches/patch-panel-plugin_network.cc       Sun Apr 30 22:09:38 2023
@@ -0,0 +1,26 @@
+$NetBSD: patch-panel-plugin_network.cc,v 1.1 2023/04/30 22:09:38 martin Exp $
+
+Fix type error.
+
+--- ./panel-plugin/network.cc.orig     2022-02-16 19:57:05.000000000 +0100
++++ ./panel-plugin/network.cc  2023-05-01 00:01:34.366940861 +0200
+@@ -116,15 +116,17 @@ read_netload (gulong *net, gulong *NTota
+ {
+     static guint64 bytes[2];
+     static gint64 time[2];
++    gulong val;
+ 
+     *net = 0;
+     *NTotal = 0;
+ 
+     time[1] = g_get_monotonic_time ();
+ 
+-    if (read_netload_proc (&bytes[1]) != 0)
+-        if (read_netload_libgtop (&bytes[1]) != 0)
++    if (read_netload_proc (&val) != 0)
++        if (read_netload_libgtop (&val) != 0)
+             return -1;
++    bytes[1] = val;
+ 
+     if (time[0] != 0 && G_LIKELY (time[1] > time[0]) && G_LIKELY (bytes[1] >= bytes[0]))
+     {