diff options
| author | Liu Yiding <liuyd.fnst@fujitsu.com> | 2026-04-15 15:18:55 +0800 |
|---|---|---|
| committer | Khem Raj <khem.raj@oss.qualcomm.com> | 2026-04-15 07:24:55 -0700 |
| commit | 85ed0b926cb5b1153103865fe2829a9a60d79b7c (patch) | |
| tree | f238af74c541782fa0a6fdc5acf849f552b504ec | |
| parent | 17a8c0d634400ca3e92e349318ec79b59ea86315 (diff) | |
| download | meta-openembedded-85ed0b926cb5b1153103865fe2829a9a60d79b7c.tar.gz | |
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 <liuyd.fnst@fujitsu.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
| -rw-r--r-- | meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch | 69 | ||||
| -rw-r--r-- | meta-gnome/recipes-support/onboard/onboard_1.4.4-1.bb (renamed from meta-gnome/recipes-support/onboard/onboard_1.4.3-9.bb) | 5 |
2 files changed, 2 insertions, 72 deletions
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 @@ | |||
| 1 | From 71804c06c7179333f44b57e04ba268f37fe54f62 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Thu, 13 Jul 2017 09:01:04 -0700 | ||
| 4 | Subject: [PATCH] pypredict/lm: Define error API if platform does not have it | ||
| 5 | |||
| 6 | error() API is not implemented across all libcs on linux | ||
| 7 | e.g. musl does not provide it. | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | |||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | --- | ||
| 13 | Onboard/pypredict/lm/lm.cpp | 1 - | ||
| 14 | Onboard/pypredict/lm/lm.h | 13 +++++++++++++ | ||
| 15 | Onboard/pypredict/lm/lm_dynamic.cpp | 2 -- | ||
| 16 | 3 files changed, 13 insertions(+), 3 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/Onboard/pypredict/lm/lm.cpp b/Onboard/pypredict/lm/lm.cpp | ||
| 19 | index 2e642965..37ae241e 100644 | ||
| 20 | --- a/Onboard/pypredict/lm/lm.cpp | ||
| 21 | +++ b/Onboard/pypredict/lm/lm.cpp | ||
| 22 | @@ -19,7 +19,6 @@ | ||
| 23 | |||
| 24 | #include <stdlib.h> | ||
| 25 | #include <stdio.h> | ||
| 26 | -#include <error.h> | ||
| 27 | #include <algorithm> | ||
| 28 | #include <cmath> | ||
| 29 | #include <string> | ||
| 30 | diff --git a/Onboard/pypredict/lm/lm.h b/Onboard/pypredict/lm/lm.h | ||
| 31 | index ed4164a4..b8b63ee8 100644 | ||
| 32 | --- a/Onboard/pypredict/lm/lm.h | ||
| 33 | +++ b/Onboard/pypredict/lm/lm.h | ||
| 34 | @@ -32,6 +32,19 @@ | ||
| 35 | #include <algorithm> | ||
| 36 | #include <string> | ||
| 37 | |||
| 38 | +#if defined(HAVE_ERROR_H) | ||
| 39 | +#include <error.h> | ||
| 40 | +#else | ||
| 41 | +#include <err.h> | ||
| 42 | +#define _onboard_error(S, E, F, ...) do { \ | ||
| 43 | + if (E) \ | ||
| 44 | + err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \ | ||
| 45 | + else \ | ||
| 46 | + err(S, F, ##__VA_ARGS__); \ | ||
| 47 | +} while(0) | ||
| 48 | + | ||
| 49 | +#define error _onboard_error | ||
| 50 | +#endif | ||
| 51 | |||
| 52 | // break into debugger | ||
| 53 | // step twice to come back out of the raise() call into known code | ||
| 54 | diff --git a/Onboard/pypredict/lm/lm_dynamic.cpp b/Onboard/pypredict/lm/lm_dynamic.cpp | ||
| 55 | index 7c628240..e7c7f40e 100644 | ||
| 56 | --- a/Onboard/pypredict/lm/lm_dynamic.cpp | ||
| 57 | +++ b/Onboard/pypredict/lm/lm_dynamic.cpp | ||
| 58 | @@ -17,8 +17,6 @@ | ||
| 59 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 60 | */ | ||
| 61 | |||
| 62 | -#include <error.h> | ||
| 63 | - | ||
| 64 | #include "lm_dynamic.h" | ||
| 65 | |||
| 66 | using namespace std; | ||
| 67 | -- | ||
| 68 | 2.34.1 | ||
| 69 | |||
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 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 \ | |||
| 10 | file://COPYING.BSD3;md5=f56403ae5b2d6b82ad136d753c05a82e \ | 10 | file://COPYING.BSD3;md5=f56403ae5b2d6b82ad136d753c05a82e \ |
| 11 | " | 11 | " |
| 12 | 12 | ||
| 13 | SRC_URI = "git://github.com/onboard-osk/onboard.git;protocol=https;branch=main \ | 13 | SRC_URI = "git://github.com/onboard-osk/onboard.git;protocol=https;branch=main;tag=${PV} \ |
| 14 | file://0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch \ | ||
| 15 | file://0002-toggle-onboard-hoverclick-use-bin-sh-default-shell-i.patch \ | 14 | file://0002-toggle-onboard-hoverclick-use-bin-sh-default-shell-i.patch \ |
| 16 | " | 15 | " |
| 17 | SRCREV = "350f7643576bc8c5f2cff9c6ddce0e1e7cff995d" | 16 | SRCREV = "02b19e2aee88e4bf2cdc7094813ddd4a6c05d1e7" |
| 18 | 17 | ||
| 19 | inherit features_check setuptools3 pkgconfig gtk-icon-cache gsettings mime-xdg | 18 | inherit features_check setuptools3 pkgconfig gtk-icon-cache gsettings mime-xdg |
| 20 | 19 | ||
