Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] lshw: update to B.02.20.
@ 2024-05-24 13:38 Bnyro
  2024-07-10 18:18 ` [PR PATCH] [Updated] " Bnyro
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Bnyro @ 2024-05-24 13:38 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Bnyro/void-packages lshw
https://github.com/void-linux/void-packages/pull/50503

lshw: update to B.02.20.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, x86_64-glibc



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

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

From 8f9dc615e56ccc79208bdfec302a6728d505c6bb Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 24 May 2024 15:36:01 +0200
Subject: [PATCH] lshw: update to B.02.20.

---
 srcpkgs/lshw/patches/musl-long_bits.patch | 20 --------------------
 srcpkgs/lshw/template                     | 10 +++++-----
 2 files changed, 5 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/lshw/patches/musl-long_bits.patch

diff --git a/srcpkgs/lshw/patches/musl-long_bits.patch b/srcpkgs/lshw/patches/musl-long_bits.patch
deleted file mode 100644
index 6980bb47748a43..00000000000000
--- a/srcpkgs/lshw/patches/musl-long_bits.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-sysconf(LONG_BIT) isn't correct usage of sysconf(3).
-
-musl doesn't define _SC_LONG_BIT, so just use LONG_BIT directly. There's really
-no reason to use sysconf(3) here, word size isn't a runtime property.
-
-diff --git src/core/abi.cc src/core/abi.cc
-index adff7b5..76c664c 100644
---- a/src/core/abi.cc
-+++ b/src/core/abi.cc
-@@ -20,9 +20,7 @@ __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $");
- bool scan_abi(hwNode & system)
- {
-   // are we compiled as 32- or 64-bit process ?
--  long sc = sysconf(LONG_BIT);
--  if(sc==-1) sc = sysconf(_SC_LONG_BIT);
--  if(sc!=-1) system.setWidth(sc);
-+  system.setWidth(LONG_BIT);
- 
-   pushd(PROC_SYS);
- 
diff --git a/srcpkgs/lshw/template b/srcpkgs/lshw/template
index 6ba1bb44a9565b..2dbf0b73b8940a 100644
--- a/srcpkgs/lshw/template
+++ b/srcpkgs/lshw/template
@@ -1,21 +1,21 @@
 # Template file for 'lshw'
 pkgname=lshw
-version=B.02.19.2
-revision=2
+version=B.02.20
+revision=1
 build_style=gnu-makefile
 make_build_args="VERSION=${version}"
 make_build_target="all gui"
 make_install_args="SBINDIR=/usr/bin"
 make_install_target="install install-gui"
 make_use_env=yes
-hostmakedepends="docbook2x pkg-config"
-makedepends="gtk+-devel"
+hostmakedepends="docbook2x pkg-config git gettext"
+makedepends="gtk+3-devel"
 short_desc="Hardware lister application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://ezix.org/project/wiki/HardwareLiSter"
 distfiles="https://ezix.org/software/files/lshw-${version}.tar.gz"
-checksum=9bb347ac87142339a366a1759ac845e3dbb337ec000aa1b99b50ac6758a80f80
+checksum=06d9cf122422220e5dc94e8ea5b01816a69bb6b59368f63d7f21fff31fc6922a
 
 post_patch() {
 	vsed -i src/Makefile src/gui/Makefile \

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

* Re: [PR PATCH] [Updated] lshw: update to B.02.20.
  2024-05-24 13:38 [PR PATCH] lshw: update to B.02.20 Bnyro
@ 2024-07-10 18:18 ` Bnyro
  2024-07-10 18:27 ` Bnyro
  2024-07-10 18:32 ` Bnyro
  2 siblings, 0 replies; 4+ messages in thread
From: Bnyro @ 2024-07-10 18:18 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by Bnyro against master on the void-packages repository

https://github.com/Bnyro/void-packages lshw
https://github.com/void-linux/void-packages/pull/50503

lshw: update to B.02.20.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, x86_64-glibc



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

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

From 5eea2d49fd1d6de84075d5be82806df6cc6ec6a8 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 24 May 2024 15:36:01 +0200
Subject: [PATCH] lshw: update to B.02.20.

---
 srcpkgs/lshw/patches/musl-long_bits.patch | 20 --------------------
 srcpkgs/lshw/template                     | 10 +++++-----
 2 files changed, 5 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/lshw/patches/musl-long_bits.patch

