Skip to content

CPU-X: update to 5.4.0 #61817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
gc-user wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

CPU-X: update to 5.4.0 #61817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions srcpkgs/CPU-X/patches/fix-no-pie-check.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
This shouldn't exist and erroneously fails for us.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,12 +35,6 @@
@@ -63,12 +63,6 @@
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now")

-include(CheckCCompilerFlag)
-check_c_compiler_flag("-no-pie" HAS_NO_PIE)
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND HAS_NO_PIE)
-if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND HAS_NO_PIE)
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie")
-endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND HAS_NO_PIE)
-endif(CMAKE_SYSTEM_NAME MATCHES "Linux" AND HAS_NO_PIE)
-
# Options
option(WITH_GTK "Build support for GUI in GTK3+" ON)
Expand Down
21 changes: 10 additions & 11 deletions srcpkgs/CPU-X/patches/fix_musl.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
*** 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>
--- a/src/daemon/client.cpp
+++ b/src/daemon/client.cpp
@@ -21,6 +21,7 @@
* FILE daemon/client.cpp
*/

+#include <cstring>
#include <unistd.h>
#include <cstdlib>
#include <cassert>
6 changes: 3 additions & 3 deletions srcpkgs/CPU-X/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'CPU-X'
pkgname=CPU-X
version=5.1.0
revision=4
version=5.4.0
revision=1
archs="x86_64* i686*"
build_style=cmake
hostmakedepends="pkg-config nasm gettext"
Expand All @@ -13,7 +13,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=a99f963dd9cb982966fdfce9e9a9b569f852c1bfffb51e7b9f154abc8c0d40c5
checksum=57cdd4695aa2271d94161f59bbce380ecbed46cb16eb7c28e8a78271f976e875

if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
Expand Down
Loading