Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] libgweather: silence warnings on musl with metric
@ 2022-09-18 20:28 paper42
  2022-09-18 20:35 ` paper42
  2022-09-18 23:54 ` [PR PATCH] [Merged]: " paper42
  0 siblings, 2 replies; 3+ messages in thread
From: paper42 @ 2022-09-18 20:28 UTC (permalink / raw)
  To: ml

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

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

* Re: libgweather: silence warnings on musl with metric
  2022-09-18 20:28 [PR PATCH] libgweather: silence warnings on musl with metric paper42
@ 2022-09-18 20:35 ` paper42
  2022-09-18 23:54 ` [PR PATCH] [Merged]: " paper42
  1 sibling, 0 replies; 3+ messages in thread
From: paper42 @ 2022-09-18 20:35 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/39352#issuecomment-1250382359

Comment:
I don't think the revert lint is correct in this case, 40.0_1 > 4.0.0_2

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

* Re: [PR PATCH] [Merged]: libgweather: silence warnings on musl with metric
  2022-09-18 20:28 [PR PATCH] libgweather: silence warnings on musl with metric paper42
  2022-09-18 20:35 ` paper42
@ 2022-09-18 23:54 ` paper42
  1 sibling, 0 replies; 3+ messages in thread
From: paper42 @ 2022-09-18 23:54 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

libgweather: silence warnings on musl with metric
https://github.com/void-linux/void-packages/pull/39352

Description:
<!-- 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
-->


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

end of thread, other threads:[~2022-09-18 23:54 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-18 20:28 [PR PATCH] libgweather: silence warnings on musl with metric paper42
2022-09-18 20:35 ` paper42
2022-09-18 23:54 ` [PR PATCH] [Merged]: " paper42

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