[Debian-on-mobile-maintainers] [Git][DebianOnMobile-team/squeekboard][wip/a-wai/update-1.17.1] 2 commits: d/patches: fix build on i386

[Arnaud Ferraris (@a-wai)]

Arnaud Ferraris pushed to branch wip/a-wai/update-1.17.1 at Debian On Mobile / squeekboard


Commits:
6e144806 by Arnaud Ferraris at 2022-04-20T12:51:10+02:00
d/patches: fix build on i386

- - - - -
f025bf6c by Arnaud Ferraris at 2022-04-20T12:51:10+02:00
d/changelog: release version 1.17.1-1

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/layout-fix-build-on-i386.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+squeekboard (1.17.1-1) unstable; urgency=medium
+
+  * New upstream version 1.17.1
+  * d/patches: update patch fixing build.
+    The patch we used to carry is replaced by an upstream backport, as it
+    requires another change already taken into account there.
+  * d/patches: backport upstream patches fixing sizing (Closes: #1007115)
+  * d/control: update clap build dependency.
+    We now depend on clap v3, not v2, and need the "std" feature.
+  * d/patches: fix build on i386.
+
+ -- Arnaud Ferraris <arnaud.ferraris at gmail.com>  Tue, 19 Apr 2022 18:09:28 +0200
+
 squeekboard (1.17.0-2) unstable; urgency=medium
 
   * d/patches: fix build failure due to newer crate version.


=====================================
debian/patches/layout-fix-build-on-i386.patch
=====================================
@@ -0,0 +1,28 @@
+From: Arnaud Ferraris <arnaud.ferraris at collabora.com>
+Date: Wed, 20 Apr 2022 11:52:43 +0200
+Subject: layout: fix build on i386
+
+Due to the (lack of) precision of floating-point values, comparison
+results may differ slightly between architectures, leading to the
+`check_stretching` test failing when building for i386. This can be
+fixed by adjusting the value against which we compare the ratio between
+x/y scaling factors in `calculate_transformation`.
+
+Forwarded: https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/548
+---
+ src/layout.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/layout.rs b/src/layout.rs
+index 0ca93f9..bb94d4d 100644
+--- a/src/layout.rs
++++ b/src/layout.rs
+@@ -761,7 +761,7 @@ impl Layout {
+         let h_scale = available.width / size.width;
+         let v_scale = available.height / size.height;
+         // Allow up to 5% (and a bit more) horizontal stretching for filling up available space
+-        let scale_x = if (h_scale / v_scale) < 1.06 { h_scale } else { v_scale };
++        let scale_x = if (h_scale / v_scale) < 1.055 { h_scale } else { v_scale };
+         let scale_y = cmp::min(FloatOrd(h_scale), FloatOrd(v_scale)).0;
+         let outside_margins = c::Transformation {
+             origin_x: (available.width - (scale_x * size.width)) / 2.0,


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@ output-Store-physical-size.patch
 state-Derive-panel-size-from-physical-click-target-size.patch
 Clean-up-size-types.patch
 layout-allow-stretching-the-layout-by-a-small-amount.patch
+layout-fix-build-on-i386.patch



View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/squeekboard/-/compare/9263c5bad2e6357f213422fb881512b4a40d3cf4...f025bf6cdd9075a36bc06e667ddc69bc2c99d81a

-- 
View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/squeekboard/-/compare/9263c5bad2e6357f213422fb881512b4a40d3cf4...f025bf6cdd9075a36bc06e667ddc69bc2c99d81a
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-on-mobile-maintainers/attachments/20220420/9fb01385/attachment-0001.htm>