* Re: [PR PATCH] [Updated] xosview: update to 1.23.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35931@inbox.vuxu.org>
@ 2022-03-02 21:14 ` tibequadorian
2022-03-03 22:20 ` paper42
` (2 subsequent siblings)
3 siblings, 0 replies; 4+ messages in thread
From: tibequadorian @ 2022-03-02 21:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1226 bytes --]
There is an updated pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages xosview
https://github.com/void-linux/void-packages/pull/35931
xosview: update to 1.23.
<!-- 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/35931.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xosview-35931.patch --]
[-- Type: text/x-diff, Size: 2535 bytes --]
From 13bd3cce0feb19a33ca7aa6b9f80c5a30381f6e6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 2 Mar 2022 22:09:23 +0100
Subject: [PATCH] xosview: update to 1.23.
---
srcpkgs/xosview/patches/musl-fix.patch | 14 --------------
srcpkgs/xosview/patches/musl.patch | 12 ++++++++++++
srcpkgs/xosview/template | 6 +++---
3 files changed, 15 insertions(+), 17 deletions(-)
delete mode 100644 srcpkgs/xosview/patches/musl-fix.patch
create mode 100644 srcpkgs/xosview/patches/musl.patch
diff --git a/srcpkgs/xosview/patches/musl-fix.patch b/srcpkgs/xosview/patches/musl-fix.patch
deleted file mode 100644
index 879008fe051f..000000000000
--- a/srcpkgs/xosview/patches/musl-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/linux/serialmeter.cc 2016-01-02 10:39:10.279496776 +0100
-+++ b/linux/serialmeter.cc 2016-01-02 10:37:54.667491325 +0100
-@@ -39,9 +39,11 @@
- #endif
- #else
- #if !defined(__alpha__) && !defined(__sparc__) && !defined(__powerpc__) && !defined(__ia64__) && !defined(__m68k__)
-+#if defined(HAVE_ASM_IO_H)
- #include <asm/io.h>
- #endif
- #endif
-+#endif
- #include <linux/serial.h>
-
-
diff --git a/srcpkgs/xosview/patches/musl.patch b/srcpkgs/xosview/patches/musl.patch
new file mode 100644
index 000000000000..26c5160162bc
--- /dev/null
+++ b/srcpkgs/xosview/patches/musl.patch
@@ -0,0 +1,12 @@
+diff --git a/linux/serialmeter.cc b/linux/serialmeter.cc
+index 8211316..50de182 100644
+--- a/linux/serialmeter.cc
++++ b/linux/serialmeter.cc
+@@ -25,7 +25,6 @@
+ */
+ #if defined(__i386__) || defined(__ia64__) || defined(__amd64__)
+ #include <sys/io.h>
+-#include <sys/perm.h>
+ #define HAVE_IOPERM
+ #endif
+
diff --git a/srcpkgs/xosview/template b/srcpkgs/xosview/template
index 3d6c3ab6c1f9..69715f530985 100644
--- a/srcpkgs/xosview/template
+++ b/srcpkgs/xosview/template
@@ -1,15 +1,15 @@
# Template file for 'xosview'
pkgname=xosview
-version=1.22
+version=1.23
revision=1
build_style=gnu-makefile
makedepends="libXpm-devel"
-short_desc="A classic system monitoring tool"
+short_desc="Classic system monitoring tool"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-2.0-or-later"
homepage="http://www.pogo.org.uk/~mark/xosview"
distfiles="http://www.pogo.org.uk/~mark/xosview/releases/xosview-${version}.tar.gz"
-checksum=901b75af2676b11b28b88f0c79c5bd0f4f01de4790c0c5385edf6d71aee1f83a
+checksum=960acb68a8668e936e8dc71cc4e3926d879f47559b4a5f64555bdcc676c6739d
case "$XBPS_TARGET_MACHINE" in
*-musl) # does not have asm/io.h
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: xosview: update to 1.23.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35931@inbox.vuxu.org>
2022-03-02 21:14 ` [PR PATCH] [Updated] xosview: update to 1.23 tibequadorian
@ 2022-03-03 22:20 ` paper42
2022-03-03 22:29 ` tibequadorian
2022-03-08 21:49 ` [PR PATCH] [Merged]: " leahneukirchen
3 siblings, 0 replies; 4+ messages in thread
From: paper42 @ 2022-03-03 22:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/35931#issuecomment-1058560569
Comment:
Did you get the musl patch somewhere? If yes, it would be nice to link to the source.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: xosview: update to 1.23.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35931@inbox.vuxu.org>
2022-03-02 21:14 ` [PR PATCH] [Updated] xosview: update to 1.23 tibequadorian
2022-03-03 22:20 ` paper42
@ 2022-03-03 22:29 ` tibequadorian
2022-03-08 21:49 ` [PR PATCH] [Merged]: " leahneukirchen
3 siblings, 0 replies; 4+ messages in thread
From: tibequadorian @ 2022-03-03 22:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 163 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/35931#issuecomment-1058572130
Comment:
No, thats mine.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: xosview: update to 1.23.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35931@inbox.vuxu.org>
` (2 preceding siblings ...)
2022-03-03 22:29 ` tibequadorian
@ 2022-03-08 21:49 ` leahneukirchen
3 siblings, 0 replies; 4+ messages in thread
From: leahneukirchen @ 2022-03-08 21:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1058 bytes --]
There's a merged pull request on the void-packages repository
xosview: update to 1.23.
https://github.com/void-linux/void-packages/pull/35931
Description:
<!-- 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] 4+ messages in thread
end of thread, other threads:[~2022-03-08 21:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35931@inbox.vuxu.org>
2022-03-02 21:14 ` [PR PATCH] [Updated] xosview: update to 1.23 tibequadorian
2022-03-03 22:20 ` paper42
2022-03-03 22:29 ` tibequadorian
2022-03-08 21:49 ` [PR PATCH] [Merged]: " leahneukirchen
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).