diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2016-11-06 23:06:40 +0100 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-11-22 13:38:14 +0100 |
| commit | 7e012e5032ebd0eb3970ce45a97ac5356b1020ae (patch) | |
| tree | 4ed98ee48c237cd4531ff6de1787ef1254953ddc /meta-xfce | |
| parent | c3dad0ba49c6f82519d5846be3eb12e65cae395c (diff) | |
| download | meta-openembedded-contrib-7e012e5032ebd0eb3970ce45a97ac5356b1020ae.tar.gz | |
xfce4-battery-plugin: update to 1.1.0
fix-build-on-aarch64.patch was a backport and is now included upstream
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.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.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 ed4eec01fa..0000000000 --- a/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin/fix-build-on-aarch64.patch +++ /dev/null @@ -1,34 +0,0 @@ -Upstream-Status: Backport from - -http://git.xfce.org/panel-plugins/xfce4-battery-plugin/commit/?id=0f6926479728ca784a20b63d7c146a91e37d98fb - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -From 0f6926479728ca784a20b63d7c146a91e37d98fb Mon Sep 17 00:00:00 2001 -From: Landry Breuil <landry@xfce.org> -Date: Thu, 19 Mar 2015 20:42:24 +0100 -Subject: Fix build on aarch64 (bug #11724) - - -diff --git a/panel-plugin/libacpi.c b/panel-plugin/libacpi.c -index 530194d..efb5c9c 100644 ---- a/panel-plugin/libacpi.c -+++ b/panel-plugin/libacpi.c -@@ -29,6 +29,7 @@ - #include <sys/types.h> - #include <dirent.h> - #include <glob.h> -+#include <unistd.h> - - #ifdef __FreeBSD__ - #include <fcntl.h> -@@ -52,7 +53,6 @@ static int acpifd; - #include <sys/sysctl.h> - #include <err.h> - #include <errno.h> --#include <unistd.h> - - #endif - --- -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 5293c9e468..9d2d954f02 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" inherit xfce-panel-plugin -SRC_URI += "file://fix-build-on-aarch64.patch" - -SRC_URI[md5sum] = "ca2d394e411a20442a519efa0d14f8ec" -SRC_URI[sha256sum] = "f659b1af40ab72c93448affaa693ab551827a5600ce9b97a799b7c2419bdeb11" +SRC_URI[md5sum] = "f78d8d0cc13d40753a207a836869b953" +SRC_URI[sha256sum] = "8c9deec8d95da4cc39d6d9091433e5822b6bbe07d80117045dd4dd3480427ece" |