diff options
Diffstat (limited to 'meta-openembedded/meta-gnome/recipes-support')
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.5.0.bb (renamed from meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.4.0.bb) | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch | 67 | ||||
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb | 29 |
3 files changed, 1 insertions, 97 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.4.0.bb b/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.5.0.bb index d690df9229..a290d95b71 100644 --- a/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.4.0.bb +++ b/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_2.5.0.bb @@ -8,7 +8,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=40a21fffb367c82f39fd91a3b137c36e" SRC_URI = "git://github.com/linuxwacom/libwacom.git;branch=master;protocol=https" -SRCREV = "9fd28747534ef776ffecc245721a4faa43bdd89b" +SRCREV = "c6c1b26ad149a88b22ff790dae377fcc935b7e08" DEPENDS = " \ libxml2-native \ diff --git a/meta-openembedded/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch b/meta-openembedded/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch deleted file mode 100644 index fda37895c9..0000000000 --- a/meta-openembedded/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 1c95f64aa342147387ce4b1b7269a5c8b34bd898 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. - -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 2e64296..37ae241 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 ed4164a..b8b63ee 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 7c62824..e7c7f40 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.13.2 - diff --git a/meta-openembedded/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb b/meta-openembedded/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb deleted file mode 100644 index 9325ef9c25..0000000000 --- a/meta-openembedded/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "An onscreen keyboard" -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING.GPL3;md5=8521fa4dd51909b407c5150498d34f4e" - -DEPENDS += "gtk+3 hunspell libcanberra libxkbfile dconf python3-distutils-extra-native intltool-native" - -SRC_URI = "https://launchpad.net/onboard/1.4/${PV}/+download/${BPN}-${PV}.tar.gz \ - file://0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch \ - " -SRC_URI[md5sum] = "1a2fbe82e934f5b37841d17ff51e80e8" -SRC_URI[sha256sum] = "01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865" - -inherit features_check setuptools3-base pkgconfig gtk-icon-cache gsettings mime-xdg - -REQUIRED_DISTRO_FEATURES = "x11" - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/icons \ - ${datadir}/gnome-shell \ - ${datadir}/help \ -" - -RDEPENDS:${PN} += " \ - ncurses \ - python3-dbus \ - python3-pycairo \ - python3-pygobject \ -" |