CVS commit: pkgsrc/devel/kf6-kcoreaddons

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Wed Apr  2 19:30:30 UTC 2025

Modified Files:
        pkgsrc/devel/kf6-kcoreaddons: Makefile distinfo
Added Files:
        pkgsrc/devel/kf6-kcoreaddons/patches:
            patch-src_lib_util_kmemoryinfo.cpp

Log Message:
kf6-kcoreaddons: Add NetBSD Memory info


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/kf6-kcoreaddons/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/kf6-kcoreaddons/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/kf6-kcoreaddons/patches/patch-src_lib_util_kmemoryinfo.cpp

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

Modified files:

Index: pkgsrc/devel/kf6-kcoreaddons/Makefile
diff -u pkgsrc/devel/kf6-kcoreaddons/Makefile:1.8 pkgsrc/devel/kf6-kcoreaddons/Makefile:1.9
--- pkgsrc/devel/kf6-kcoreaddons/Makefile:1.8   Thu Dec  5 09:43:20 2024
+++ pkgsrc/devel/kf6-kcoreaddons/Makefile       Wed Apr  2 19:30:30 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2024/12/05 09:43:20 markd Exp $
+# $NetBSD: Makefile,v 1.9 2025/04/02 19:30:30 markd Exp $
 
 DISTNAME=      kcoreaddons-${KF6VER}
+PKGREVISION=   1
 CATEGORIES=    devel
 
 HOMEPAGE=      https://community.kde.org/Frameworks

Index: pkgsrc/devel/kf6-kcoreaddons/distinfo
diff -u pkgsrc/devel/kf6-kcoreaddons/distinfo:1.3 pkgsrc/devel/kf6-kcoreaddons/distinfo:1.4
--- pkgsrc/devel/kf6-kcoreaddons/distinfo:1.3   Thu Dec  5 09:43:20 2024
+++ pkgsrc/devel/kf6-kcoreaddons/distinfo       Wed Apr  2 19:30:30 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2024/12/05 09:43:20 markd Exp $
+$NetBSD: distinfo,v 1.4 2025/04/02 19:30:30 markd Exp $
 
 BLAKE2s (kcoreaddons-6.8.0.tar.xz) = c8c9451d60a848e0e27eea99866aad9f1743b599af53709f4dc1ac0fae336988
 SHA512 (kcoreaddons-6.8.0.tar.xz) = b3e5af55445e7ef0bf68f792d512650e789e37e06118d0e9561149391c5bc223a7da5ef437dc1ecc4efcbcbd75a1d7db9e07afd6b3bcc284e2e9950157bc8479
@@ -7,3 +7,4 @@ SHA1 (patch-src_lib_caching_ksdclock.cpp
 SHA1 (patch-src_lib_caching_ksdcmapping__p.h) = 657e45acf9201f4b2611e9f0eadf925577b27855
 SHA1 (patch-src_lib_io_kautosavefile.cpp) = b50bd37139febd7e82f3087241107171161dec2a
 SHA1 (patch-src_lib_io_kfilesystemtype.cpp) = 67da0515cbcdad0d59c34a0ee922bf0af883377c
+SHA1 (patch-src_lib_util_kmemoryinfo.cpp) = ac5b62bfd6681c849ee82b3981be1a93e3bd612c

Added files:

Index: pkgsrc/devel/kf6-kcoreaddons/patches/patch-src_lib_util_kmemoryinfo.cpp
diff -u /dev/null pkgsrc/devel/kf6-kcoreaddons/patches/patch-src_lib_util_kmemoryinfo.cpp:1.1
--- /dev/null   Wed Apr  2 19:30:30 2025
+++ pkgsrc/devel/kf6-kcoreaddons/patches/patch-src_lib_util_kmemoryinfo.cpp     Wed Apr  2 19:30:30 2025
@@ -0,0 +1,46 @@
+$NetBSD: patch-src_lib_util_kmemoryinfo.cpp,v 1.1 2025/04/02 19:30:30 markd Exp $
+
+Add NetBSD Memory info
+
+--- src/lib/util/kmemoryinfo.cpp.orig  2024-11-02 15:46:04.000000000 +0000
++++ src/lib/util/kmemoryinfo.cpp
+@@ -39,6 +39,9 @@ Q_LOGGING_CATEGORY(LOG_KMEMORYINFO, "kf.
+      #include <stdlib.h>
+      #include <strings.h>
+      #include <unistd.h>
++#elif defined(Q_OS_NETBSD)
++     #include <sys/sysctl.h>
++     #include <uvm/uvm_extern.h>
+ #endif
+ // clang-format on
+ 
+@@ -502,6 +505,29 @@ bool KMemoryInfo::update()
+ 
+     return true;
+ }
++#elif defined(Q_OS_NETBSD)
++/*****************************************************************************
++ * NetBSD
++ ****************************************************************************/
++
++bool KMemoryInfo::update()
++{
++    int uvmexp_mib[] = {CTL_VM, VM_UVMEXP2};
++    struct uvmexp_sysctl uvmexp;
++    size_t size = sizeof(struct uvmexp_sysctl);
++    if (sysctl(uvmexp_mib, 2, &uvmexp, &size, NULL, 0) == -1) {
++        bzero(&uvmexp, sizeof(struct uvmexp_sysctl));
++        return false;
++    }
++    d->m_totalPhysical = uvmexp.npages * uvmexp.pagesize / 1024;
++    d->m_availablePhysical = (uvmexp.npages - uvmexp.wired) * uvmexp.pagesize / 1024;
++    d->m_freePhysical = uvmexp.free * uvmexp.pagesize / 1024;
++    d->m_totalSwapFile = uvmexp.swpages * uvmexp.pagesize / 1024;
++    d->m_freeSwapFile = (uvmexp.swpages - uvmexp.swpginuse) * uvmexp.pagesize / 1024;
++    d->m_cached = (uvmexp.anonpages + uvmexp.filepages + uvmexp.execpages) * uvmexp.pagesize / 1024;
++
++    return true;
++}
+ #else
+ /*****************************************************************************
+  * Unsupported platform