Re: [PR PATCH] [Updated] Cpux 4.2.0

[abenson <abenson@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1580 bytes --]

There is an updated pull request by abenson against master on the void-packages repository

https://github.com/abenson/void-packages cpux_4.2.0
https://github.com/void-linux/void-packages/pull/33238

Cpux 4.2.0
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/33238.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cpux_4.2.0-33238.patch --]
[-- Type: text/x-diff, Size: 5183 bytes --]

From 10db1a37bb6443ba8cf64fc285a82da73d712772 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 1 Oct 2021 18:00:40 -0500
Subject: [PATCH 1/2] libcpuid: update to 0.5.1.

---
 srcpkgs/libcpuid/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcpuid/template b/srcpkgs/libcpuid/template
index fd68d5b1e730..94612749da8d 100644
--- a/srcpkgs/libcpuid/template
+++ b/srcpkgs/libcpuid/template
@@ -1,16 +1,17 @@
 # Template file for 'libcpuid'
 pkgname=libcpuid
-version=0.5.0
+version=0.5.1
 revision=1
 archs="i686* x86_64*"
 build_style=cmake
 hostmakedepends="doxygen"
+checkdepends="python3"
 short_desc="Small C library for x86 CPU detection and feature extraction"
 maintainer="cr6git <quark6@protonmail.com>"
 license="BSD-2-Clause"
 homepage="https://github.com/anrieff/libcpuid"
 distfiles="https://github.com/anrieff/libcpuid/archive/v${version}.tar.gz"
-checksum=49893f31475510aa0ebe2ad3a29fad95e2a592cc5f48451c95271c536f89a157
+checksum=36d62842ef43c749c0ba82237b10ede05b298d79a0e39ef5fd1115ba1ff8e126
 
 post_install() {
 	vlicense COPYING

From b33e74cd552f33ce1bfde81da9433c94602d2f92 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 1 Oct 2021 18:00:55 -0500
Subject: [PATCH 2/2] CPU-X: update to 4.2.0.

---
 .../patches/define_ACCESSPERMS_on_musl.patch    | 15 ---------------
 .../CPU-X/patches/fix_bitness_detection.patch   | 17 -----------------
 srcpkgs/CPU-X/patches/missing-ctrl.patch        | 11 +++++++++++
 srcpkgs/CPU-X/template                          |  7 ++++---
 4 files changed, 15 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/CPU-X/patches/define_ACCESSPERMS_on_musl.patch
 delete mode 100644 srcpkgs/CPU-X/patches/fix_bitness_detection.patch
 create mode 100644 srcpkgs/CPU-X/patches/missing-ctrl.patch

diff --git a/srcpkgs/CPU-X/patches/define_ACCESSPERMS_on_musl.patch b/srcpkgs/CPU-X/patches/define_ACCESSPERMS_on_musl.patch
deleted file mode 100644
index 58d81eaf909b..000000000000
--- a/srcpkgs/CPU-X/patches/define_ACCESSPERMS_on_musl.patch
+++ /dev/null
@@ -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"
diff --git a/srcpkgs/CPU-X/patches/fix_bitness_detection.patch b/srcpkgs/CPU-X/patches/fix_bitness_detection.patch
deleted file mode 100644
index b4ae465ed46b..000000000000
--- a/srcpkgs/CPU-X/patches/fix_bitness_detection.patch
+++ /dev/null
@@ -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")
diff --git a/srcpkgs/CPU-X/patches/missing-ctrl.patch b/srcpkgs/CPU-X/patches/missing-ctrl.patch
new file mode 100644
index 000000000000..fc882f3be6c7
--- /dev/null
+++ b/srcpkgs/CPU-X/patches/missing-ctrl.patch
@@ -0,0 +1,11 @@
+--- a/src/tui_ncurses.c
++++ b/src/tui_ncurses.c
+@@ -262,6 +262,8 @@
+ /* Convert keys when an alternative mapping is used */
+ #define ALT_CODE 27
+ #define ALT(x)   (x & ALT_CODE)
++#define CTRL_CODE 037
++#define CTRL(x)	(x & CTRL_CODE)
+ static int convert_char(int ch)
+ {
+ 	int i = 0;
diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template
index 0947bcfef816..5394f879e43d 100644
--- a/srcpkgs/CPU-X/template
+++ b/srcpkgs/CPU-X/template
@@ -1,18 +1,19 @@
 # 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
+makedepends="libcpuid-devel ncurses-devel pciutils-devel glfw-devel
  procps-ng-devel $(vopt_if gtk3 'gtk+3-devel')"
+checkdepends="grep mawk nawk"
 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/"
 distfiles="https://github.com/X0rg/CPU-X/archive/v${version}.tar.gz"
-checksum=c41fbb3000e3e6f79e5228aa0237fde4f98b11df8ccb4c9a46f7e63a4a7011bf
+checksum=3bd8aabe98273012adc6fa25f31cf0f631f0a34c2ec39392fb5f6885551cee1f
 
 build_options="gtk3"
 build_options_default="gtk3"