* [PR PATCH] CPU-X: update to 5.0.4.
@ 2024-10-21 14:03 1is7ac3
2024-10-21 14:47 ` [PR PATCH] [Updated] " 1is7ac3
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: 1is7ac3 @ 2024-10-21 14:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]
There is a new pull request by 1is7ac3 against master on the void-packages repository
https://github.com/1is7ac3/void-packages cpu-x
https://github.com/void-linux/void-packages/pull/52720
CPU-X: update to 5.0.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- i686
<!--- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52720.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cpu-x-52720.patch --]
[-- Type: text/x-diff, Size: 2657 bytes --]
From b5be588f6dfdb28cb1027453ca87885ac495c293 Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Fri, 11 Oct 2024 20:59:00 -0300
Subject: [PATCH] CPU-X: update to 5.0.4.
---
srcpkgs/CPU-X/patches/disable_tests.patch | 17 +++++++++++++++++
srcpkgs/CPU-X/template | 12 ++++++------
2 files changed, 23 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/CPU-X/patches/disable_tests.patch
diff --git a/srcpkgs/CPU-X/patches/disable_tests.patch b/srcpkgs/CPU-X/patches/disable_tests.patch
new file mode 100644
index 00000000000000..c8e9c4299a2716
--- /dev/null
+++ b/srcpkgs/CPU-X/patches/disable_tests.patch
@@ -0,0 +1,17 @@
+*** a/CMakeLists.txt 2024-10-21 10:03:31.920419079 -0300
+--- b/CMakeLists.txt 2024-10-21 10:13:21.248594699 -0300
+*************** endif(EXISTS ${CMAKE_SOURCE_DIR}/.git)
+*** 123,125 ****
+
+! enable_testing()
+ find_package(PkgConfig REQUIRED)
+--- 123,125 ----
+
+!
+ find_package(PkgConfig REQUIRED)
+*************** add_subdirectory(po)
+*** 141,143 ****
+ add_subdirectory(src)
+- add_subdirectory(tests)
+
+--- 141,142 ----
diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template
index 7d1aab355f5c9a..433898ba966e7c 100644
--- a/srcpkgs/CPU-X/template
+++ b/srcpkgs/CPU-X/template
@@ -1,13 +1,13 @@
# Template file for 'CPU-X'
pkgname=CPU-X
-version=4.5.3
+version=5.0.4
revision=1
archs="x86_64* i686*"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF"
build_style=cmake
-hostmakedepends="pkg-config nasm"
-makedepends="ncurses-devel gettext-devel libcpuid-devel pciutils-devel
- glfw-devel ocl-icd-devel procps-ng-devel libstatgrab gtk+3-devel
- vulkan-loader-devel"
+hostmakedepends="pkg-config nasm gettext"
+makedepends="ncurses-devel libcpuid-devel pciutils-devel glfw-devel
+ ocl-icd-devel procps-ng-devel libstatgrab gtkmm-devel vulkan-loader-devel"
#checkdepends="mawk nawk grep"
short_desc="Free software that gathers information on CPU, motherboard and more"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
homepage="https://thetumultuousunicornofdarkness.github.io/CPU-X/"
changelog="https://github.com/TheTumultuousUnicornOfDarkness/CPU-X/blob/master/ChangeLog.md"
distfiles="https://github.com/thetumultuousunicornofdarkness/CPU-X/archive/v${version}.tar.gz"
-checksum=aeef04fb5c2da85f8790ab74bd66e2e72c9595579d5f64d2d08f093ef69d81f9
+checksum=7375e7184656f2630327afb13120e715956a509b40ae0fdb9edb5306638dce21
# xbps-src will still install checkdepends even if the template says `make_check=no`.
# And breaking the build environment on the CI is also bad, if CPU-X would be part
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] CPU-X: update to 5.0.4.
2024-10-21 14:03 [PR PATCH] CPU-X: update to 5.0.4 1is7ac3
@ 2024-10-21 14:47 ` 1is7ac3
2024-10-27 9:51 ` [PR PATCH] [Merged]: " Johnnynator
2024-10-28 13:43 ` sgn
2 siblings, 0 replies; 4+ messages in thread
From: 1is7ac3 @ 2024-10-21 14:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is an updated pull request by 1is7ac3 against master on the void-packages repository
https://github.com/1is7ac3/void-packages cpu-x
https://github.com/void-linux/void-packages/pull/52720
CPU-X: update to 5.0.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- i686
<!--- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/52720.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cpu-x-52720.patch --]
[-- Type: text/x-diff, Size: 3564 bytes --]
From e5db84510f7a78e83a0f4bdcda10114e7c60738d Mon Sep 17 00:00:00 2001
From: 1is7ac3 <isaac.qa13@gmail.com>
Date: Fri, 11 Oct 2024 20:59:00 -0300
Subject: [PATCH] CPU-X: update to 5.0.4.
---
srcpkgs/CPU-X/patches/disable_tests.patch | 17 +++++++++++++++++
srcpkgs/CPU-X/patches/fix_musl.patch | 11 +++++++++++
srcpkgs/CPU-X/template | 21 +++++----------------
3 files changed, 33 insertions(+), 16 deletions(-)
create mode 100644 srcpkgs/CPU-X/patches/disable_tests.patch
create mode 100644 srcpkgs/CPU-X/patches/fix_musl.patch
diff --git a/srcpkgs/CPU-X/patches/disable_tests.patch b/srcpkgs/CPU-X/patches/disable_tests.patch
new file mode 100644
index 00000000000000..c8e9c4299a2716
--- /dev/null
+++ b/srcpkgs/CPU-X/patches/disable_tests.patch
@@ -0,0 +1,17 @@
+*** a/CMakeLists.txt 2024-10-21 10:03:31.920419079 -0300
+--- b/CMakeLists.txt 2024-10-21 10:13:21.248594699 -0300
+*************** endif(EXISTS ${CMAKE_SOURCE_DIR}/.git)
+*** 123,125 ****
+
+! enable_testing()
+ find_package(PkgConfig REQUIRED)
+--- 123,125 ----
+
+!
+ find_package(PkgConfig REQUIRED)
+*************** add_subdirectory(po)
+*** 141,143 ****
+ add_subdirectory(src)
+- add_subdirectory(tests)
+
+--- 141,142 ----
diff --git a/srcpkgs/CPU-X/patches/fix_musl.patch b/srcpkgs/CPU-X/patches/fix_musl.patch
new file mode 100644
index 00000000000000..a13a183b87afd4
--- /dev/null
+++ b/srcpkgs/CPU-X/patches/fix_musl.patch
@@ -0,0 +1,11 @@
+*** a/src/daemon_client.cpp 2024-10-07 08:16:51.000000000 -0300
+--- b/src/daemon_client.cpp 2024-10-21 11:43:37.561779747 -0300
+***************
+*** 22,24 ****
+ */
+!
+ #include <unistd.h>
+--- 22,24 ----
+ */
+! #include <cstring>
+ #include <unistd.h>
diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template
index 7d1aab355f5c9a..9ef7ca7cdef19f 100644
--- a/srcpkgs/CPU-X/template
+++ b/srcpkgs/CPU-X/template
@@ -1,30 +1,19 @@
# Template file for 'CPU-X'
pkgname=CPU-X
-version=4.5.3
+version=5.1.0
revision=1
archs="x86_64* i686*"
build_style=cmake
-hostmakedepends="pkg-config nasm"
-makedepends="ncurses-devel gettext-devel libcpuid-devel pciutils-devel
- glfw-devel ocl-icd-devel procps-ng-devel libstatgrab gtk+3-devel
- vulkan-loader-devel"
-#checkdepends="mawk nawk grep"
+hostmakedepends="pkg-config nasm gettext"
+makedepends="ncurses-devel libcpuid-devel pciutils-devel glfw-devel
+ ocl-icd-devel procps-ng-devel libstatgrab gtkmm-devel vulkan-loader-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://thetumultuousunicornofdarkness.github.io/CPU-X/"
changelog="https://github.com/TheTumultuousUnicornOfDarkness/CPU-X/blob/master/ChangeLog.md"
distfiles="https://github.com/thetumultuousunicornofdarkness/CPU-X/archive/v${version}.tar.gz"
-checksum=aeef04fb5c2da85f8790ab74bd66e2e72c9595579d5f64d2d08f093ef69d81f9
-
-# xbps-src will still install checkdepends even if the template says `make_check=no`.
-# And breaking the build environment on the CI is also bad, if CPU-X would be part
-# of revbumps due to shared libraries it would destroy the CI.
-# if [ "$XBPS_BUILD_ENVIRONMENT" != void-packages-ci ]; then
-# # Installing the packages in checkdepends causes base-chroot to break.
-# # So, only run the checks in CI, where the chroot is ethereal anyway.
-# make_check=no
-# fi
+checksum=a99f963dd9cb982966fdfce9e9a9b569f852c1bfffb51e7b9f154abc8c0d40c5
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: CPU-X: update to 5.0.4.
2024-10-21 14:03 [PR PATCH] CPU-X: update to 5.0.4 1is7ac3
2024-10-21 14:47 ` [PR PATCH] [Updated] " 1is7ac3
@ 2024-10-27 9:51 ` Johnnynator
2024-10-28 13:43 ` sgn
2 siblings, 0 replies; 4+ messages in thread
From: Johnnynator @ 2024-10-27 9:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1093 bytes --]
There's a merged pull request on the void-packages repository
CPU-X: update to 5.0.4.
https://github.com/void-linux/void-packages/pull/52720
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- i686
<!--- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: CPU-X: update to 5.0.4.
2024-10-21 14:03 [PR PATCH] CPU-X: update to 5.0.4 1is7ac3
2024-10-21 14:47 ` [PR PATCH] [Updated] " 1is7ac3
2024-10-27 9:51 ` [PR PATCH] [Merged]: " Johnnynator
@ 2024-10-28 13:43 ` sgn
2 siblings, 0 replies; 4+ messages in thread
From: sgn @ 2024-10-28 13:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 259 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/52720#issuecomment-2441630322
Comment:
This is broken. This CPU-X requires `libcpuid` `0.7.0` or later. https://github.com/void-linux/void-packages/issues/52810
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-28 13:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-10-21 14:03 [PR PATCH] CPU-X: update to 5.0.4 1is7ac3
2024-10-21 14:47 ` [PR PATCH] [Updated] " 1is7ac3
2024-10-27 9:51 ` [PR PATCH] [Merged]: " Johnnynator
2024-10-28 13:43 ` sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).