kinfocenter: update to 5.18.5

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: kinfocenter: update to 5.18.5
From: Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Date: Sat, 06 Mar 2021 10:21:26 +0000
Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Sat Mar 6 23:21:26 2021 +1300
Changeset:	4ea384233318337fe02c65bf7378b1ece5ba211d

Modified Files:
	kinfocenter/Makefile
	kinfocenter/PLIST
	kinfocenter/distinfo
	kinfocenter/patches/patch-Modules_base_info__netbsd.cpp
Added Files:
	kinfocenter/patches/patch-Modules_about-distro_src_Module.cpp
	kinfocenter/patches/patch-Modules_memory_base.h
	kinfocenter/patches/patch-Modules_pci_kpci.cpp
	kinfocenter/patches/patch-cmake_FindPCIUTILS.cmake

Log Message:
kinfocenter: update to 5.18.5

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4ea384233318337fe02c65bf7378b1ece5ba211d

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

diffstat:
 kinfocenter/Makefile                               |  1 -
 kinfocenter/PLIST                                  | 17 ++++++------
 kinfocenter/distinfo                               | 14 ++++++----
 .../patch-Modules_about-distro_src_Module.cpp      | 31 ++++++++++++++++++++++
 .../patches/patch-Modules_base_info__netbsd.cpp    | 29 ++++++++++++++++++--
 kinfocenter/patches/patch-Modules_memory_base.h    | 16 +++++++++++
 kinfocenter/patches/patch-Modules_pci_kpci.cpp     | 15 +++++++++++
 kinfocenter/patches/patch-cmake_FindPCIUTILS.cmake | 18 +++++++++++++
 8 files changed, 125 insertions(+), 16 deletions(-)

diffs:
diff --git a/kinfocenter/Makefile b/kinfocenter/Makefile
index c3182cb324..cbd99a6a88 100644
--- a/kinfocenter/Makefile
+++ b/kinfocenter/Makefile
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	kinfocenter-${PLASMAVER}
-PKGREVISION=	1
 CATEGORIES=	sysutils
 
 HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
diff --git a/kinfocenter/PLIST b/kinfocenter/PLIST
index 1bc8322452..d6fe5ad20d 100644
--- a/kinfocenter/PLIST
+++ b/kinfocenter/PLIST
@@ -19,6 +19,8 @@ share/doc/HTML/de/kinfocenter/index.docbook
 share/doc/HTML/en/kinfocenter/index.cache.bz2
 share/doc/HTML/en/kinfocenter/index.docbook
 share/doc/HTML/en/kinfocenter/kinfocenter.png
+share/doc/HTML/id/kinfocenter/index.cache.bz2
+share/doc/HTML/id/kinfocenter/index.docbook
 share/doc/HTML/it/kinfocenter/index.cache.bz2
 share/doc/HTML/it/kinfocenter/index.docbook
 share/doc/HTML/nl/kinfocenter/index.cache.bz2
@@ -78,6 +80,9 @@ share/locale/ar/LC_MESSAGES/kcmsamba.mo
 share/locale/ar/LC_MESSAGES/kcmusb.mo
 share/locale/ar/LC_MESSAGES/kcmview1394.mo
 share/locale/ar/LC_MESSAGES/kinfocenter.mo
+share/locale/ast/LC_MESSAGES/kcm-about-distro.mo
+share/locale/ast/LC_MESSAGES/kcmusb.mo
+share/locale/ast/LC_MESSAGES/kinfocenter.mo
 share/locale/be/LC_MESSAGES/kcminfo.mo
 share/locale/be/LC_MESSAGES/kcmopengl.mo
 share/locale/be/LC_MESSAGES/kcmsamba.mo
@@ -563,6 +568,9 @@ share/locale/mk/LC_MESSAGES/kcmsamba.mo
 share/locale/mk/LC_MESSAGES/kcmusb.mo
 share/locale/mk/LC_MESSAGES/kcmview1394.mo
 share/locale/mk/LC_MESSAGES/kinfocenter.mo
