* Re: [PR PATCH] [Updated] libbytesize: update to 2.8.
2023-06-13 20:49 [PR PATCH] libbytesize: update to 2.8 mhmdanas
@ 2023-06-28 14:14 ` mhmdanas
2023-06-28 14:49 ` mhmdanas
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: mhmdanas @ 2023-06-28 14:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages libbytesize-2.8
https://github.com/void-linux/void-packages/pull/44419
libbytesize: update to 2.8.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### 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, (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/44419.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libbytesize-2.8-44419.patch --]
[-- Type: text/x-diff, Size: 1694 bytes --]
From cbd0f70514b7153de06938059ae92b8a8406a6ec Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 13 Jun 2023 21:47:38 +0100
Subject: [PATCH] libbytesize: update to 2.8.
---
srcpkgs/libbytesize/template | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index 2aabc29dcc64..3b4017c28028 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -1,6 +1,6 @@
# Template file for 'libbytesize'
pkgname=libbytesize
-version=2.7
+version=2.8
revision=1
build_style=gnu-configure
hostmakedepends="gettext python3"
@@ -12,9 +12,12 @@ license="LGPL-2.1-or-later"
homepage="https://github.com/storaged-project/libbytesize"
changelog="https://raw.githubusercontent.com/storaged-project/libbytesize/master/NEWS.rst"
distfiles="https://github.com/storaged-project/libbytesize/releases/download/${version}/libbytesize-${version}.tar.gz"
-checksum=8bae8287af6ef5624c320f70defdcd84ddc0c2057d3b59a5871897f27697811e
-# checks fails in libbytesize_unittest.sh
-make_check=no
+checksum=d87aef5a37e189b1cc827530e0feafa6529331fcbe2aabf330a01ad8ec95e1a0
+
+pre_check() {
+ # Requires python3-pocketlint, which is not packaged yet.
+ vsed -e 's/canary_tests.sh$//g' -i tests/Makefile
+}
libbytesize-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
@@ -30,6 +33,8 @@ libbytesize-python3_package() {
depends="python3-six ${sourcepkg}>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pkg_install() {
- vmove usr/lib/python3*
+ vmove "usr/lib/python3*"
+ # Requires the Python module.
+ vmove usr/bin/bscalc
}
}
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PR PATCH] [Updated] libbytesize: update to 2.8.
2023-06-13 20:49 [PR PATCH] libbytesize: update to 2.8 mhmdanas
2023-06-28 14:14 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-06-28 14:49 ` mhmdanas
2023-06-28 15:23 ` mhmdanas
2023-06-28 15:35 ` [PR PATCH] [Merged]: " ahesford
3 siblings, 0 replies; 5+ messages in thread
From: mhmdanas @ 2023-06-28 14:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages libbytesize-2.8
https://github.com/void-linux/void-packages/pull/44419
libbytesize: update to 2.8.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### 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, (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/44419.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libbytesize-2.8-44419.patch --]
[-- Type: text/x-diff, Size: 1865 bytes --]
From 34732b09e994e2260df0d4d3feab4d5b6d58aabc Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 13 Jun 2023 21:47:38 +0100
Subject: [PATCH] libbytesize: update to 2.8.
---
srcpkgs/libbytesize/template | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index 2aabc29dcc64..d1fa531256b3 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -1,9 +1,9 @@
# Template file for 'libbytesize'
pkgname=libbytesize
-version=2.7
+version=2.8
revision=1
build_style=gnu-configure
-hostmakedepends="gettext python3"
+hostmakedepends="pkg-config gettext python3"
makedepends="mpfr-devel pcre2-devel"
checkdepends="python3-six"
short_desc="Library for operations with sizes in bytes"
@@ -12,9 +12,12 @@ license="LGPL-2.1-or-later"
homepage="https://github.com/storaged-project/libbytesize"
changelog="https://raw.githubusercontent.com/storaged-project/libbytesize/master/NEWS.rst"
distfiles="https://github.com/storaged-project/libbytesize/releases/download/${version}/libbytesize-${version}.tar.gz"
-checksum=8bae8287af6ef5624c320f70defdcd84ddc0c2057d3b59a5871897f27697811e
-# checks fails in libbytesize_unittest.sh
-make_check=no
+checksum=d87aef5a37e189b1cc827530e0feafa6529331fcbe2aabf330a01ad8ec95e1a0
+
+pre_check() {
+ # Requires python3-pocketlint, which is not packaged yet.
+ vsed -e 's/canary_tests.sh$//g' -i tests/Makefile
+}
libbytesize-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
@@ -30,6 +33,8 @@ libbytesize-python3_package() {
depends="python3-six ${sourcepkg}>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pkg_install() {
- vmove usr/lib/python3*
+ vmove "usr/lib/python3*"
+ # Requires the Python module.
+ vmove usr/bin/bscalc
}
}
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PR PATCH] [Updated] libbytesize: update to 2.8.
2023-06-13 20:49 [PR PATCH] libbytesize: update to 2.8 mhmdanas
2023-06-28 14:14 ` [PR PATCH] [Updated] " mhmdanas
2023-06-28 14:49 ` mhmdanas
@ 2023-06-28 15:23 ` mhmdanas
2023-06-28 15:35 ` [PR PATCH] [Merged]: " ahesford
3 siblings, 0 replies; 5+ messages in thread
From: mhmdanas @ 2023-06-28 15:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1258 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages libbytesize-2.8
https://github.com/void-linux/void-packages/pull/44419
libbytesize: update to 2.8.
<!-- 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, (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/44419.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libbytesize-2.8-44419.patch --]
[-- Type: text/x-diff, Size: 2991 bytes --]
From d1022ced15872876a206b47e9863f2420db42769 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Tue, 13 Jun 2023 21:47:38 +0100
Subject: [PATCH] libbytesize: update to 2.8.
---
srcpkgs/libbytesize/patches/musl-fix-test.diff | 17 +++++++++++++++++
srcpkgs/libbytesize/template | 17 +++++++++++------
2 files changed, 28 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/libbytesize/patches/musl-fix-test.diff
diff --git a/srcpkgs/libbytesize/patches/musl-fix-test.diff b/srcpkgs/libbytesize/patches/musl-fix-test.diff
new file mode 100644
index 000000000000..51877fe68417
--- /dev/null
+++ b/srcpkgs/libbytesize/patches/musl-fix-test.diff
@@ -0,0 +1,17 @@
+diff --git a/tests/locale_utils.py b/tests/locale_utils.py
+index 7e4f369..c16f1bd 100644
+--- a/tests/locale_utils.py
++++ b/tests/locale_utils.py
+@@ -4,7 +4,11 @@ import subprocess
+ """Helper functions, decorators,... for working with locales"""
+
+ def get_avail_locales():
+- return {loc.decode(errors="replace").strip() for loc in subprocess.check_output(["locale", "-a"]).split()}
++ try:
++ return {loc.decode(errors="replace").strip() for loc in subprocess.check_output(["locale", "-a"]).split()}
++ except FileNotFoundError:
++ # musl and some other libc's don't support locales beyond what POSIX requires.
++ return {"C.UTF-8"}
+
+
+ def missing_locales(required, available):
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index 2aabc29dcc64..d1fa531256b3 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -1,9 +1,9 @@
# Template file for 'libbytesize'
pkgname=libbytesize
-version=2.7
+version=2.8
revision=1
build_style=gnu-configure
-hostmakedepends="gettext python3"
+hostmakedepends="pkg-config gettext python3"
makedepends="mpfr-devel pcre2-devel"
checkdepends="python3-six"
short_desc="Library for operations with sizes in bytes"
@@ -12,9 +12,12 @@ license="LGPL-2.1-or-later"
homepage="https://github.com/storaged-project/libbytesize"
changelog="https://raw.githubusercontent.com/storaged-project/libbytesize/master/NEWS.rst"
distfiles="https://github.com/storaged-project/libbytesize/releases/download/${version}/libbytesize-${version}.tar.gz"
-checksum=8bae8287af6ef5624c320f70defdcd84ddc0c2057d3b59a5871897f27697811e
-# checks fails in libbytesize_unittest.sh
-make_check=no
+checksum=d87aef5a37e189b1cc827530e0feafa6529331fcbe2aabf330a01ad8ec95e1a0
+
+pre_check() {
+ # Requires python3-pocketlint, which is not packaged yet.
+ vsed -e 's/canary_tests.sh$//g' -i tests/Makefile
+}
libbytesize-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
@@ -30,6 +33,8 @@ libbytesize-python3_package() {
depends="python3-six ${sourcepkg}>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pkg_install() {
- vmove usr/lib/python3*
+ vmove "usr/lib/python3*"
+ # Requires the Python module.
+ vmove usr/bin/bscalc
}
}
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PR PATCH] [Merged]: libbytesize: update to 2.8.
2023-06-13 20:49 [PR PATCH] libbytesize: update to 2.8 mhmdanas
` (2 preceding siblings ...)
2023-06-28 15:23 ` mhmdanas
@ 2023-06-28 15:35 ` ahesford
3 siblings, 0 replies; 5+ messages in thread
From: ahesford @ 2023-06-28 15:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]
There's a merged pull request on the void-packages repository
libbytesize: update to 2.8.
https://github.com/void-linux/void-packages/pull/44419
Description:
<!-- 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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 5+ messages in thread