From 03df560358566aef9fc049041f7169e51f728f52 Mon Sep 17 00:00:00 2001 From: Ratchanan Srirattanamet Date: Fri, 8 May 2026 17:55:41 +0700 Subject: [PATCH 1/2] sensorfw-core: sync datatypes header changes from latest SensorFW SensorFW 0.14.0 "silently" change the wire format over unix socket, exposing the change over the in-tree, Qt-ridden headers only [^1]. This change pulls in the latest changes in datatypes/ headers from SensorFW 0.15.1, transforming it in the same way it was before (quint64 -> uint64_t, remove Qt-ism). In practice, the most important change is in `genericdata.h`. One other header has a miscellaneous change, but I've decided to include them for completeness. [^1]: https://github.com/sailfishos/sensorfw/commit/532fc4cf91bc6291d5b4828348dd65c7c938308c --- sensorfw-core/include/datatypes/genericdata.h | 8 ++++---- sensorfw-core/include/datatypes/touchdata.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sensorfw-core/include/datatypes/genericdata.h b/sensorfw-core/include/datatypes/genericdata.h index 877f77e..a002161 100644 --- a/sensorfw-core/include/datatypes/genericdata.h +++ b/sensorfw-core/include/datatypes/genericdata.h @@ -65,11 +65,11 @@ class TimedXyzData : public TimedData * @param y Y coordinate. * @param z Z coordinate. */ - TimedXyzData(const uint64_t& timestamp, int x, int y, int z) : TimedData(timestamp), x_(x), y_(y), z_(z) {} + TimedXyzData(const uint64_t& timestamp, float x, float y, float z) : TimedData(timestamp), x_(x), y_(y), z_(z) {} - int x_; /**< X value */ - int y_; /**< Y value */ - int z_; /**< Z value */ + float x_; /**< X value */ + float y_; /**< Y value */ + float z_; /**< Z value */ }; #endif // GENERICDATA_H diff --git a/sensorfw-core/include/datatypes/touchdata.h b/sensorfw-core/include/datatypes/touchdata.h index 56ff152..6b44737 100644 --- a/sensorfw-core/include/datatypes/touchdata.h +++ b/sensorfw-core/include/datatypes/touchdata.h @@ -26,7 +26,7 @@ #ifndef TOUCHDATA_H #define TOUCHDATA_H -#include +#include "genericdata.h" /** * @brief Datatype for device touchscreen events. From 5c60174122a2760c4e30789b77f5fa9cbb18b566 Mon Sep 17 00:00:00 2001 From: Ratchanan Srirattanamet Date: Mon, 11 May 2026 01:02:53 +0700 Subject: [PATCH 2/2] debian/control: enforce SensorFW >= 0.14.0 Because backwards-incompatible nature of the wire format change, enforce built package to be used on SensorFW >= 0.14.0 only. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index a9133f0..3ca0a52 100644 --- a/debian/control +++ b/debian/control @@ -17,6 +17,6 @@ Section: libs Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, - libsensorfw-qt5-plugins, + libsensorfw-qt5-plugins (>= 0.14.0), Description: Provides android sensors HAL using libgbinder to waydroid Using sensorfw dbus and socket.