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

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

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Wed Apr 19 23:53:15 UTC 2023

Modified Files:
        pkgsrc/sysutils/xfce4-genmon-plugin: Makefile distinfo
        pkgsrc/sysutils/xfce4-genmon-plugin/patches:
            patch-panel-plugin_cmdspawn.c

Log Message:
xfce4-genmon-plugin: update to 4.2.0

4.2.0 (2023/04/16)
==================
- Add shell script to migrate settings to xfconf
- Fix GDK_Critical
- Fixed deskbar support. Issue #8
- Add Update Now menu option to right-click menu
- build: Add GLib requirement
- build: Fix autotools warnings
- Use "logo-icon-name" instead of "logo" in about dialog
- ***Migrate settings to xfconf
- Remove unused variable
- Fix intltool lock file bug in make distcheck
- Remove closing of standard file descriptors in the child process
- Update COPYING
- Add <css> tag support
- fixed .genmon_label and -gtk-icon transform bugs
- Fix code indentation and readalility
- Add support for single and multi-row panel layout options
- Added support for <css></css> XML tag. Changed default progressbar width to 4px
- automake: Modernize following other projects
- autoconf: Some updates
- Update `.gitignore`
- Add missing comments to code functions
- Fix indentation
- Translation updates


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/sysutils/xfce4-genmon-plugin/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/xfce4-genmon-plugin/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/sysutils/xfce4-genmon-plugin/patches/patch-panel-plugin_cmdspawn.c

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-genmon-plugin/Makefile
diff -u pkgsrc/sysutils/xfce4-genmon-plugin/Makefile:1.50 pkgsrc/sysutils/xfce4-genmon-plugin/Makefile:1.51
--- pkgsrc/sysutils/xfce4-genmon-plugin/Makefile:1.50   Sun Jan 29 21:17:52 2023
+++ pkgsrc/sysutils/xfce4-genmon-plugin/Makefile        Wed Apr 19 23:53:15 2023
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2023/01/29 21:17:52 ryoon Exp $
+# $NetBSD: Makefile,v 1.51 2023/04/19 23:53:15 gutteridge Exp $
 
-PKGREVISION= 4
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-VERSION=       4.1.1
+VERSION=       4.2.0
 DISTNAME=      xfce4-genmon-plugin-${VERSION}
 CATEGORIES=    sysutils
 MASTER_SITES=  https://archive.xfce.org/src/panel-plugins/xfce4-genmon-plugin/${VERSION:R}/
@@ -13,5 +12,6 @@ COMMENT=      Xfce general purpose monitor pl
 
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/xfce4-genmon-plugin/distinfo
diff -u pkgsrc/sysutils/xfce4-genmon-plugin/distinfo:1.10 pkgsrc/sysutils/xfce4-genmon-plugin/distinfo:1.11
--- pkgsrc/sysutils/xfce4-genmon-plugin/distinfo:1.10   Tue Nov 30 15:03:49 2021
+++ pkgsrc/sysutils/xfce4-genmon-plugin/distinfo        Wed Apr 19 23:53:15 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2021/11/30 15:03:49 gutteridge Exp $
+$NetBSD: distinfo,v 1.11 2023/04/19 23:53:15 gutteridge Exp $
 
-BLAKE2s (xfce4-genmon-plugin-4.1.1.tar.bz2) = 0e3d73ed47713c78300a5f73382507f867f2749f4b3c6d70622afa85a21a4b3b
-SHA512 (xfce4-genmon-plugin-4.1.1.tar.bz2) = 663dabcdfb9d85325be5bc000f44e6cd61f78143e6d49bc7c481d14eccc3601408e2a7bed1276de5fcb24e75af66d8765fd0dc373dc8b82c1118fb5da2673c03
-Size (xfce4-genmon-plugin-4.1.1.tar.bz2) = 400772 bytes
-SHA1 (patch-panel-plugin_cmdspawn.c) = bbec3bfd8cbad3ac50c763456d46c32e33a1239d
+BLAKE2s (xfce4-genmon-plugin-4.2.0.tar.bz2) = 5730fc15cc90efe947147f255e8f14efb24663b872c2292f2123e8cf14dee8ae
+SHA512 (xfce4-genmon-plugin-4.2.0.tar.bz2) = e0166e879244d039097f46526782f2232bea6a94eb260f2558a6daf62e82a5aaa68a44749eb95d3d7c212155e36887fca8b41fb558427a1812c614569b4c11b3
+Size (xfce4-genmon-plugin-4.2.0.tar.bz2) = 421113 bytes
+SHA1 (patch-panel-plugin_cmdspawn.c) = a469940a17ef5340e289df807742a704cdd7e8a3

