From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] libgweather: silence warnings on musl with metric
Date: Sun, 18 Sep 2022 22:28:25 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39352@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1367 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages libgweather-metric-musl
https://github.com/void-linux/void-packages/pull/39352
libgweather: silence warnings on musl with metric
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
musl systems with metric locales displayed a lot of warnings because of a logic error
<!--
#### 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/39352.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libgweather-metric-musl-39352.patch --]
[-- Type: text/x-diff, Size: 2386 bytes --]
From 950b938cbeb082a369d768eddeaf6ccf5e38a818 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 18 Sep 2022 19:40:23 +0200
Subject: [PATCH] libgweather: silence warnings on musl with metric
---
...fallback-metric-unit-detection-logic.patch | 32 +++++++++++++++++++
srcpkgs/libgweather/template | 2 +-
2 files changed, 33 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/libgweather/patches/0001-Fix-fallback-metric-unit-detection-logic.patch
diff --git a/srcpkgs/libgweather/patches/0001-Fix-fallback-metric-unit-detection-logic.patch b/srcpkgs/libgweather/patches/0001-Fix-fallback-metric-unit-detection-logic.patch
new file mode 100644
index 000000000000..f01db684fe4d
--- /dev/null
+++ b/srcpkgs/libgweather/patches/0001-Fix-fallback-metric-unit-detection-logic.patch
@@ -0,0 +1,32 @@
+From e65f3041b1a14dc7d46935091b35ae6a7236d118 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sun, 18 Sep 2022 19:32:51 +0200
+Subject: [PATCH] Fix fallback metric unit detection logic
+
+When HAVE__NL_MEASUREMENT_MEASUREMENT is not defined (for example on
+musl systems), the fallback logic checks for units in translation files.
+
+If the unit in translation files is metric, we should use metric and
+not print a warning about missing translation and use metric.
+
+Introduced in 1c140fc8ce08260d5008847945bf345654ad7fa8
+---
+ libgweather/gweather-info.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgweather/gweather-info.c b/libgweather/gweather-info.c
+index d33d3905..193ee86c 100644
+--- a/libgweather/gweather-info.c
++++ b/libgweather/gweather-info.c
+@@ -880,7 +880,7 @@ is_locale_metric (void)
+
+ if (strcmp (e, "default:inch") == 0)
+ return FALSE;
+- else if (strcmp (e, "default:mm") == 1)
++ else if (strcmp (e, "default:mm") == 0)
+ return TRUE;
+ else {
+ g_warning ("Wrong translation for libgweather; please file "
+--
+2.37.3
+
diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template
index da1cea0e42c9..cd14de2d4b7b 100644
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@@ -2,7 +2,7 @@
pkgname=libgweather
reverts="40.0_1"
version=4.0.0
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="$(vopt_bool gir enable_vala) $(vopt_bool gir introspection)
next reply other threads:[~2022-09-18 20:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-18 20:28 paper42 [this message]
2022-09-18 20:35 ` paper42
2022-09-18 23:54 ` [PR PATCH] [Merged]: " paper42
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39352@inbox.vuxu.org \
--to=paper42@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).