+share/locale/ml/LC_MESSAGES/kcm-about-distro.mo
+share/locale/ml/LC_MESSAGES/kcm_energyinfo.mo
+share/locale/ml/LC_MESSAGES/kcm_fileindexermonitor.mo
 share/locale/ml/LC_MESSAGES/kcm_memory.mo
 share/locale/ml/LC_MESSAGES/kcm_pci.mo
 share/locale/ml/LC_MESSAGES/kcmdevinfo.mo
@@ -651,14 +659,6 @@ share/locale/oc/LC_MESSAGES/kcmsamba.mo
 share/locale/oc/LC_MESSAGES/kcmusb.mo
 share/locale/oc/LC_MESSAGES/kcmview1394.mo
 share/locale/oc/LC_MESSAGES/kinfocenter.mo
-share/locale/or/LC_MESSAGES/kcm_memory.mo
-share/locale/or/LC_MESSAGES/kcm_pci.mo
-share/locale/or/LC_MESSAGES/kcminfo.mo
-share/locale/or/LC_MESSAGES/kcmopengl.mo
-share/locale/or/LC_MESSAGES/kcmsamba.mo
-share/locale/or/LC_MESSAGES/kcmusb.mo
-share/locale/or/LC_MESSAGES/kcmview1394.mo
-share/locale/or/LC_MESSAGES/kinfocenter.mo
 share/locale/pa/LC_MESSAGES/kcm-about-distro.mo
 share/locale/pa/LC_MESSAGES/kcm_energyinfo.mo
 share/locale/pa/LC_MESSAGES/kcm_memory.mo
@@ -865,6 +865,7 @@ share/locale/te/LC_MESSAGES/kcmsamba.mo
 share/locale/te/LC_MESSAGES/kcmusb.mo
 share/locale/te/LC_MESSAGES/kcmview1394.mo
 share/locale/te/LC_MESSAGES/kinfocenter.mo
+share/locale/tg/LC_MESSAGES/kcm_energyinfo.mo
 share/locale/tg/LC_MESSAGES/kcm_memory.mo
 share/locale/tg/LC_MESSAGES/kcm_pci.mo
 share/locale/tg/LC_MESSAGES/kcmdevinfo.mo
diff --git a/kinfocenter/distinfo b/kinfocenter/distinfo
index 3a3154630d..705d596c58 100644
--- a/kinfocenter/distinfo
+++ b/kinfocenter/distinfo
@@ -1,8 +1,12 @@
 $NetBSD$
 
-SHA1 (kinfocenter-5.16.4.tar.xz) = e33610ef9c869dfe83f611ff6bf050d98bf5f6c0
-RMD160 (kinfocenter-5.16.4.tar.xz) = 977e0bb854f5a14caa319d6aa382adb849235752
-SHA512 (kinfocenter-5.16.4.tar.xz) = 407686f5bba77c5907e550e0c83fb6dcdb2095c87ba9654f1483eb784847a67f58c26c9ceaed1844353ab495c01326f6bf840eb9c20f11a20dc48bed99e1c732
-Size (kinfocenter-5.16.4.tar.xz) = 1322888 bytes
-SHA1 (patch-Modules_base_info__netbsd.cpp) = 3c4c886757d473518874a3d79f58cbb4ca365fc0
+SHA1 (kinfocenter-5.18.5.tar.xz) = 1c5159b01e77ed92a338731651aa1fbc0df18005
+RMD160 (kinfocenter-5.18.5.tar.xz) = 442b6bb1e9fa18bfb9e253e3155bc9d3862e8903
+SHA512 (kinfocenter-5.18.5.tar.xz) = c9896870a92b3349c262698c4902b98f6aa12523c1757890367d1e277954b0ac7b040bbff0095f7a6abf47e6a31b008070e3a461713c7cf4a591617b76c37886
+Size (kinfocenter-5.18.5.tar.xz) = 1256744 bytes
+SHA1 (patch-Modules_about-distro_src_Module.cpp) = 6fce0f9ce9681deb7bf4f1017104d48c536ff70e
+SHA1 (patch-Modules_base_info__netbsd.cpp) = a762f3043ec6a7a1bab1afdb68581d474ef7f9aa
+SHA1 (patch-Modules_memory_base.h) = 6db972a12e7ba9d0cc59a483e2565042907be340
 SHA1 (patch-Modules_nics_nic.cpp) = d759de60f074d8e35d759cef3426c2f84ad9768e