Index: pkgsrc/sysutils/xfce4-genmon-plugin/patches/patch-panel-plugin_cmdspawn.c
diff -u pkgsrc/sysutils/xfce4-genmon-plugin/patches/patch-panel-plugin_cmdspawn.c:1.4 pkgsrc/sysutils/xfce4-genmon-plugin/patches/patch-panel-plugin_cmdspawn.c:1.5
--- pkgsrc/sysutils/xfce4-genmon-plugin/patches/patch-panel-plugin_cmdspawn.c:1.4       Tue Nov 30 15:03:49 2021
+++ pkgsrc/sysutils/xfce4-genmon-plugin/patches/patch-panel-plugin_cmdspawn.c   Wed Apr 19 23:53:15 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-panel-plugin_cmdspawn.c,v 1.4 2021/11/30 15:03:49 gutteridge Exp $
+$NetBSD: patch-panel-plugin_cmdspawn.c,v 1.5 2023/04/19 23:53:15 gutteridge Exp $
 
 Fix SunOS build.
 
---- panel-plugin/cmdspawn.c.orig       2017-10-29 00:52:07.000000000 +0000
+--- panel-plugin/cmdspawn.c.orig       2023-04-16 22:44:15.000000000 +0000
 +++ panel-plugin/cmdspawn.c
 @@ -24,6 +24,7 @@
  /* Posix-compliance to make sure that only the calling thread is
@@ -18,9 +18,9 @@ Fix SunOS build.
  #endif
 +#endif
  
- #include "cmdspawn.h"
- 
-@@ -59,12 +61,12 @@ char *genmon_Spawn (char **argv, int wai
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+@@ -58,12 +60,12 @@ char *genmon_Spawn (char **argv, int wai
   /* Spawn a command and capture its output from stdout or stderr */
   /* Return allocated string on success, otherwise NULL */
  {
@@ -36,14 +36,16 @@ Fix SunOS build.
      int             status;
      int             i, j, k;
      char           *str = NULL;
-@@ -73,19 +75,19 @@ char *genmon_Spawn (char **argv, int wai
+@@ -73,20 +75,20 @@ char *genmon_Spawn (char **argv, int wai
          fprintf (stderr, "Spawn() error: No parameters passed!\n");
          return (NULL);
      }
 -    for (i = 0; i < OUT_ERR; i++)
 +    for (i = 0; i < GENMON_OUT_ERR; i++)
          pipe (aaiPipe[i]);
-     switch (pid = fork ()) {
+ 
+     switch (pid = fork ()) 
+     {
          case -1:
              perror ("fork()");
 -            for (i = 0; i < OUT_ERR; i++)
@@ -52,14 +54,13 @@ Fix SunOS build.
                      close (aaiPipe[i][j]);
              return (NULL);
          case 0:
-             close(0); /* stdin is not used in child */
              /* Redirect stdout/stderr to associated pipe's write-ends */
--            for (i = 0; i < OUT_ERR; i++) {
-+            for (i = 0; i < GENMON_OUT_ERR; i++) {
+-            for (i = 0; i < OUT_ERR; i++) 
++            for (i = 0; i < GENMON_OUT_ERR; i++) 
+             {
                  j = i + 1; // stdout/stderr file descriptor
-                 close (j);
                  k = dup2 (aaiPipe[i][WR], j);
-@@ -100,7 +102,7 @@ char *genmon_Spawn (char **argv, int wai
+@@ -102,7 +104,7 @@ char *genmon_Spawn (char **argv, int wai
          exit (-1);
      }
  
@@ -68,12 +69,13 @@ Fix SunOS build.
          close (aaiPipe[i][WR]); /* close write end of pipes in parent */
  
      /* Wait for child completion */
-@@ -113,16 +115,16 @@ char *genmon_Spawn (char **argv, int wai
+@@ -116,17 +118,17 @@ char *genmon_Spawn (char **argv, int wai
          }
  
          /* Read stdout/stderr pipes' read-ends */
--        for (i = 0; i < OUT_ERR; i++) {
-+        for (i = 0; i < GENMON_OUT_ERR; i++) {
+-        for (i = 0; i < OUT_ERR; i++) 
++        for (i = 0; i < GENMON_OUT_ERR; i++) 
+         {
              aoPoll[i].fd = aaiPipe[i][RD];
              aoPoll[i].events = POLLIN;
              aoPoll[i].revents = 0;
@@ -89,7 +91,7 @@ Fix SunOS build.
              goto End;
  
          j = 0;
-@@ -143,7 +145,7 @@ char *genmon_Spawn (char **argv, int wai
+@@ -148,7 +150,7 @@ char *genmon_Spawn (char **argv, int wai
  
      End:
      /* Close read end of pipes */