[pkgsrc/trunk]: pkgsrc/sysutils/xfce4-diskperf-plugin xfce4-diskperf-plugin: ...

[gutteridge <gutteridge%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/69e0a8e45d38
branches:  trunk
changeset: 375215:69e0a8e45d38
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Thu Mar 10 01:31:17 2022 +0000

description:
xfce4-diskperf-plugin: update to 2.7.0

Change log:

2.7.0 (2022-03-03)
=====
- Enable high-frequency tooltip updates
- Remove rounding to multiples of 5 MiB/s
- Change default maximum I/O bandwidth from 40 MiB/s to 1024 MiB/s
- Adjust tooltip spacing
- Update and sort the list of authors
- Bump required GTK+ version to 3.16
- Update README
- Reformat copyright notices
- Update configuration files
- Fix compilation warnings
- Code cleanups
- Translation Updates:
  Albanian, Arabic, Armenian (Armenia), Basque, Belarusian, Bulgarian,
  Catalan, Chinese (China), Chinese (Taiwan), Croatian, Czech, Danish,
  Dutch, Eastern Armenian, English (Australia), English (Canada),
  English (United Kingdom), French, Galician, German, Greek, Hebrew,
  Hungarian, Icelandic, Indonesian, Italian, Japanese, Korean, Latvian,
  Lithuanian, Malay, Norwegian Bokmål, Occitan (post 1500), Panjabi
  (Punjabi), Polish, Portuguese, Portuguese (Brazil), Russian, Serbian,
  Slovak, Slovenian, Spanish, Swedish, Thai, Turkish, Ukrainian, Urdu,
  Urdu (Pakistan), Uyghur

diffstat:

 sysutils/xfce4-diskperf-plugin/Makefile                             |    6 +-
 sysutils/xfce4-diskperf-plugin/distinfo                             |   10 +-
 sysutils/xfce4-diskperf-plugin/patches/patch-panel-plugin_devperf.c |  117 +++++----
 3 files changed, 68 insertions(+), 65 deletions(-)

diffs (181 lines):

diff -r 6488dece1eb2 -r 69e0a8e45d38 sysutils/xfce4-diskperf-plugin/Makefile
--- a/sysutils/xfce4-diskperf-plugin/Makefile   Wed Mar 09 23:29:51 2022 +0000
+++ b/sysutils/xfce4-diskperf-plugin/Makefile   Thu Mar 10 01:31:17 2022 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.62 2021/12/17 00:41:59 gutteridge Exp $
+# $NetBSD: Makefile,v 1.63 2022/03/10 01:31:17 gutteridge Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-DISTNAME=      xfce4-diskperf-plugin-2.6.3
+DISTNAME=      xfce4-diskperf-plugin-2.7.0
 CATEGORIES=    sysutils
-MASTER_SITES=  https://archive.xfce.org/src/panel-plugins/xfce4-diskperf-plugin/2.6/
+MASTER_SITES=  https://archive.xfce.org/src/panel-plugins/xfce4-diskperf-plugin/2.7/
 
 HOMEPAGE=      https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin
 COMMENT=       Xfce disk performance plugin
diff -r 6488dece1eb2 -r 69e0a8e45d38 sysutils/xfce4-diskperf-plugin/distinfo
--- a/sysutils/xfce4-diskperf-plugin/distinfo   Wed Mar 09 23:29:51 2022 +0000
+++ b/sysutils/xfce4-diskperf-plugin/distinfo   Thu Mar 10 01:31:17 2022 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2021/12/17 00:41:59 gutteridge Exp $
+$NetBSD: distinfo,v 1.16 2022/03/10 01:31:17 gutteridge Exp $
 
-BLAKE2s (xfce4-diskperf-plugin-2.6.3.tar.bz2) = 2f9d20808369abee652d127573dfc4eca997e8395228479f46123659458232b4
-SHA512 (xfce4-diskperf-plugin-2.6.3.tar.bz2) = fb7ffeaca14f67bb8a2423529f7040d3e51a0184a552f4636acfb4aec914da5fef95db2c710cad8cb1a3b96ef9abc308ad072b03f6e2ccc49793c0edb73dc116
-Size (xfce4-diskperf-plugin-2.6.3.tar.bz2) = 384330 bytes
-SHA1 (patch-panel-plugin_devperf.c) = 05a0ad3cbc273150d1665d4b796b68ad16423863
+BLAKE2s (xfce4-diskperf-plugin-2.7.0.tar.bz2) = 9fa8fbc2e45d76c397ad4350d4ab9be50a22eec1b6a0ef7e6babdffb49e1588d
+SHA512 (xfce4-diskperf-plugin-2.7.0.tar.bz2) = 8d9dde5534ff2ff99955e7d19b9fd1a0ca6e481f978462578c246c30febc9c2d16c97362014c05b53bd2e895199dbfaa2bdee459b84de3df94f86791d9b07b4f
+Size (xfce4-diskperf-plugin-2.7.0.tar.bz2) = 342471 bytes
+SHA1 (patch-panel-plugin_devperf.c) = 367f5fdc88f1efdf58f7eb685491d7067a1b0296
diff -r 6488dece1eb2 -r 69e0a8e45d38 sysutils/xfce4-diskperf-plugin/patches/patch-panel-plugin_devperf.c
--- a/sysutils/xfce4-diskperf-plugin/patches/patch-panel-plugin_devperf.c       Wed Mar 09 23:29:51 2022 +0000
+++ b/sysutils/xfce4-diskperf-plugin/patches/patch-panel-plugin_devperf.c       Thu Mar 10 01:31:17 2022 +0000
@@ -1,85 +1,88 @@
-$NetBSD: patch-panel-plugin_devperf.c,v 1.2 2015/06/29 11:16:48 youri Exp $
+$NetBSD: patch-panel-plugin_devperf.c,v 1.3 2022/03/10 01:31:17 gutteridge Exp $
 
 Fix NetBSD support.
---- panel-plugin/devperf.c.orig        2014-09-11 13:45:46.000000000 +0000
+
+--- panel-plugin/devperf.c.orig        2022-03-03 20:02:02.000000000 +0000
 +++ panel-plugin/devperf.c
-@@ -335,21 +335,39 @@ int DevGetPerfData (const void *p_pvDevi
-       const char     *device = (const char *) p_pvDevice;
-       struct timeval tv;
-       size_t size, i, ndrives;
+@@ -325,21 +325,39 @@ int DevGetPerfData (const void *p_pvDevi
+     const char     *device = (const char *) p_pvDevice;
+     struct timeval tv;
+     size_t size, i, ndrives;
+-    struct disk_sysctl *drives, drive;
 +#ifdef HW_DISKSTATS
-       struct disk_sysctl *drives, drive;
++    struct disk_sysctl *drives, drive;
 +#else
-+      struct io_sysctl *drives, drive;
++    struct io_sysctl *drives, drive;
 +#endif
-       int mib[3];
+     int mib[3];
  
-       mib[0] = CTL_HW;
+     mib[0] = CTL_HW;
+-    mib[1] = HW_DISKSTATS;
+-    mib[2] = sizeof(struct disk_sysctl);
 +#ifdef HW_DISKSTATS
-       mib[1] = HW_DISKSTATS;
-       mib[2] = sizeof(struct disk_sysctl);
++    mib[1] = HW_DISKSTATS;
++    mib[2] = sizeof(struct disk_sysctl);
 +#else
-+      mib[1] = HW_IOSTATS;
-+      mib[2] = sizeof(struct io_sysctl);
++    mib[1] = HW_IOSTATS;
++    mib[2] = sizeof(struct io_sysctl);
 +#endif
 +
-       if (sysctl(mib, 3, NULL, &size, NULL, 0) == -1)
-               return(-1);
+     if (sysctl(mib, 3, NULL, &size, NULL, 0) == -1)
+         return -1;
+-    ndrives = size / sizeof(struct disk_sysctl);
 +#ifdef HW_DISKSTATS
-       ndrives = size / sizeof(struct disk_sysctl);
++    ndrives = size / sizeof(struct disk_sysctl);
 +#else
-+      ndrives = size / sizeof(struct io_sysctl);
++    ndrives = size / sizeof(struct io_sysctl);
 +#endif
-       drives = malloc(size);
-       if (sysctl(mib, 3, drives, &size, NULL, 0) == -1)
-               return(-1);
+     drives = malloc(size);
+     if (sysctl(mib, 3, drives, &size, NULL, 0) == -1)
+         return -1;
  
-       for (i = 0; i < ndrives; i++) {
+     for (i = 0; i < ndrives; i++) {
+-        if (strcmp(drives[i].dk_name, device) == 0) {
 +#ifdef HW_DISKSTATS
-               if (strcmp(drives[i].dk_name, device) == 0) {
++        if (strcmp(drives[i].dk_name, device) == 0) {
 +#else
-+              if (strcmp(drives[i].name, device) == 0) {
++        if (strcmp(drives[i].name, device) == 0) {
 +#endif
-                       drive = drives[i];
-                       break;
-               }
-@@ -363,13 +381,18 @@ int DevGetPerfData (const void *p_pvDevi
-       gettimeofday (&tv, 0);
-       perf->timestamp_ns = (uint64_t)1000ull * 1000ull * 1000ull *
-               tv.tv_sec + 1000ull * tv.tv_usec;
+             drive = drives[i];
+             break;
+         }
+@@ -352,13 +370,18 @@ int DevGetPerfData (const void *p_pvDevi
+ 
+     gettimeofday (&tv, 0);
+     perf->timestamp_ns = (uint64_t)1000ull * 1000ull * 1000ull * tv.tv_sec + 1000ull * tv.tv_usec;
 -#if defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106110000)
 +#ifdef HW_DISKSTATS
-+# if defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106110000)
-   /* NetBSD < 1.6K does not have separate read/write statistics. */
-       perf->rbytes = drive.dk_bytes;
-       perf->wbytes = drive.dk_bytes;
++#  if defined(__NetBSD_Version__) && (__NetBSD_Version__ < 106110000)
+     /* NetBSD < 1.6K does not have separate read/write statistics. */
+     perf->rbytes = drive.dk_bytes;
+     perf->wbytes = drive.dk_bytes;
 -#else
-+# else
-       perf->rbytes = drive.dk_rbytes;
-       perf->wbytes = drive.dk_wbytes;
-+# endif
++#  else
+     perf->rbytes = drive.dk_rbytes;
+     perf->wbytes = drive.dk_wbytes;
++#  endif
 +#else
-+      perf->rbytes = drive.rbytes;
-+      perf->wbytes = drive.wbytes;
++    perf->rbytes = drive.rbytes;
++    perf->wbytes = drive.wbytes;
  #endif
  
-   /*
-@@ -377,10 +400,18 @@ int DevGetPerfData (const void *p_pvDevi
-    * time separatly.
-    *                                              -- Benedikt
-    */
+     /*
+@@ -366,9 +389,15 @@ int DevGetPerfData (const void *p_pvDevi
+      * time separatly.
+      *                                              -- Benedikt
+      */
 +#ifdef HW_DISKSTATS
-   perf->qlen = drive.dk_xfer;
-       perf->rbusy_ns = ((uint64_t)1000ull * 1000ull * 1000ull * drive.dk_time_sec
-     + 1000ull * drive.dk_time_usec) / 2ull;
-   perf->wbusy_ns = perf->rbusy_ns;
+     perf->qlen = drive.dk_xfer;
+     perf->rbusy_ns = ((uint64_t)1000ull * 1000ull * 1000ull * drive.dk_time_sec
+         + 1000ull * drive.dk_time_usec) / 2ull;
 +#else
-+  perf->qlen = drive.xfer;
-+      perf->rbusy_ns = ((uint64_t)1000ull * 1000ull * 1000ull * drive.time_sec
-+    + 1000ull * drive.time_usec) / 2ull;
-+  perf->wbusy_ns = perf->rbusy_ns;
-+
++    perf->qlen = drive.xfer;
++    perf->rbusy_ns = ((uint64_t)1000ull * 1000ull * 1000ull * drive.time_sec
++        + 1000ull * drive.time_usec) / 2ull;
 +#endif
+     perf->wbusy_ns = perf->rbusy_ns;
  
-       return(0);
- }
+     return 0;