From 622d265496f85c004a5dfbc2455c1db09266c2a0 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Fri, 18 Feb 2022 10:18:47 -0500 Subject: [PATCH] CPU-X: update to 4.3.0. musl-ctrl-not-defined.patch has been upstreamed. --- srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch | 15 --------------- srcpkgs/CPU-X/template | 8 ++++---- 2 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch diff --git a/srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch b/srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch deleted file mode 100644 index 77b7abec77bc..000000000000 --- a/srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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 19a01be5978c..f36963c59653 100644 --- a/srcpkgs/CPU-X/template +++ b/srcpkgs/CPU-X/template @@ -1,19 +1,19 @@ # Template file for 'CPU-X' pkgname=CPU-X -version=4.2.0 +version=4.3.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 glfw-devel $(vopt_if gtk3 'gtk+3-devel')" +makedepends="libcpuid-devel ncurses-devel pciutils-devel procps-ng-devel + ocl-icd-devel glfw-devel $(vopt_if gtk3 'gtk+3-devel')" 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/" changelog="https://raw.githubusercontent.com/X0rg/CPU-X/master/ChangeLog.md" distfiles="https://github.com/X0rg/CPU-X/archive/v${version}.tar.gz" -checksum=3bd8aabe98273012adc6fa25f31cf0f631f0a34c2ec39392fb5f6885551cee1f +checksum=6ad7a8ac2d6c687a38a895fbbfbf2de690311676ac374d5857588bb983839433 # tests depend on: # having mawk and nawk installed which breaks chroot-gawk # grep -P, which `chroot-grep` is compiled without