CPU-X: update to 4.2.0.

srcpkgs/CPU-X/patches/define_ACCESSPERMS_on_musl.patch

@@ -1,15 +0,0 @@
---- a/src/util.c
-+++ b/src/util.c
-@@ -35,6 +35,12 @@
- #include <libintl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+
-+/* glibc's stat.h has it but musl's does not. */
-+#ifndef ACCESSPERMS
-+#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO)
-+#endif
-+
- #include <sys/wait.h>
- #include "cpu-x.h"
- #include "ipc.h"

srcpkgs/CPU-X/patches/fix_bitness_detection.patch

@@ -1,17 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,11 +25,11 @@
- set(APP_EXEC                       ${CMAKE_PROJECT_NAME})
- set(DAEMON_EXEC                    ${CMAKE_PROJECT_NAME}-daemon)
- set(DAEMON_PATH                    ${CMAKE_INSTALL_FULL_LIBEXECDIR}/${DAEMON_EXEC})
--if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "i.86")
-+if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-	set(BITNESS "32")
--else(${CMAKE_SYSTEM_PROCESSOR} MATCHES "i.86")
-+else(CMAKE_SIZEOF_VOID_P EQUAL 4)
-	set(BITNESS "64")
--endif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "i.86")
-+endif(CMAKE_SIZEOF_VOID_P EQUAL 4)
- set(CMAKE_C_FLAGS             "${CMAKE_C_FLAGS} -Wno-deprecated-declarations -Wno-unused-result")
- set(CMAKE_C_FLAGS_DEBUG       "${CMAKE_C_FLAGS_DEBUG} -Wall -Wextra -Wuninitialized -Wstrict-prototypes -Wformat -Wformat-security")
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now")

srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch

@@ -0,0 +1,15 @@
+--- a/src/tui_ncurses.c	2021-10-07 14:38:03.886862860 -0400
++++ b/src/tui_ncurses.c	2021-10-07 14:49:43.258142532 -0400
+@@ -262,6 +262,12 @@
+ /* Convert keys when an alternative mapping is used */
+ #define ALT_CODE 27
+ #define ALT(x)   (x & ALT_CODE)
++
++/* glibc's term.h pulls in sys/ttydefaults.h which has it, but musl's does not. */
++#ifndef CTRL
++#define CTRL(x)	(x&037)
++#endif
++
+ static int convert_char(int ch)
+ {
+ 	int i = 0;

srcpkgs/CPU-X/template

@@ -1,18 +1,23 @@
 # Template file for 'CPU-X'
 pkgname=CPU-X
-version=4.0.1
+version=4.2.0
 revision=1
 archs="x86_64* i686*"
 build_style=cmake
 hostmakedepends="nasm pkg-config gettext"
 makedepends="libcpuid-devel ncurses-devel pciutils-devel
- procps-ng-devel $(vopt_if gtk3 'gtk+3-devel')"
+ procps-ng-devel glfw-devel $(vopt_if gtk3 'gtk+3-devel')"
 short_desc="Free software that gathers information on CPU, motherboard and more"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://x0rg.github.io/CPU-X/"
+changelog="https://raw.githubusercontent.com/X0rg/CPU-X/master/ChangeLog.md"
 distfiles="https://github.com/X0rg/CPU-X/archive/v${version}.tar.gz"
-checksum=c41fbb3000e3e6f79e5228aa0237fde4f98b11df8ccb4c9a46f7e63a4a7011bf
+checksum=3bd8aabe98273012adc6fa25f31cf0f631f0a34c2ec39392fb5f6885551cee1f
+# tests depend on:
+# having mawk and nawk installed which breaks chroot-gawk
+# grep -P, which `chroot-grep` is compiled without
+make_check=no
 
 build_options="gtk3"
 build_options_default="gtk3"