+SHA1 (patch-Modules_pci_kpci.cpp) = 1ce051e907d0809e3ac680049dc63305d681ec6a
+SHA1 (patch-cmake_FindPCIUTILS.cmake) = c5f648d5eb25e9c4e6ca9fa259476ed70bad0203
diff --git a/kinfocenter/patches/patch-Modules_about-distro_src_Module.cpp b/kinfocenter/patches/patch-Modules_about-distro_src_Module.cpp
new file mode 100644
index 0000000000..2730519ff6
--- /dev/null
+++ b/kinfocenter/patches/patch-Modules_about-distro_src_Module.cpp
@@ -0,0 +1,31 @@
+$NetBSD$
+
+get Memory for NetBSD
+
+--- Modules/about-distro/src/Module.cpp.orig	2020-05-05 14:39:33.000000000 +0000
++++ Modules/about-distro/src/Module.cpp
+@@ -41,7 +41,7 @@
+ 
+ #ifdef Q_OS_LINUX
+ #include <sys/sysinfo.h>
+-#elif defined(Q_OS_FREEBSD)
++#elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+ #endif
+@@ -66,6 +66,15 @@ static qlonglong calculateTotalRam()
+     sysctlbyname("hw.physmem", &memory, &len, NULL, 0);
+ 
+     ret = memory;
++#elif defined(Q_OS_NETBSD)
++    /* Stuff for sysctl */
++    size_t len;
++
++    unsigned long memory;
++    len = sizeof(memory);
++    sysctlbyname("hw.physmem64", &memory, &len, NULL, 0);
++
++    ret = memory;
+ #endif
+     return ret;
+ }
diff --git a/kinfocenter/patches/patch-Modules_base_info__netbsd.cpp b/kinfocenter/patches/patch-Modules_base_info__netbsd.cpp
index 6f286a0c69..02c39e95ee 100644
--- a/kinfocenter/patches/patch-Modules_base_info__netbsd.cpp
+++ b/kinfocenter/patches/patch-Modules_base_info__netbsd.cpp
@@ -1,10 +1,20 @@
 $NetBSD$
 
 <kio/global.h> not used (and not found)
+Try PCIUTILS
 
---- Modules/base/info_netbsd.cpp.orig	2018-01-02 11:44:59.901997533 +0000
+--- Modules/base/info_netbsd.cpp.orig	2020-05-05 14:39:33.000000000 +0000
 +++ Modules/base/info_netbsd.cpp
-@@ -31,7 +31,7 @@
+@@ -25,13 +25,16 @@
+ #include <stdlib.h>	/* for malloc(3) */
+ #include <fstab.h>
+ 
++#ifdef HAVE_PCIUTILS
++#include "kpci.h"
++#endif //HAVE_PCIUTILS
+ #include <QFile>
+ #include <QStringList>
+ #include <QTextStream>
  #include <QTreeWidgetItemIterator>
  
  #include <QDebug>
