CVS commit: pkgsrc/sysutils/xfce4-taskmanager

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

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Fri Dec 10 00:00:02 UTC 2021

Modified Files:
        pkgsrc/sysutils/xfce4-taskmanager: Makefile PLIST distinfo
        pkgsrc/sysutils/xfce4-taskmanager/files: task-manager-netbsd.c

Log Message:
xfce4-taskmanager: update to 1.4.2

Change log:

1.4.2
======
- Ellipsize memory and swap labels (Fixes #32)

1.4.1
======
- Replace AC_PROG_LIBTOOL with IT_PROG_INTLTOOL
- Simplify "query-tooltip" signal handler
- statusbar: Use better color that works well with both light and dark
  themes (!17)
- Fix tooltip markdown issue
- Create notification area icon only if needed (Bug #25)

1.4.0
======
- Drop Gtk2 support
- Add support for MemAvailable (!10)
- statusbar: Use color with better contrast for dark themes
- Fix: some times processes are not removed from the list
- Add tooltip to show full command
- Add application icon (Issue #23)
- Replace appfinder icon with edit-find (Fixes #23)
- Replace old icon name with utilities-terminal #23
- Replace old icon name with system-run #23
- Always show memory usage in bytes and percent (Fixes #24)
- Improve comment in desktop file (Fixes #20)
- Add basic GitLab pipeline
- Add README.md
- Update libwnck and xmu deps in README
- Remove GKSU leftovers
- Remove unused url_hook_about_dialog function
- Replace deprecated gtk_menu_popup
- Fix GTimeVal deprecation warning
- Fix indentation
- Update .gitignore
- AC_CONFIG_MACRO_DIR → AC_CONFIG_MACRO_DIRS
- Bump minimal xdt version
- Bug #16717: Move from exo-csource to xdt-csource
- Translation Updates:
  Albanian, Arabic, Armenian (Armenia), Asturian, Basque, Belarusian,
  Bulgarian, Catalan, Chinese (China), Chinese (Hong Kong), Chinese
  (Taiwan), Croatian, Czech, Danish, Dutch, Eastern Armenian, English
  (Australia), English (United Kingdom), Estonian, Finnish, French,
  Galician, German, Greek, Hebrew, Hungarian, Icelandic, Indonesian,
  Interlingue, Italian, Japanese, Kazakh, Korean, Lithuanian, Malay,
  Norwegian Bokmål, Occitan (post 1500), Polish, Portuguese,
  Portuguese (Brazil), Russian, Serbian, Slovak, Spanish, Swedish,
  Telugu, Thai, Turkish, Ukrainian, Uyghur


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/sysutils/xfce4-taskmanager/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/xfce4-taskmanager/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/xfce4-taskmanager/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/xfce4-taskmanager/files/task-manager-netbsd.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-taskmanager/Makefile
diff -u pkgsrc/sysutils/xfce4-taskmanager/Makefile:1.24 pkgsrc/sysutils/xfce4-taskmanager/Makefile:1.25
--- pkgsrc/sysutils/xfce4-taskmanager/Makefile:1.24     Wed Dec  8 16:06:41 2021
+++ pkgsrc/sysutils/xfce4-taskmanager/Makefile  Fri Dec 10 00:00:02 2021
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2021/12/08 16:06:41 adam Exp $
+# $NetBSD: Makefile,v 1.25 2021/12/10 00:00:02 gutteridge Exp $
 
-PKGREVISION= 3
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-VERSION=       1.2.3
+VERSION=       1.4.2
 DISTNAME=      xfce4-taskmanager-${VERSION}
 CATEGORIES=    sysutils
 MASTER_SITES=  https://archive.xfce.org/src/apps/xfce4-taskmanager/${VERSION:R}/
@@ -11,18 +10,18 @@ MASTER_SITES=       https://archive.xfce.org/s
 HOMEPAGE=      https://goodies.xfce.org/projects/applications/xfce4-taskmanager
 COMMENT=       Xfce task manager
 
-# patch needs libkvm.
+# NetBSD support file needs libkvm.
 .include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} != "Linux"
+.if ${OPSYS} == "NetBSD"
 LDFLAGS+=      -lkvm
 .endif
 
-CONFIGURE_ARGS+=       --disable-gtk2
 .if ${OPSYS} == "NetBSD"
 pre-configure:
        ${CP} ${FILESDIR}/task-manager-netbsd.c ${WRKSRC}/src/task-manager-bsd.c
 .endif
 
+.include "../../devel/libwnck3/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libxfce4ui/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"

Index: pkgsrc/sysutils/xfce4-taskmanager/PLIST
diff -u pkgsrc/sysutils/xfce4-taskmanager/PLIST:1.4 pkgsrc/sysutils/xfce4-taskmanager/PLIST:1.5
--- pkgsrc/sysutils/xfce4-taskmanager/PLIST:1.4 Sat Apr 11 04:24:55 2020
+++ pkgsrc/sysutils/xfce4-taskmanager/PLIST     Fri Dec 10 00:00:02 2021
@@ -1,9 +1,13 @@
-@comment $NetBSD: PLIST,v 1.4 2020/04/11 04:24:55 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/12/10 00:00:02 gutteridge Exp $
 bin/xfce4-taskmanager
 share/applications/xfce4-taskmanager.desktop
+share/icons/hicolor/128x128/apps/org.xfce.taskmanager.png
 share/icons/hicolor/16x16/actions/xc_crosshair.png
+share/icons/hicolor/16x16/apps/org.xfce.taskmanager.png
 share/icons/hicolor/24x24/actions/xc_crosshair.png
+share/icons/hicolor/48x48/apps/org.xfce.taskmanager.png
 share/icons/hicolor/scalable/actions/xc_crosshair.svg
+share/icons/hicolor/scalable/apps/org.xfce.taskmanager.svg
 share/locale/ar/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/ast/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/be/LC_MESSAGES/xfce4-taskmanager.mo
@@ -16,6 +20,7 @@ share/locale/el/LC_MESSAGES/xfce4-taskma
 share/locale/en_AU/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/en_GB/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/es/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/et/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/eu/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/fi/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/fr/LC_MESSAGES/xfce4-taskmanager.mo
@@ -24,6 +29,7 @@ share/locale/he/LC_MESSAGES/xfce4-taskma
 share/locale/hr/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/hu/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/hy_AM/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/hye/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/id/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/ie/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/is/LC_MESSAGES/xfce4-taskmanager.mo

Index: pkgsrc/sysutils/xfce4-taskmanager/distinfo
diff -u pkgsrc/sysutils/xfce4-taskmanager/distinfo:1.8 pkgsrc/sysutils/xfce4-taskmanager/distinfo:1.9
--- pkgsrc/sysutils/xfce4-taskmanager/distinfo:1.8      Tue Oct 26 11:20:27 2021
+++ pkgsrc/sysutils/xfce4-taskmanager/distinfo  Fri Dec 10 00:00:02 2021
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 11:20:27 nia Exp $
+$NetBSD: distinfo,v 1.9 2021/12/10 00:00:02 gutteridge Exp $
 
-BLAKE2s (xfce4-taskmanager-1.2.3.tar.bz2) = 5b8bdbd4295c65eade7b1369544f1fc1c0da6b574fdb796d0e15fb590b6eac97
-SHA512 (xfce4-taskmanager-1.2.3.tar.bz2) = e3fbc89e4a1f6d3cd2f03388626b86129244c9d16092c74db18459efcaffc401a4aaab0588d9b96771f609bf5b17fa0a923a17d598e148b6d71efbb08aa5faf3
-Size (xfce4-taskmanager-1.2.3.tar.bz2) = 406223 bytes
+BLAKE2s (xfce4-taskmanager-1.4.2.tar.bz2) = d3548ad9e3c7099d437a595a945b4fb0c6e1c6734474fc86939c260a4ff1a749
+SHA512 (xfce4-taskmanager-1.4.2.tar.bz2) = cd7f26c7ab0e0557be52155d58c677258da8479c2a09b0e1dd4006fe0ecb2a3c82d68ecdf72c10e8b8977eac5a158fcb606027229e973edb6ea7570d040c2444
+Size (xfce4-taskmanager-1.4.2.tar.bz2) = 414315 bytes

Index: pkgsrc/sysutils/xfce4-taskmanager/files/task-manager-netbsd.c
diff -u pkgsrc/sysutils/xfce4-taskmanager/files/task-manager-netbsd.c:1.1 pkgsrc/sysutils/xfce4-taskmanager/files/task-manager-netbsd.c:1.2
--- pkgsrc/sysutils/xfce4-taskmanager/files/task-manager-netbsd.c:1.1   Sun Jan 20 21:28:45 2019
+++ pkgsrc/sysutils/xfce4-taskmanager/files/task-manager-netbsd.c       Fri Dec 10 00:00:02 2021
@@ -147,7 +147,8 @@ gboolean get_cpu_usage (gushort *cpu_cou
 /* vmtotal values in #pg */
 #define pagetok(nb) ((nb) * (getpagesize()))
 
-gboolean get_memory_usage (guint64 *memory_total, guint64 *memory_free,
+gboolean get_memory_usage (guint64 *memory_total,
+               guint64 *memory_available, guint64 *memory_free,
                guint64 *memory_cache, guint64 *memory_buffers,
                guint64 *swap_total, guint64 *swap_free)
 {
@@ -173,6 +174,7 @@ gboolean get_memory_usage (guint64 *memo
        *memory_free = pagetok((guint64)vmtotal.t_free);
        *memory_cache = 0;
        *memory_buffers = pagetok(vmtotal.t_rm - vmtotal.t_arm);
+       *memory_available = *memory_free + *memory_cache + *memory_buffers;
 
        /* get swap stats */
        if ((nswap = swapctl(SWAP_NSWAP, 0, 0)) == 0)