mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-16 21:26:26 +00:00
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>
This commit is contained in:
parent
17a8c0d634
commit
85ed0b926c
@ -1,69 +0,0 @@
|
|||||||
From 71804c06c7179333f44b57e04ba268f37fe54f62 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
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 <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
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 <stdlib.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
-#include <error.h>
|
|
||||||
#include <algorithm>
|
|
||||||
#include <cmath>
|
|
||||||
#include <string>
|
|
||||||
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 <algorithm>
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
+#if defined(HAVE_ERROR_H)
|
|
||||||
+#include <error.h>
|
|
||||||
+#else
|
|
||||||
+#include <err.h>
|
|
||||||
+#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 <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#include <error.h>
|
|
||||||
-
|
|
||||||
#include "lm_dynamic.h"
|
|
||||||
|
|
||||||
using namespace std;
|
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
||||||
@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING.GPL3;md5=8521fa4dd51909b407c5150498d34f4e \
|
|||||||
file://COPYING.BSD3;md5=f56403ae5b2d6b82ad136d753c05a82e \
|
file://COPYING.BSD3;md5=f56403ae5b2d6b82ad136d753c05a82e \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/onboard-osk/onboard.git;protocol=https;branch=main \
|
SRC_URI = "git://github.com/onboard-osk/onboard.git;protocol=https;branch=main;tag=${PV} \
|
||||||
file://0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch \
|
|
||||||
file://0002-toggle-onboard-hoverclick-use-bin-sh-default-shell-i.patch \
|
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
|
inherit features_check setuptools3 pkgconfig gtk-icon-cache gsettings mime-xdg
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user