Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] CPU-X: update to 4.3.0.
@ 2022-02-18 15:36 TinfoilSubmarine
  2022-04-05 15:56 ` [PR PATCH] [Closed]: " TinfoilSubmarine
  2022-04-05 15:56 ` TinfoilSubmarine
  0 siblings, 2 replies; 3+ messages in thread
From: TinfoilSubmarine @ 2022-02-18 15:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1276 bytes --]

There is a new pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages CPU-X
https://github.com/void-linux/void-packages/pull/35684

CPU-X: update to 4.3.0.
musl-ctrl-not-defined.patch has been upstreamed.

<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/35684.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-CPU-X-35684.patch --]
[-- Type: text/x-diff, Size: 2439 bytes --]

From 622d265496f85c004a5dfbc2455c1db09266c2a0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
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 <orphan@voidlinux.org>"
 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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Closed]: CPU-X: update to 4.3.0.
  2022-02-18 15:36 [PR PATCH] CPU-X: update to 4.3.0 TinfoilSubmarine
@ 2022-04-05 15:56 ` TinfoilSubmarine
  2022-04-05 15:56 ` TinfoilSubmarine
  1 sibling, 0 replies; 3+ messages in thread
From: TinfoilSubmarine @ 2022-04-05 15:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1109 bytes --]

There's a closed pull request on the void-packages repository

CPU-X: update to 4.3.0.
https://github.com/void-linux/void-packages/pull/35684

Description:
musl-ctrl-not-defined.patch has been upstreamed.

<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: CPU-X: update to 4.3.0.
  2022-02-18 15:36 [PR PATCH] CPU-X: update to 4.3.0 TinfoilSubmarine
  2022-04-05 15:56 ` [PR PATCH] [Closed]: " TinfoilSubmarine
@ 2022-04-05 15:56 ` TinfoilSubmarine
  1 sibling, 0 replies; 3+ messages in thread
From: TinfoilSubmarine @ 2022-04-05 15:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/35684#issuecomment-1088916843

Comment:
Superseded by https://github.com/void-linux/void-packages/pull/36469

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-04-05 15:56 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-18 15:36 [PR PATCH] CPU-X: update to 4.3.0 TinfoilSubmarine
2022-04-05 15:56 ` [PR PATCH] [Closed]: " TinfoilSubmarine
2022-04-05 15:56 ` TinfoilSubmarine

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).