Skip to content

Commit 26d4995

Browse files
committed
CPU-X: update to 5.4.0
1 parent dbce441 commit 26d4995

File tree

4 files changed

+34
-34
lines changed

4 files changed

+34
-34
lines changed
Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
*** a/CMakeLists.txt 2024-10-21 10:03:31.920419079 -0300
2-
--- b/CMakeLists.txt 2024-10-21 10:13:21.248594699 -0300
3-
*************** endif(EXISTS ${CMAKE_SOURCE_DIR}/.git)
4-
*** 123,125 ****
5-
6-
! enable_testing()
7-
find_package(PkgConfig REQUIRED)
8-
--- 123,125 ----
9-
10-
!
11-
find_package(PkgConfig REQUIRED)
12-
*************** add_subdirectory(po)
13-
*** 141,143 ****
14-
add_subdirectory(src)
15-
- add_subdirectory(tests)
16-
17-
--- 141,142 ----
1+
--- a/CMakeLists.txt
2+
+++ b/CMakeLists.txt
3+
@@ -180,7 +180,6 @@
4+
endif(GIT_FOUND)
5+
endif()
6+
7+
-enable_testing()
8+
find_package(PkgConfig REQUIRED)
9+
find_package(Threads REQUIRED)
10+
find_package(Backtrace REQUIRED)
11+
@@ -200,7 +199,6 @@
12+
add_subdirectory(data)
13+
add_subdirectory(po)
14+
add_subdirectory(src)
15+
-add_subdirectory(tests)
16+
17+
18+
### UNINSTALL TARGET

srcpkgs/CPU-X/patches/fix-no-pie-check.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
This shouldn't exist and erroneously fails for us.
22
--- a/CMakeLists.txt
33
+++ b/CMakeLists.txt
4-
@@ -35,12 +35,6 @@
4+
@@ -63,12 +63,6 @@
55
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now")
66
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now")
77

88
-include(CheckCCompilerFlag)
99
-check_c_compiler_flag("-no-pie" HAS_NO_PIE)
10-
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND HAS_NO_PIE)
10+
-if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND HAS_NO_PIE)
1111
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie")
12-
-endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND HAS_NO_PIE)
12+
-endif(CMAKE_SYSTEM_NAME MATCHES "Linux" AND HAS_NO_PIE)
1313
-
1414
# Options
1515
option(WITH_GTK "Build support for GUI in GTK3+" ON)
Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
*** a/src/daemon_client.cpp 2024-10-07 08:16:51.000000000 -0300
2-
--- b/src/daemon_client.cpp 2024-10-21 11:43:37.561779747 -0300
3-
***************
4-
*** 22,24 ****
5-
*/
6-
!
7-
#include <unistd.h>
8-
--- 22,24 ----
9-
*/
10-
! #include <cstring>
11-
#include <unistd.h>
1+
--- a/src/daemon/client.cpp
2+
+++ b/src/daemon/client.cpp
3+
@@ -21,6 +21,7 @@
4+
* FILE daemon/client.cpp
5+
*/
6+
7+
+#include <cstring>
8+
#include <unistd.h>
9+
#include <cstdlib>
10+
#include <cassert>

srcpkgs/CPU-X/template

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Template file for 'CPU-X'
22
pkgname=CPU-X
3-
version=5.1.0
4-
revision=3
3+
version=5.4.0
4+
revision=1
55
archs="x86_64* i686*"
66
build_style=cmake
77
hostmakedepends="pkg-config nasm gettext"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
1313
homepage="https://thetumultuousunicornofdarkness.github.io/CPU-X/"
1414
changelog="https://github.com/TheTumultuousUnicornOfDarkness/CPU-X/blob/master/ChangeLog.md"
1515
distfiles="https://github.com/thetumultuousunicornofdarkness/CPU-X/archive/v${version}.tar.gz"
16-
checksum=a99f963dd9cb982966fdfce9e9a9b569f852c1bfffb51e7b9f154abc8c0d40c5
16+
checksum=57cdd4695aa2271d94161f59bbce380ecbed46cb16eb7c28e8a78271f976e875
1717

1818
if [ "$XBPS_TARGET_LIBC" = musl ]; then
1919
makedepends+=" libexecinfo-devel"

0 commit comments

Comments
 (0)