summaryrefslogtreecommitdiffstats
path: root/meta-xfce
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2015-10-21 17:50:07 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2015-10-23 12:57:03 +0200
commit4272ccb80a36aab98b1cb994ae75f8d99a89edb6 (patch)
tree2183a01568868ba6d683e1c54b64257dd8fb3dc2 /meta-xfce
parent29939f45554080c3cd800eec1ed7d25a6644d081 (diff)
downloadmeta-openembedded-4272ccb80a36aab98b1cb994ae75f8d99a89edb6.tar.gz
xfce4-battery-plugin: fix build on arm64
Backport patch to fix build on arm64. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-xfce')
-rw-r--r--meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin/fix-build-on-aarch64.patch34
-rw-r--r--meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.0.5.bb2
2 files changed, 36 insertions, 0 deletions
diff --git a/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin/fix-build-on-aarch64.patch b/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin/fix-build-on-aarch64.patch
new file mode 100644
index 000000000..ed4eec01f
--- /dev/null
+++ b/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin/fix-build-on-aarch64.patch
@@ -0,0 +1,34 @@
1Upstream-Status: Backport from
2
3http://git.xfce.org/panel-plugins/xfce4-battery-plugin/commit/?id=0f6926479728ca784a20b63d7c146a91e37d98fb
4
5Signed-off-by: Kai Kang <kai.kang@windriver.com>
6---
7From 0f6926479728ca784a20b63d7c146a91e37d98fb Mon Sep 17 00:00:00 2001
8From: Landry Breuil <landry@xfce.org>
9Date: Thu, 19 Mar 2015 20:42:24 +0100
10Subject: Fix build on aarch64 (bug #11724)
11
12
13diff --git a/panel-plugin/libacpi.c b/panel-plugin/libacpi.c
14index 530194d..efb5c9c 100644
15--- a/panel-plugin/libacpi.c
16+++ b/panel-plugin/libacpi.c
17@@ -29,6 +29,7 @@
18 #include <sys/types.h>
19 #include <dirent.h>
20 #include <glob.h>
21+#include <unistd.h>
22
23 #ifdef __FreeBSD__
24 #include <fcntl.h>
25@@ -52,7 +53,6 @@ static int acpifd;
26 #include <sys/sysctl.h>
27 #include <err.h>
28 #include <errno.h>
29-#include <unistd.h>
30
31 #endif
32
33--
34cgit v0.10.1
diff --git a/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.0.5.bb b/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.0.5.bb
index 36cb444c4..5293c9e46 100644
--- a/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.0.5.bb
+++ b/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.0.5.bb
@@ -5,5 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
5 5
6inherit xfce-panel-plugin 6inherit xfce-panel-plugin
7 7
8SRC_URI += "file://fix-build-on-aarch64.patch"
9
8SRC_URI[md5sum] = "ca2d394e411a20442a519efa0d14f8ec" 10SRC_URI[md5sum] = "ca2d394e411a20442a519efa0d14f8ec"
9SRC_URI[sha256sum] = "f659b1af40ab72c93448affaa693ab551827a5600ce9b97a799b7c2419bdeb11" 11SRC_URI[sha256sum] = "f659b1af40ab72c93448affaa693ab551827a5600ce9b97a799b7c2419bdeb11"