[PR PATCH] CPU-X: update to 4.2.0.

[PR PATCH] CPU-X: update to 4.2.0.

[TinfoilSubmarine]

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

There is a new pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages CPU-X
https://github.com/void-linux/void-packages/pull/33409

CPU-X: update to 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
-->

Bumped libcpuid to latest version as reccomended by CPU-X.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-CPU-X-33409.patch --]
[-- Type: text/x-diff, Size: 4794 bytes --]

From 43aebeffe7c37943ea6e5bc2496ba14c2ef6e7fd Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 7 Oct 2021 12:06:50 -0400
Subject: [PATCH 1/2] libcpuid: update to 0.5.1.

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

diff --git a/srcpkgs/libcpuid/template b/srcpkgs/libcpuid/template
index fd68d5b1e730..3cfeb869ba2a 100644
--- a/srcpkgs/libcpuid/template
+++ b/srcpkgs/libcpuid/template
@@ -1,16 +1,18 @@
 # 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"
+changelog="https://raw.githubusercontent.com/anrieff/libcpuid/master/ChangeLog"
 distfiles="https://github.com/anrieff/libcpuid/archive/v${version}.tar.gz"
-checksum=49893f31475510aa0ebe2ad3a29fad95e2a592cc5f48451c95271c536f89a157
+checksum=36d62842ef43c749c0ba82237b10ede05b298d79a0e39ef5fd1115ba1ff8e126
 
 post_install() {
 	vlicense COPYING

From 0c4d1ce699a0b83663c51b8b79cb2fe8f3b96b8f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 7 Oct 2021 12:07:00 -0400
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/template                          | 11 ++++++++---
 3 files changed, 8 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

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/template b/srcpkgs/CPU-X/template
index 0947bcfef816..19a01be5978c 100644
--- a/srcpkgs/CPU-X/template
+++ b/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"

Re: [PR PATCH] [Updated] CPU-X: update to 4.2.0.

[TinfoilSubmarine]

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

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

https://github.com/TinfoilSubmarine/void-packages CPU-X
https://github.com/void-linux/void-packages/pull/33409

CPU-X: update to 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
-->

Bumped libcpuid to latest version as reccomended by CPU-X.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-CPU-X-33409.patch --]
[-- Type: text/x-diff, Size: 5641 bytes --]

From 43aebeffe7c37943ea6e5bc2496ba14c2ef6e7fd Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 7 Oct 2021 12:06:50 -0400
Subject: [PATCH 1/2] libcpuid: update to 0.5.1.

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

diff --git a/srcpkgs/libcpuid/template b/srcpkgs/libcpuid/template
index fd68d5b1e730..3cfeb869ba2a 100644
--- a/srcpkgs/libcpuid/template
+++ b/srcpkgs/libcpuid/template
@@ -1,16 +1,18 @@
 # 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"
+changelog="https://raw.githubusercontent.com/anrieff/libcpuid/master/ChangeLog"
 distfiles="https://github.com/anrieff/libcpuid/archive/v${version}.tar.gz"
-checksum=49893f31475510aa0ebe2ad3a29fad95e2a592cc5f48451c95271c536f89a157
+checksum=36d62842ef43c749c0ba82237b10ede05b298d79a0e39ef5fd1115ba1ff8e126
 
 post_install() {
 	vlicense COPYING

From 03b19f85129bb9bd5b604067d313f0902539f76b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 7 Oct 2021 12:07:00 -0400
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 -----------------
 .../CPU-X/patches/musl-ctrl-not-defined.patch   | 15 +++++++++++++++
 srcpkgs/CPU-X/template                          | 11 ++++++++---
 4 files changed, 23 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/musl-ctrl-not-defined.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/musl-ctrl-not-defined.patch b/srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch
new file mode 100644
index 000000000000..77b7abec77bc
--- /dev/null
+++ b/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;
diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template
index 0947bcfef816..19a01be5978c 100644
--- a/srcpkgs/CPU-X/template
+++ b/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"

Re: [PR PATCH] [Merged]: CPU-X: update to 4.2.0.

[ericonr]

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

There's a merged pull request on the void-packages repository

CPU-X: update to 4.2.0.
https://github.com/void-linux/void-packages/pull/33409

Description:
<!-- 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
-->

Bumped libcpuid to latest version as reccomended by CPU-X.