Github messages for voidlinux
 help / color / mirror / Atom feed
From: mhmdanas <mhmdanas@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] libbytesize: update to 2.8.
Date: Wed, 28 Jun 2023 17:23:58 +0200	[thread overview]
Message-ID: <20230628152358.S-U5qllL8tAHxXanFQbal45P9V2LmcRED59s7YzzFyw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-44419@inbox.vuxu.org>

[-- 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
 	}
 }

  parent reply	other threads:[~2023-06-28 15:23 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-13 20:49 [PR PATCH] " mhmdanas
2023-06-28 14:14 ` [PR PATCH] [Updated] " mhmdanas
2023-06-28 14:49 ` mhmdanas
2023-06-28 15:23 ` mhmdanas [this message]
2023-06-28 15:35 ` [PR PATCH] [Merged]: " ahesford

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230628152358.S-U5qllL8tAHxXanFQbal45P9V2LmcRED59s7YzzFyw@z \
    --to=mhmdanas@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).