From 10db1a37bb6443ba8cf64fc285a82da73d712772 Mon Sep 17 00:00:00 2001 From: Andrew Benson 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 " 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 9e1ab9e8bdf55e13c93062d843357faf63475ef2 Mon Sep 17 00:00:00 2001 From: Andrew Benson 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/template | 5 +++-- 3 files changed, 3 insertions(+), 34 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 - #include - #include -+ -+/* glibc's stat.h has it but musl's does not. */ -+#ifndef ACCESSPERMS -+#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) -+#endif -+ - #include - #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..fd01286fe91b 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 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 " 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"