@@ -13,3 +23,18 @@ $NetBSD$
  
  typedef struct {
  	int string;
+@@ -133,6 +136,14 @@ bool GetInfo_DMA(QTreeWidget*) {
+ }
+ 
+ bool GetInfo_PCI(QTreeWidget* tree) {
++        int num;
++
++#ifdef HAVE_PCIUTILS
++        if ( (num = GetInfo_PCIUtils(tree))) {
++                return num;
++        }
++        
++#endif //HAVE_PCIUTILS
+ 	if (!GetDmesgInfo(tree, "at pci", NULL)) {
+ 		QStringList list;
+ 		list << i18n("No PCI devices found.");
diff --git a/kinfocenter/patches/patch-Modules_memory_base.h b/kinfocenter/patches/patch-Modules_memory_base.h
new file mode 100644
index 0000000000..469c51d878
--- /dev/null
+++ b/kinfocenter/patches/patch-Modules_memory_base.h
@@ -0,0 +1,16 @@
+$NetBSD$
+
+resotore NetBSD/OpenBSD values lost sometime after 5.16.4
+
+--- Modules/memory/base.h.orig	2020-05-05 14:39:33.000000000 +0000
++++ Modules/memory/base.h
+@@ -25,6 +25,9 @@ enum { /* entries for memoryInfos[] */
+ #if !defined(__NetBSD__) && !defined(__OpenBSD__)
+ 	SHARED_MEM, /* shared memory size */
+     BUFFER_MEM, /* buffered memory size */
++#else
++	ACTIVE_MEM,
++	INACTIVE_MEM,
+ #endif
+ 	CACHED_MEM, /* cache memory size (located in ram) */
+ 	SWAP_MEM, /* total size of all swap-partitions */
diff --git a/kinfocenter/patches/patch-Modules_pci_kpci.cpp b/kinfocenter/patches/patch-Modules_pci_kpci.cpp
new file mode 100644
index 0000000000..df71a2922d
--- /dev/null
+++ b/kinfocenter/patches/patch-Modules_pci_kpci.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+pkgsrc calls it pciutils
+
+--- Modules/pci/kpci.cpp.orig	2020-05-05 14:39:33.000000000 +0000
++++ Modules/pci/kpci.cpp
+@@ -13,7 +13,7 @@
+ 
+ //extern "C" is needed to proper linking with libpci
+ extern "C" {
+-#include <pci/pci.h>
++#include <pciutils/pci.h>
+ }
+ #include <unistd.h>
+ #include <sys/types.h> //getuid
diff --git a/kinfocenter/patches/patch-cmake_FindPCIUTILS.cmake b/kinfocenter/patches/patch-cmake_FindPCIUTILS.cmake
new file mode 100644
index 0000000000..37ad089cfb
--- /dev/null
+++ b/kinfocenter/patches/patch-cmake_FindPCIUTILS.cmake
@@ -0,0 +1,18 @@
+$NetBSD$
+
+pkgsrc calls this pciutils
+
+--- cmake/FindPCIUTILS.cmake.orig	2020-05-05 14:39:33.000000000 +0000
++++ cmake/FindPCIUTILS.cmake
+@@ -9,9 +9,9 @@ if(PCIUTILS_INCLUDE_DIR AND PCIUTILS_LIB
+    set(PCIUTILS_FIND_QUIETLY TRUE)
+ endif(PCIUTILS_INCLUDE_DIR AND PCIUTILS_LIBRARIES)
+ 
+-FIND_PATH(PCIUTILS_INCLUDE_DIR pci/pci.h)
++FIND_PATH(PCIUTILS_INCLUDE_DIR pciutils/pci.h)
+ 
+-FIND_LIBRARY(PCIUTILS_LIBRARY NAMES pci)
++FIND_LIBRARY(PCIUTILS_LIBRARY NAMES pciutils)
+ if(PCIUTILS_LIBRARY)
+   FIND_LIBRARY(RESOLV_LIBRARY NAMES resolv)
+   if(RESOLV_LIBRARY)
Prev by Date: qt6-qtbase: add fixes for OS and sysinfo
Next by Date: (ham/wsjt) undefined reference to `libusb_error_name
Previous by Thread: qt6-qtbase: add fixes for OS and sysinfo
Next by Thread: (ham/wsjt) undefined reference to `libusb_error_name
Indexes:
Home | Main Index | Thread Index | Old Index