diff --git a/srcpkgs/lshw/patches/musl-long_bits.patch b/srcpkgs/lshw/patches/musl-long_bits.patch
deleted file mode 100644
index 6980bb47748a43..00000000000000
--- a/srcpkgs/lshw/patches/musl-long_bits.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-sysconf(LONG_BIT) isn't correct usage of sysconf(3).
-
-musl doesn't define _SC_LONG_BIT, so just use LONG_BIT directly. There's really
-no reason to use sysconf(3) here, word size isn't a runtime property.
-
-diff --git src/core/abi.cc src/core/abi.cc
-index adff7b5..76c664c 100644
---- a/src/core/abi.cc
-+++ b/src/core/abi.cc
-@@ -20,9 +20,7 @@ __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $");
- bool scan_abi(hwNode & system)
- {
-   // are we compiled as 32- or 64-bit process ?
--  long sc = sysconf(LONG_BIT);
--  if(sc==-1) sc = sysconf(_SC_LONG_BIT);
--  if(sc!=-1) system.setWidth(sc);
-+  system.setWidth(LONG_BIT);
- 
-   pushd(PROC_SYS);
- 
diff --git a/srcpkgs/lshw/template b/srcpkgs/lshw/template
index 6ba1bb44a9565b..2dbf0b73b8940a 100644
--- a/srcpkgs/lshw/template
+++ b/srcpkgs/lshw/template
@@ -1,21 +1,21 @@
 # Template file for 'lshw'
 pkgname=lshw
-version=B.02.19.2
-revision=2
+version=B.02.20
+revision=1
 build_style=gnu-makefile
 make_build_args="VERSION=${version}"
 make_build_target="all gui"
 make_install_args="SBINDIR=/usr/bin"
 make_install_target="install install-gui"
 make_use_env=yes
-hostmakedepends="docbook2x pkg-config"
-makedepends="gtk+-devel"
+hostmakedepends="docbook2x pkg-config git gettext"
+makedepends="gtk+3-devel"
 short_desc="Hardware lister application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://ezix.org/project/wiki/HardwareLiSter"
 distfiles="https://ezix.org/software/files/lshw-${version}.tar.gz"
-checksum=9bb347ac87142339a366a1759ac845e3dbb337ec000aa1b99b50ac6758a80f80
+checksum=06d9cf122422220e5dc94e8ea5b01816a69bb6b59368f63d7f21fff31fc6922a
 
 post_patch() {
 	vsed -i src/Makefile src/gui/Makefile \

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

* Re: [PR PATCH] [Updated] lshw: update to B.02.20.
  2024-05-24 13:38 [PR PATCH] lshw: update to B.02.20 Bnyro
  2024-07-10 18:18 ` [PR PATCH] [Updated] " Bnyro
@ 2024-07-10 18:27 ` Bnyro
  2024-07-10 18:32 ` Bnyro
  2 siblings, 0 replies; 4+ messages in thread
From: Bnyro @ 2024-07-10 18:27 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by Bnyro against master on the void-packages repository

https://github.com/Bnyro/void-packages lshw
https://github.com/void-linux/void-packages/pull/50503

lshw: update to B.02.20.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, x86_64-glibc



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

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

From 2f978e7f7444de985334f3fe6e3701c2d974314e Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 24 May 2024 15:36:01 +0200
Subject: [PATCH] lshw: update to B.02.20.

---
 srcpkgs/lshw/patches/musl-long_bits.patch | 20 --------------------
 srcpkgs/lshw/template                     | 10 +++++-----
 2 files changed, 5 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/lshw/patches/musl-long_bits.patch

diff --git a/srcpkgs/lshw/patches/musl-long_bits.patch b/srcpkgs/lshw/patches/musl-long_bits.patch
deleted file mode 100644
index 6980bb47748a43..00000000000000
--- a/srcpkgs/lshw/patches/musl-long_bits.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-sysconf(LONG_BIT) isn't correct usage of sysconf(3).
-
-musl doesn't define _SC_LONG_BIT, so just use LONG_BIT directly. There's really
-no reason to use sysconf(3) here, word size isn't a runtime property.
-
-diff --git src/core/abi.cc src/core/abi.cc
-index adff7b5..76c664c 100644
---- a/src/core/abi.cc
-+++ b/src/core/abi.cc
-@@ -20,9 +20,7 @@ __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $");
- bool scan_abi(hwNode & system)
- {
-   // are we compiled as 32- or 64-bit process ?
--  long sc = sysconf(LONG_BIT);
--  if(sc==-1) sc = sysconf(_SC_LONG_BIT);
--  if(sc!=-1) system.setWidth(sc);
-+  system.setWidth(LONG_BIT);
- 
-   pushd(PROC_SYS);
- 
diff --git a/srcpkgs/lshw/template b/srcpkgs/lshw/template
index 6ba1bb44a9565b..2dbf0b73b8940a 100644
--- a/srcpkgs/lshw/template
+++ b/srcpkgs/lshw/template
@@ -1,21 +1,21 @@
 # Template file for 'lshw'
 pkgname=lshw
-version=B.02.19.2
-revision=2
+version=B.02.20
+revision=1
 build_style=gnu-makefile
 make_build_args="VERSION=${version}"
 make_build_target="all gui"
 make_install_args="SBINDIR=/usr/bin"
 make_install_target="install install-gui"
 make_use_env=yes
-hostmakedepends="docbook2x pkg-config"
-makedepends="gtk+-devel"
+hostmakedepends="docbook2x pkg-config git gettext"
+makedepends="gtk+3-devel"
 short_desc="Hardware lister application"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://ezix.org/project/wiki/HardwareLiSter"
 distfiles="https://ezix.org/software/files/lshw-${version}.tar.gz"
-checksum=9bb347ac87142339a366a1759ac845e3dbb337ec000aa1b99b50ac6758a80f80
+checksum=06d9cf122422220e5dc94e8ea5b01816a69bb6b59368f63d7f21fff31fc6922a
 
 post_patch() {
 	vsed -i src/Makefile src/gui/Makefile \

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

* Re: lshw: update to B.02.20.
  2024-05-24 13:38 [PR PATCH] lshw: update to B.02.20 Bnyro
  2024-07-10 18:18 ` [PR PATCH] [Updated] " Bnyro
  2024-07-10 18:27 ` Bnyro
@ 2024-07-10 18:32 ` Bnyro
  2 siblings, 0 replies; 4+ messages in thread
From: Bnyro @ 2024-07-10 18:32 UTC (permalink / raw)
  To: ml

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

New comment by Bnyro on void-packages repository

https://github.com/void-linux/void-packages/pull/50503#issuecomment-2221180526

Comment:
Builds randomly fail sometimes, and sometimes work, same in CI and locally.

No clue why, but I'm not really interested in searching the reason for a non-deterministic build failure.

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

end of thread, other threads:[~2024-07-10 18:32 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-24 13:38 [PR PATCH] lshw: update to B.02.20 Bnyro
2024-07-10 18:18 ` [PR PATCH] [Updated] " Bnyro
2024-07-10 18:27 ` Bnyro
2024-07-10 18:32 ` Bnyro

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