diff options
-rw-r--r-- | meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin/fix-build-on-aarch64.patch | 34 | ||||
-rw-r--r-- | meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.0.bb (renamed from meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.0.5.bb) | 6 |
2 files changed, 2 insertions, 38 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 deleted file mode 100644 index ed4eec01f..000000000 --- a/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin/fix-build-on-aarch64.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | Upstream-Status: Backport from | ||
2 | |||
3 | http://git.xfce.org/panel-plugins/xfce4-battery-plugin/commit/?id=0f6926479728ca784a20b63d7c146a91e37d98fb | ||
4 | |||
5 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
6 | --- | ||
7 | From 0f6926479728ca784a20b63d7c146a91e37d98fb Mon Sep 17 00:00:00 2001 | ||
8 | From: Landry Breuil <landry@xfce.org> | ||
9 | Date: Thu, 19 Mar 2015 20:42:24 +0100 | ||
10 | Subject: Fix build on aarch64 (bug #11724) | ||
11 | |||
12 | |||
13 | diff --git a/panel-plugin/libacpi.c b/panel-plugin/libacpi.c | ||
14 | index 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 | -- | ||
34 | cgit 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.1.0.bb index 5293c9e46..9d2d954f0 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.1.0.bb | |||
@@ -5,7 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | |||
5 | 5 | ||
6 | inherit xfce-panel-plugin | 6 | inherit xfce-panel-plugin |
7 | 7 | ||
8 | SRC_URI += "file://fix-build-on-aarch64.patch" | 8 | SRC_URI[md5sum] = "f78d8d0cc13d40753a207a836869b953" |
9 | 9 | SRC_URI[sha256sum] = "8c9deec8d95da4cc39d6d9091433e5822b6bbe07d80117045dd4dd3480427ece" | |
10 | SRC_URI[md5sum] = "ca2d394e411a20442a519efa0d14f8ec" | ||
11 | SRC_URI[sha256sum] = "f659b1af40ab72c93448affaa693ab551827a5600ce9b97a799b7c2419bdeb11" | ||