From 85ed0b926cb5b1153103865fe2829a9a60d79b7c Mon Sep 17 00:00:00 2001 From: Liu Yiding Date: Wed, 15 Apr 2026 15:18:55 +0800 Subject: [PATCH] onboard: upgrade 1.4.3-9 -> 1.4.4-1 1.ChangeLog https://github.com/onboard-osk/onboard/releases/tag/1.4.4-1 2.Remove 0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch as error has been solved in 1.4.4-1. Signed-off-by: Liu Yiding Signed-off-by: Khem Raj --- ...ine-error-API-if-platform-does-not-h.patch | 69 ------------------- ...{onboard_1.4.3-9.bb => onboard_1.4.4-1.bb} | 5 +- 2 files changed, 2 insertions(+), 72 deletions(-) delete mode 100644 meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch rename meta-gnome/recipes-support/onboard/{onboard_1.4.3-9.bb => onboard_1.4.4-1.bb} (89%) diff --git a/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch b/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch deleted file mode 100644 index 9fb2cd6814..0000000000 --- a/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 71804c06c7179333f44b57e04ba268f37fe54f62 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 13 Jul 2017 09:01:04 -0700 -Subject: [PATCH] pypredict/lm: Define error API if platform does not have it - -error() API is not implemented across all libcs on linux -e.g. musl does not provide it. - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - Onboard/pypredict/lm/lm.cpp | 1 - - Onboard/pypredict/lm/lm.h | 13 +++++++++++++ - Onboard/pypredict/lm/lm_dynamic.cpp | 2 -- - 3 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/Onboard/pypredict/lm/lm.cpp b/Onboard/pypredict/lm/lm.cpp -index 2e642965..37ae241e 100644 ---- a/Onboard/pypredict/lm/lm.cpp -+++ b/Onboard/pypredict/lm/lm.cpp -@@ -19,7 +19,6 @@ - - #include - #include --#include - #include - #include - #include -diff --git a/Onboard/pypredict/lm/lm.h b/Onboard/pypredict/lm/lm.h -index ed4164a4..b8b63ee8 100644 ---- a/Onboard/pypredict/lm/lm.h -+++ b/Onboard/pypredict/lm/lm.h -@@ -32,6 +32,19 @@ - #include - #include - -+#if defined(HAVE_ERROR_H) -+#include -+#else -+#include -+#define _onboard_error(S, E, F, ...) do { \ -+ if (E) \ -+ err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \ -+ else \ -+ err(S, F, ##__VA_ARGS__); \ -+} while(0) -+ -+#define error _onboard_error -+#endif - - // break into debugger - // step twice to come back out of the raise() call into known code -diff --git a/Onboard/pypredict/lm/lm_dynamic.cpp b/Onboard/pypredict/lm/lm_dynamic.cpp -index 7c628240..e7c7f40e 100644 ---- a/Onboard/pypredict/lm/lm_dynamic.cpp -+++ b/Onboard/pypredict/lm/lm_dynamic.cpp -@@ -17,8 +17,6 @@ - * along with this program. If not, see . - */ - --#include -- - #include "lm_dynamic.h" - - using namespace std; --- -2.34.1 - diff --git a/meta-gnome/recipes-support/onboard/onboard_1.4.3-9.bb b/meta-gnome/recipes-support/onboard/onboard_1.4.4-1.bb similarity index 89% rename from meta-gnome/recipes-support/onboard/onboard_1.4.3-9.bb rename to meta-gnome/recipes-support/onboard/onboard_1.4.4-1.bb index d544f169f8..a069fb692e 100644 --- a/meta-gnome/recipes-support/onboard/onboard_1.4.3-9.bb +++ b/meta-gnome/recipes-support/onboard/onboard_1.4.4-1.bb @@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING.GPL3;md5=8521fa4dd51909b407c5150498d34f4e \ file://COPYING.BSD3;md5=f56403ae5b2d6b82ad136d753c05a82e \ " -SRC_URI = "git://github.com/onboard-osk/onboard.git;protocol=https;branch=main \ - file://0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch \ +SRC_URI = "git://github.com/onboard-osk/onboard.git;protocol=https;branch=main;tag=${PV} \ file://0002-toggle-onboard-hoverclick-use-bin-sh-default-shell-i.patch \ " -SRCREV = "350f7643576bc8c5f2cff9c6ddce0e1e7cff995d" +SRCREV = "02b19e2aee88e4bf2cdc7094813ddd4a6c05d1e7" inherit features_check setuptools3 pkgconfig gtk-icon-cache gsettings mime-xdg