* [PR PATCH] iio-sensor-proxy: update to 3.5.
@ 2024-04-20 20:22 fanyx
2024-04-20 21:13 ` oreo639
` (17 more replies)
0 siblings, 18 replies; 19+ messages in thread
From: fanyx @ 2024-04-20 20:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 599 bytes --]
There is a new pull request by fanyx against master on the void-packages repository
https://github.com/fanyx/void-packages iio-sensor-proxy
https://github.com/void-linux/void-packages/pull/49940
iio-sensor-proxy: update to 3.5.
#### Testing the changes
- I tested the changes in this PR: **NO**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64
- armv7l
A patch file from https://github.com/void-linux/void-packages/pull/49940.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-iio-sensor-proxy-49940.patch --]
[-- Type: text/x-diff, Size: 1251 bytes --]
From 64be289801f23471b0b138f205895e711df9ebe6 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Sat, 20 Apr 2024 22:21:39 +0200
Subject: [PATCH] iio-sensor-proxy: update to 3.5.
---
srcpkgs/iio-sensor-proxy/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index d76a6f58b32751..195b1b57137429 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,6 +1,6 @@
# Template file for 'iio-sensor-proxy'
pkgname=iio-sensor-proxy
-version=3.4
+version=3.5
revision=1
build_style=meson
configure_args="-Dsystemdsystemunitdir=/usr/lib/systemd/system/
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
changelog="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/raw/master/NEWS"
distfiles="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=9339af3bc83994a43ab25231a8ffe9ada6d9afbc16edc44d575dd9f2a69ede3c
+checksum=8689425f2287626a95d95b1e1e5b62e497d09dd08cf411084ed22166d4a49da5
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -Dtests=true -Dgtk-tests=true"
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: iio-sensor-proxy: update to 3.5.
2024-04-20 20:22 [PR PATCH] iio-sensor-proxy: update to 3.5 fanyx
@ 2024-04-20 21:13 ` oreo639
2024-04-20 21:15 ` oreo639
` (16 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-04-20 21:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/49940#issuecomment-2067782554
Comment:
Remove the fr_FR workaround and add this patch: https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/commit/fe56bdba1243cc5f6a652eb75d11ae1d1957ff7e
Also make sure to test it.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: iio-sensor-proxy: update to 3.5.
2024-04-20 20:22 [PR PATCH] iio-sensor-proxy: update to 3.5 fanyx
2024-04-20 21:13 ` oreo639
@ 2024-04-20 21:15 ` oreo639
2024-04-20 21:17 ` oreo639
` (15 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-04-20 21:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 403 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/49940#issuecomment-2067782554
Comment:
Remove the fr_FR workaround and add this patch: https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/commit/fe56bdba1243cc5f6a652eb75d11ae1d1957ff7e
> I tested the changes in this PR: NO
https://gitlab.freedesktop.org/hadess/iio-sensor-proxy#debugging
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: iio-sensor-proxy: update to 3.5.
2024-04-20 20:22 [PR PATCH] iio-sensor-proxy: update to 3.5 fanyx
2024-04-20 21:13 ` oreo639
2024-04-20 21:15 ` oreo639
@ 2024-04-20 21:17 ` oreo639
2024-04-20 21:17 ` oreo639
` (14 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-04-20 21:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 455 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/49940#issuecomment-2067782554
Comment:
Remove the fr_FR workaround and add this patch: https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/commit/fe56bdba1243cc5f6a652eb75d11ae1d1957ff7e
> I tested the changes in this PR: NO
https://gitlab.freedesktop.org/hadess/iio-sensor-proxy#debugging
Some features require a foldable laptop to test.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: iio-sensor-proxy: update to 3.5.
2024-04-20 20:22 [PR PATCH] iio-sensor-proxy: update to 3.5 fanyx
` (2 preceding siblings ...)
2024-04-20 21:17 ` oreo639
@ 2024-04-20 21:17 ` oreo639
2024-04-20 21:17 ` oreo639
` (13 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-04-20 21:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 460 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/49940#issuecomment-2067782554
Comment:
Remove the fr_FR workaround and add this patch: https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/commit/fe56bdba1243cc5f6a652eb75d11ae1d1957ff7e
> I tested the changes in this PR: NO
https://gitlab.freedesktop.org/hadess/iio-sensor-proxy#debugging
Some features require a foldable laptop to test, btw.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: iio-sensor-proxy: update to 3.5.
2024-04-20 20:22 [PR PATCH] iio-sensor-proxy: update to 3.5 fanyx
` (3 preceding siblings ...)
2024-04-20 21:17 ` oreo639
@ 2024-04-20 21:17 ` oreo639
2024-04-20 21:20 ` fanyx
` (12 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-04-20 21:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 455 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/49940#issuecomment-2067782554
Comment:
Remove the fr_FR workaround and add this patch: https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/commit/fe56bdba1243cc5f6a652eb75d11ae1d1957ff7e
> I tested the changes in this PR: NO
https://gitlab.freedesktop.org/hadess/iio-sensor-proxy#debugging
Some features require a foldable laptop to test.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: iio-sensor-proxy: update to 3.5.
2024-04-20 20:22 [PR PATCH] iio-sensor-proxy: update to 3.5 fanyx
` (4 preceding siblings ...)
2024-04-20 21:17 ` oreo639
@ 2024-04-20 21:20 ` fanyx
2024-04-20 21:23 ` [PR PATCH] [Updated] " fanyx
` (11 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: fanyx @ 2024-04-20 21:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
New comment by fanyx on void-packages repository
https://github.com/void-linux/void-packages/pull/49940#issuecomment-2067784746
Comment:
Tests succeed after adding the patch.
I'll test it once i'm back on my laptop
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] iio-sensor-proxy: update to 3.5.
2024-04-20 20:22 [PR PATCH] iio-sensor-proxy: update to 3.5 fanyx
` (5 preceding siblings ...)
2024-04-20 21:20 ` fanyx
@ 2024-04-20 21:23 ` fanyx
2024-04-20 21:32 ` fanyx
` (10 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: fanyx @ 2024-04-20 21:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 604 bytes --]
There is an updated pull request by fanyx against master on the void-packages repository
https://github.com/fanyx/void-packages iio-sensor-proxy
https://github.com/void-linux/void-packages/pull/49940
iio-sensor-proxy: update to 3.5.
#### Testing the changes
- I tested the changes in this PR: **NO**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64
- armv7l
A patch file from https://github.com/void-linux/void-packages/pull/49940.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-iio-sensor-proxy-49940.patch --]
[-- Type: text/x-diff, Size: 5866 bytes --]
From c69132e30b4dc158bd8e6d93169b89f83084e7bf Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Sat, 20 Apr 2024 22:21:39 +0200
Subject: [PATCH] iio-sensor-proxy: update to 3.5.
---
.../patches/fr_FR_locale-test.patch | 101 ++++++++++++++++++
srcpkgs/iio-sensor-proxy/template | 12 +--
2 files changed, 103 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/iio-sensor-proxy/patches/fr_FR_locale-test.patch
diff --git a/srcpkgs/iio-sensor-proxy/patches/fr_FR_locale-test.patch b/srcpkgs/iio-sensor-proxy/patches/fr_FR_locale-test.patch
new file mode 100644
index 00000000000000..8c6c3d19bf7179
--- /dev/null
+++ b/srcpkgs/iio-sensor-proxy/patches/fr_FR_locale-test.patch
@@ -0,0 +1,101 @@
+From fe56bdba1243cc5f6a652eb75d11ae1d1957ff7e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Mon, 4 Mar 2024 08:18:54 +0100
+Subject: [PATCH] tests: Skip some test when fr_FR locale isn't available
+
+Some test require that locale so skip those when it is unavailable.
+
+Closes: #392
+---
+ src/test-mount-matrix.c | 8 ++++++--
+ tests/integration-test.py | 20 +++++++++++++++-----
+ 2 files changed, 21 insertions(+), 7 deletions(-)
+
+diff --git a/src/test-mount-matrix.c b/src/test-mount-matrix.c
+index 0cf6c34..d0b608c 100644
+--- a/src/test-mount-matrix.c
++++ b/src/test-mount-matrix.c
+@@ -66,12 +66,16 @@ test_mount_matrix (void)
+ static void
+ test_comma_decimal_separator (void)
+ {
++ const char *fr_locale = "fr_FR.UTF-8";
+ char *old_locale;
+ AccelVec3 *vecs;
+
+- old_locale = setlocale (LC_ALL, "fr_FR.UTF-8");
++ old_locale = setlocale (LC_ALL, fr_locale);
+ /* French locale not available? */
+- g_assert_nonnull (old_locale);
++ if (!old_locale) {
++ g_test_skip_printf ("Local %s not available", fr_locale);
++ return;
++ }
+
+ /* Default matrix */
+ g_assert_true (parse_mount_matrix (DEFAULT_MATRIX, &vecs));
+diff --git a/tests/integration-test.py b/tests/integration-test.py
+index 20c0e92..4ccabb3 100755
+--- a/tests/integration-test.py
++++ b/tests/integration-test.py
+@@ -27,6 +27,7 @@ import tempfile
+ import psutil
+ import subprocess
+ import unittest
++import locale
+ import time
+
+ try:
+@@ -50,6 +51,7 @@ SP_COMPASS = 'net.hadess.SensorProxy.Compass'
+ SP_COMPASS_PATH = '/net/hadess/SensorProxy/Compass'
+
+ class Tests(dbusmock.DBusTestCase):
++
+ @classmethod
+ def setUpClass(cls):
+ # run from local build tree if we are in one, otherwise use system instance
+@@ -92,6 +94,15 @@ class Tests(dbusmock.DBusTestCase):
+ cls.dbus = Gio.bus_get_sync(Gio.BusType.SYSTEM, None)
+ cls.dbus_con = cls.get_dbus(True)
+
++ # Some test outputs require the daemon to run under the fr locale:
++ # so check if that's available
++ try:
++ old_loc = locale.setlocale(locale.LC_ALL, 'fr_FR.UTF-8')
++ cls.has_fr = True
++ locale.setlocale(locale.LC_ALL, old_loc)
++ except:
++ cls.has_fr = False
++
+ @classmethod
+ def tearDownClass(cls):
+ cls.test_bus.down()
+@@ -612,10 +623,9 @@ class Tests(dbusmock.DBusTestCase):
+ mock_file.write(data)
+ self.proxy.ClaimAccelerometer()
+ self.assertEventually(lambda: self.have_text_in_log('Accel sent by driver'))
+- # If the 2nd test fails, it's likely that fr_FR.UTF-8 locale isn't supported
+ self.assertEqual(self.have_text_in_log('scale: 0,000000,0,000000,0,000000'), False)
+- self.assertEqual(self.have_text_in_log('scale: 0,000010,0,000010,0,000010'), True)
+-
++ if self.has_fr:
++ self.assertEqual(self.have_text_in_log('scale: 0,000010,0,000010,0,000010'), True)
+ self.stop_daemon()
+
+ def test_iio_scale_decimal_separator_offset(self):
+@@ -715,9 +725,9 @@ class Tests(dbusmock.DBusTestCase):
+
+ self.proxy.ClaimAccelerometer()
+ self.assertEventually(lambda: self.have_text_in_log('Accel read from IIO on'))
+- # If the 2nd test fails, it's likely that fr_FR.UTF-8 locale isn't supported
+ self.assertEqual(self.have_text_in_log('scale 1,000000,1,000000,1,000000'), False)
+- self.assertEqual(self.have_text_in_log('scale 0,000001,0,000001,0,000001'), True)
++ if self.has_fr:
++ self.assertEqual(self.have_text_in_log('scale 0,000001,0,000001,0,000001'), True)
+
+ self.assertEventually(lambda: self.get_dbus_property('AccelerometerOrientation') == 'normal')
+
+--
+GitLab
+
+
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index d76a6f58b32751..e8cb56bba08528 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,6 +1,6 @@
# Template file for 'iio-sensor-proxy'
pkgname=iio-sensor-proxy
-version=3.4
+version=3.5
revision=1
build_style=meson
configure_args="-Dsystemdsystemunitdir=/usr/lib/systemd/system/
@@ -14,20 +14,12 @@ license="GPL-3.0-or-later"
homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
changelog="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/raw/master/NEWS"
distfiles="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=9339af3bc83994a43ab25231a8ffe9ada6d9afbc16edc44d575dd9f2a69ede3c
+checksum=8689425f2287626a95d95b1e1e5b62e497d09dd08cf411084ed22166d4a49da5
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -Dtests=true -Dgtk-tests=true"
fi
-post_patch() {
- # Tests expect a fr_FR.UTF-8 locale
- vsed -i -e "/env\['LC_NUMERIC'\]/d" tests/integration-test.py
- vsed -i -e 's/scale: 0,000010,0,000010,0,000010/scale: 0.000010,0.000010,0.000010/g' \
- -e 's/scale 0,000001,0,000001,0,000001/scale 0.000001,0.000001,0.000001/g' \
- tests/integration-test.py
-}
-
post_install() {
vsv iio-sensor-proxy
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: iio-sensor-proxy: update to 3.5.
2024-04-20 20:22 [PR PATCH] iio-sensor-proxy: update to 3.5 fanyx
` (6 preceding siblings ...)
2024-04-20 21:23 ` [PR PATCH] [Updated] " fanyx
@ 2024-04-20 21:32 ` fanyx
2024-04-20 21:37 ` oreo639
` (9 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: fanyx @ 2024-04-20 21:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 266 bytes --]
New comment by fanyx on void-packages repository
https://github.com/void-linux/void-packages/pull/49940#issuecomment-2067784746
Comment:
Tests succeed after adding the patch.
I'll test it once i'm back on my laptop
oops, nevermind, only tested on x86_64-glibc
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: iio-sensor-proxy: update to 3.5.
2024-04-20 20:22 [PR PATCH] iio-sensor-proxy: update to 3.5 fanyx
` (7 preceding siblings ...)
2024-04-20 21:32 ` fanyx
@ 2024-04-20 21:37 ` oreo639
2024-04-20 21:37 ` oreo639
` (8 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-04-20 21:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 208 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/49940#issuecomment-2067787982
Comment:
Add back the vsed to do `s/cls.has_fr = True/cls.has_fr = False/`.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: iio-sensor-proxy: update to 3.5.
2024-04-20 20:22 [PR PATCH] iio-sensor-proxy: update to 3.5 fanyx
` (8 preceding siblings ...)
2024-04-20 21:37 ` oreo639
@ 2024-04-20 21:37 ` oreo639
2024-04-20 21:38 ` oreo639
` (7 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-04-20 21:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 212 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/49940#issuecomment-2067787982
Comment:
Add a post_patch vsed to do `s/cls.has_fr = True/cls.has_fr = False/`.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: iio-sensor-proxy: update to 3.5.
2024-04-20 20:22 [PR PATCH] iio-sensor-proxy: update to 3.5 fanyx
` (9 preceding siblings ...)
2024-04-20 21:37 ` oreo639
@ 2024-04-20 21:38 ` oreo639
2024-04-20 21:45 ` oreo639
` (6 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-04-20 21:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/49940#issuecomment-2067787982
Comment:
Add a post_patch vsed to do `s/cls.has_fr = True/cls.has_fr = False/` in `tests/integration-test.py`.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: iio-sensor-proxy: update to 3.5.
2024-04-20 20:22 [PR PATCH] iio-sensor-proxy: update to 3.5 fanyx
` (10 preceding siblings ...)
2024-04-20 21:38 ` oreo639
@ 2024-04-20 21:45 ` oreo639
2024-04-20 21:58 ` [PR PATCH] [Updated] " fanyx
` (5 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-04-20 21:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/49940#issuecomment-2067782554
Comment:
Remove the fr_FR workaround and add this patch: https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/commit/fe56bdba1243cc5f6a652eb75d11ae1d1957ff7e
> I tested the changes in this PR: NO
You can use the `monitor-sensor` command.
https://gitlab.freedesktop.org/hadess/iio-sensor-proxy#debugging
Some features require a foldable laptop to test.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] iio-sensor-proxy: update to 3.5.
2024-04-20 20:22 [PR PATCH] iio-sensor-proxy: update to 3.5 fanyx
` (11 preceding siblings ...)
2024-04-20 21:45 ` oreo639
@ 2024-04-20 21:58 ` fanyx
2024-04-20 22:54 ` fanyx
` (4 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: fanyx @ 2024-04-20 21:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 604 bytes --]
There is an updated pull request by fanyx against master on the void-packages repository
https://github.com/fanyx/void-packages iio-sensor-proxy
https://github.com/void-linux/void-packages/pull/49940
iio-sensor-proxy: update to 3.5.
#### Testing the changes
- I tested the changes in this PR: **NO**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64
- armv7l
A patch file from https://github.com/void-linux/void-packages/pull/49940.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-iio-sensor-proxy-49940.patch --]
[-- Type: text/x-diff, Size: 5919 bytes --]
From d603bae035e27487b67d2d12966a8f59e47fbecc Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Sat, 20 Apr 2024 22:21:39 +0200
Subject: [PATCH] iio-sensor-proxy: update to 3.5.
---
.../patches/fr_FR_locale-test.patch | 101 ++++++++++++++++++
srcpkgs/iio-sensor-proxy/template | 10 +-
2 files changed, 104 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/iio-sensor-proxy/patches/fr_FR_locale-test.patch
diff --git a/srcpkgs/iio-sensor-proxy/patches/fr_FR_locale-test.patch b/srcpkgs/iio-sensor-proxy/patches/fr_FR_locale-test.patch
new file mode 100644
index 00000000000000..8c6c3d19bf7179
--- /dev/null
+++ b/srcpkgs/iio-sensor-proxy/patches/fr_FR_locale-test.patch
@@ -0,0 +1,101 @@
+From fe56bdba1243cc5f6a652eb75d11ae1d1957ff7e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Mon, 4 Mar 2024 08:18:54 +0100
+Subject: [PATCH] tests: Skip some test when fr_FR locale isn't available
+
+Some test require that locale so skip those when it is unavailable.
+
+Closes: #392
+---
+ src/test-mount-matrix.c | 8 ++++++--
+ tests/integration-test.py | 20 +++++++++++++++-----
+ 2 files changed, 21 insertions(+), 7 deletions(-)
+
+diff --git a/src/test-mount-matrix.c b/src/test-mount-matrix.c
+index 0cf6c34..d0b608c 100644
+--- a/src/test-mount-matrix.c
++++ b/src/test-mount-matrix.c
+@@ -66,12 +66,16 @@ test_mount_matrix (void)
+ static void
+ test_comma_decimal_separator (void)
+ {
++ const char *fr_locale = "fr_FR.UTF-8";
+ char *old_locale;
+ AccelVec3 *vecs;
+
+- old_locale = setlocale (LC_ALL, "fr_FR.UTF-8");
++ old_locale = setlocale (LC_ALL, fr_locale);
+ /* French locale not available? */
+- g_assert_nonnull (old_locale);
++ if (!old_locale) {
++ g_test_skip_printf ("Local %s not available", fr_locale);
++ return;
++ }
+
+ /* Default matrix */
+ g_assert_true (parse_mount_matrix (DEFAULT_MATRIX, &vecs));
+diff --git a/tests/integration-test.py b/tests/integration-test.py
+index 20c0e92..4ccabb3 100755
+--- a/tests/integration-test.py
++++ b/tests/integration-test.py
+@@ -27,6 +27,7 @@ import tempfile
+ import psutil
+ import subprocess
+ import unittest
++import locale
+ import time
+
+ try:
+@@ -50,6 +51,7 @@ SP_COMPASS = 'net.hadess.SensorProxy.Compass'
+ SP_COMPASS_PATH = '/net/hadess/SensorProxy/Compass'
+
+ class Tests(dbusmock.DBusTestCase):
++
+ @classmethod
+ def setUpClass(cls):
+ # run from local build tree if we are in one, otherwise use system instance
+@@ -92,6 +94,15 @@ class Tests(dbusmock.DBusTestCase):
+ cls.dbus = Gio.bus_get_sync(Gio.BusType.SYSTEM, None)
+ cls.dbus_con = cls.get_dbus(True)
+
++ # Some test outputs require the daemon to run under the fr locale:
++ # so check if that's available
++ try:
++ old_loc = locale.setlocale(locale.LC_ALL, 'fr_FR.UTF-8')
++ cls.has_fr = True
++ locale.setlocale(locale.LC_ALL, old_loc)
++ except:
++ cls.has_fr = False
++
+ @classmethod
+ def tearDownClass(cls):
+ cls.test_bus.down()
+@@ -612,10 +623,9 @@ class Tests(dbusmock.DBusTestCase):
+ mock_file.write(data)
+ self.proxy.ClaimAccelerometer()
+ self.assertEventually(lambda: self.have_text_in_log('Accel sent by driver'))
+- # If the 2nd test fails, it's likely that fr_FR.UTF-8 locale isn't supported
+ self.assertEqual(self.have_text_in_log('scale: 0,000000,0,000000,0,000000'), False)
+- self.assertEqual(self.have_text_in_log('scale: 0,000010,0,000010,0,000010'), True)
+-
++ if self.has_fr:
++ self.assertEqual(self.have_text_in_log('scale: 0,000010,0,000010,0,000010'), True)
+ self.stop_daemon()
+
+ def test_iio_scale_decimal_separator_offset(self):
+@@ -715,9 +725,9 @@ class Tests(dbusmock.DBusTestCase):
+
+ self.proxy.ClaimAccelerometer()
+ self.assertEventually(lambda: self.have_text_in_log('Accel read from IIO on'))
+- # If the 2nd test fails, it's likely that fr_FR.UTF-8 locale isn't supported
+ self.assertEqual(self.have_text_in_log('scale 1,000000,1,000000,1,000000'), False)
+- self.assertEqual(self.have_text_in_log('scale 0,000001,0,000001,0,000001'), True)
++ if self.has_fr:
++ self.assertEqual(self.have_text_in_log('scale 0,000001,0,000001,0,000001'), True)
+
+ self.assertEventually(lambda: self.get_dbus_property('AccelerometerOrientation') == 'normal')
+
+--
+GitLab
+
+
diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template
index d76a6f58b32751..e04fa56eb7485d 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,6 +1,6 @@
# Template file for 'iio-sensor-proxy'
pkgname=iio-sensor-proxy
-version=3.4
+version=3.5
revision=1
build_style=meson
configure_args="-Dsystemdsystemunitdir=/usr/lib/systemd/system/
@@ -14,18 +14,14 @@ license="GPL-3.0-or-later"
homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy"
changelog="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/raw/master/NEWS"
distfiles="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=9339af3bc83994a43ab25231a8ffe9ada6d9afbc16edc44d575dd9f2a69ede3c
+checksum=8689425f2287626a95d95b1e1e5b62e497d09dd08cf411084ed22166d4a49da5
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -Dtests=true -Dgtk-tests=true"
fi
post_patch() {
- # Tests expect a fr_FR.UTF-8 locale
- vsed -i -e "/env\['LC_NUMERIC'\]/d" tests/integration-test.py
- vsed -i -e 's/scale: 0,000010,0,000010,0,000010/scale: 0.000010,0.000010,0.000010/g' \
- -e 's/scale 0,000001,0,000001,0,000001/scale 0.000001,0.000001,0.000001/g' \
- tests/integration-test.py
+ vsed -i -e 's/cls.has_fr = True/cls.has_fr = False/' tests/integration-test.py
}
post_install() {
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: iio-sensor-proxy: update to 3.5.
2024-04-20 20:22 [PR PATCH] iio-sensor-proxy: update to 3.5 fanyx
` (12 preceding siblings ...)
2024-04-20 21:58 ` [PR PATCH] [Updated] " fanyx
@ 2024-04-20 22:54 ` fanyx
2024-04-21 1:05 ` oreo639
` (3 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: fanyx @ 2024-04-20 22:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 288 bytes --]
New comment by fanyx on void-packages repository
https://github.com/void-linux/void-packages/pull/49940#issuecomment-2067807809
Comment:
i might not understand how to test this...
`dev/iio` does not show up on my system, so it's either just impossible or i'm missing some setup for it
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: iio-sensor-proxy: update to 3.5.
2024-04-20 20:22 [PR PATCH] iio-sensor-proxy: update to 3.5 fanyx
` (13 preceding siblings ...)
2024-04-20 22:54 ` fanyx
@ 2024-04-21 1:05 ` oreo639
2024-04-21 1:06 ` [PR PATCH] [Merged]: " oreo639
` (2 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-04-21 1:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 429 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/49940#issuecomment-2067831659
Comment:
> `dev/iio` does not show up on my system, so it's either just impossible or i'm missing some setup for it
That's normal.
> i might not understand how to test this...
Did you enable the runit iio-sensor-proxy service?
(I did test it myself, but just so you know how to test it)
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Merged]: iio-sensor-proxy: update to 3.5.
2024-04-20 20:22 [PR PATCH] iio-sensor-proxy: update to 3.5 fanyx
` (14 preceding siblings ...)
2024-04-21 1:05 ` oreo639
@ 2024-04-21 1:06 ` oreo639
2024-04-21 6:27 ` fanyx
2024-04-21 7:03 ` fanyx
17 siblings, 0 replies; 19+ messages in thread
From: oreo639 @ 2024-04-21 1:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 443 bytes --]
There's a merged pull request on the void-packages repository
iio-sensor-proxy: update to 3.5.
https://github.com/void-linux/void-packages/pull/49940
Description:
#### Testing the changes
- I tested the changes in this PR: **NO**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64
- armv7l
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: iio-sensor-proxy: update to 3.5.
2024-04-20 20:22 [PR PATCH] iio-sensor-proxy: update to 3.5 fanyx
` (15 preceding siblings ...)
2024-04-21 1:06 ` [PR PATCH] [Merged]: " oreo639
@ 2024-04-21 6:27 ` fanyx
2024-04-21 7:03 ` fanyx
17 siblings, 0 replies; 19+ messages in thread
From: fanyx @ 2024-04-21 6:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 158 bytes --]
New comment by fanyx on void-packages repository
https://github.com/void-linux/void-packages/pull/49940#issuecomment-2067923822
Comment:
Ohhh, no i did not
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: iio-sensor-proxy: update to 3.5.
2024-04-20 20:22 [PR PATCH] iio-sensor-proxy: update to 3.5 fanyx
` (16 preceding siblings ...)
2024-04-21 6:27 ` fanyx
@ 2024-04-21 7:03 ` fanyx
17 siblings, 0 replies; 19+ messages in thread
From: fanyx @ 2024-04-21 7:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 205 bytes --]
New comment by fanyx on void-packages repository
https://github.com/void-linux/void-packages/pull/49940#issuecomment-2067923822
Comment:
Ohhh, no i did not
still not working on my system, but oh well
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2024-04-21 7:03 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-20 20:22 [PR PATCH] iio-sensor-proxy: update to 3.5 fanyx
2024-04-20 21:13 ` oreo639
2024-04-20 21:15 ` oreo639
2024-04-20 21:17 ` oreo639
2024-04-20 21:17 ` oreo639
2024-04-20 21:17 ` oreo639
2024-04-20 21:20 ` fanyx
2024-04-20 21:23 ` [PR PATCH] [Updated] " fanyx
2024-04-20 21:32 ` fanyx
2024-04-20 21:37 ` oreo639
2024-04-20 21:37 ` oreo639
2024-04-20 21:38 ` oreo639
2024-04-20 21:45 ` oreo639
2024-04-20 21:58 ` [PR PATCH] [Updated] " fanyx
2024-04-20 22:54 ` fanyx
2024-04-21 1:05 ` oreo639
2024-04-21 1:06 ` [PR PATCH] [Merged]: " oreo639
2024-04-21 6:27 ` fanyx
2024-04-21 7:03 ` fanyx
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).