diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-03-04 12:41:30 -0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-03-29 16:55:52 -0700 |
commit | 8538610b997a013e0e3b90c3542c9f3b2975e84b (patch) | |
tree | d356b0c3d50c4e332603ee08440aff7472532c95 /meta-oe | |
parent | dfccaebd48160b7e7b5a50f65fe5aad298bf9ca3 (diff) | |
download | meta-openembedded-contrib-8538610b997a013e0e3b90c3542c9f3b2975e84b.tar.gz |
libyui,libyui-ncurses: Update to lates
Drop upstreamed patch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe')
3 files changed, 3 insertions, 63 deletions
diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-src-Replace-using-sys-errno.h-with-errno.h.patch b/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-src-Replace-using-sys-errno.h-with-errno.h.patch deleted file mode 100644 index ae1b265dc1..0000000000 --- a/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-src-Replace-using-sys-errno.h-with-errno.h.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 46f016c4b87bb2a594df1c84e4d494bff0cbeaf9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 5 Feb 2018 12:01:25 -0800 -Subject: [PATCH] src: Replace using sys/errno.h with errno.h - -sys/errno.h is no longer the right place for this file - -error: #warning redirecting incorrect #include <sys/errno.h> to <errno.h> [-Werror=cpp] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted [https://github.com/libyui/libyui-ncurses/pull/63] - src/NCAskForDirectory.cc | 2 +- - src/NCAskForFile.cc | 2 +- - src/NCFileSelection.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/NCAskForDirectory.cc b/src/NCAskForDirectory.cc -index 06ec6ac..ed1a30c 100644 ---- a/src/NCAskForDirectory.cc -+++ b/src/NCAskForDirectory.cc -@@ -39,7 +39,7 @@ - #include <sys/types.h> - #include <unistd.h> - #include <dirent.h> --#include <sys/errno.h> -+#include <errno.h> - - /* - Textdomain "ncurses" -diff --git a/src/NCAskForFile.cc b/src/NCAskForFile.cc -index 31fdb39..63a6679 100644 ---- a/src/NCAskForFile.cc -+++ b/src/NCAskForFile.cc -@@ -39,7 +39,7 @@ - #include <sys/stat.h> - #include <unistd.h> - #include <dirent.h> --#include <sys/errno.h> -+#include <errno.h> - - /* - Textdomain "ncurses" -diff --git a/src/NCFileSelection.h b/src/NCFileSelection.h -index d42311f..514d020 100644 ---- a/src/NCFileSelection.h -+++ b/src/NCFileSelection.h -@@ -38,7 +38,7 @@ - #include <sys/stat.h> - #include <unistd.h> - #include <dirent.h> --#include <sys/errno.h> -+#include <errno.h> - - - struct NCFileInfo --- -2.16.1 - diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb b/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb index 3388876e4f..f60c85668f 100644 --- a/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb +++ b/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb @@ -5,13 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " SRC_URI = "git://github.com/libyui/libyui-ncurses.git \ - file://0001-src-Replace-using-sys-errno.h-with-errno.h.patch \ - " + " SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" PV = "2.48.3+git${SRCPV}" -SRCREV = "7b251c2ff541df6139f3d210d0a0a27d042926bd" +SRCREV = "79b804b45ffc6a0d92e28e793ff389a20b63b54b" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/libyui/libyui_git.bb b/meta-oe/recipes-graphics/libyui/libyui_git.bb index 9b1d1d8184..92d96044ec 100644 --- a/meta-oe/recipes-graphics/libyui/libyui_git.bb +++ b/meta-oe/recipes-graphics/libyui/libyui_git.bb @@ -9,7 +9,7 @@ SRC_URI = "git://github.com/libyui/libyui.git \ " PV = "3.3.3+git" -SRCREV = "f4ccea39f6b6f37eabd0a4df49db5f9bcb3c013a" +SRCREV = "2b634cb7821e2e79dd4b7a73caf8e67c50189376" S = "${WORKDIR}/git" |