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/recipes-graphics/libyui | |
parent | dfccaebd48160b7e7b5a50f65fe5aad298bf9ca3 (diff) | |
download | meta-openembedded-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/recipes-graphics/libyui')
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 ae1b265dc..000000000 --- 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 @@ | |||
1 | From 46f016c4b87bb2a594df1c84e4d494bff0cbeaf9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 5 Feb 2018 12:01:25 -0800 | ||
4 | Subject: [PATCH] src: Replace using sys/errno.h with errno.h | ||
5 | |||
6 | sys/errno.h is no longer the right place for this file | ||
7 | |||
8 | error: #warning redirecting incorrect #include <sys/errno.h> to <errno.h> [-Werror=cpp] | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | Upstream-Status: Submitted [https://github.com/libyui/libyui-ncurses/pull/63] | ||
13 | src/NCAskForDirectory.cc | 2 +- | ||
14 | src/NCAskForFile.cc | 2 +- | ||
15 | src/NCFileSelection.h | 2 +- | ||
16 | 3 files changed, 3 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/src/NCAskForDirectory.cc b/src/NCAskForDirectory.cc | ||
19 | index 06ec6ac..ed1a30c 100644 | ||
20 | --- a/src/NCAskForDirectory.cc | ||
21 | +++ b/src/NCAskForDirectory.cc | ||
22 | @@ -39,7 +39,7 @@ | ||
23 | #include <sys/types.h> | ||
24 | #include <unistd.h> | ||
25 | #include <dirent.h> | ||
26 | -#include <sys/errno.h> | ||
27 | +#include <errno.h> | ||
28 | |||
29 | /* | ||
30 | Textdomain "ncurses" | ||
31 | diff --git a/src/NCAskForFile.cc b/src/NCAskForFile.cc | ||
32 | index 31fdb39..63a6679 100644 | ||
33 | --- a/src/NCAskForFile.cc | ||
34 | +++ b/src/NCAskForFile.cc | ||
35 | @@ -39,7 +39,7 @@ | ||
36 | #include <sys/stat.h> | ||
37 | #include <unistd.h> | ||
38 | #include <dirent.h> | ||
39 | -#include <sys/errno.h> | ||
40 | +#include <errno.h> | ||
41 | |||
42 | /* | ||
43 | Textdomain "ncurses" | ||
44 | diff --git a/src/NCFileSelection.h b/src/NCFileSelection.h | ||
45 | index d42311f..514d020 100644 | ||
46 | --- a/src/NCFileSelection.h | ||
47 | +++ b/src/NCFileSelection.h | ||
48 | @@ -38,7 +38,7 @@ | ||
49 | #include <sys/stat.h> | ||
50 | #include <unistd.h> | ||
51 | #include <dirent.h> | ||
52 | -#include <sys/errno.h> | ||
53 | +#include <errno.h> | ||
54 | |||
55 | |||
56 | struct NCFileInfo | ||
57 | -- | ||
58 | 2.16.1 | ||
59 | |||
diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb b/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb index 3388876e4..f60c85668 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 \ | |||
5 | " | 5 | " |
6 | 6 | ||
7 | SRC_URI = "git://github.com/libyui/libyui-ncurses.git \ | 7 | SRC_URI = "git://github.com/libyui/libyui-ncurses.git \ |
8 | file://0001-src-Replace-using-sys-errno.h-with-errno.h.patch \ | 8 | " |
9 | " | ||
10 | 9 | ||
11 | SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" | 10 | SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" |
12 | 11 | ||
13 | PV = "2.48.3+git${SRCPV}" | 12 | PV = "2.48.3+git${SRCPV}" |
14 | SRCREV = "7b251c2ff541df6139f3d210d0a0a27d042926bd" | 13 | SRCREV = "79b804b45ffc6a0d92e28e793ff389a20b63b54b" |
15 | 14 | ||
16 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
17 | 16 | ||
diff --git a/meta-oe/recipes-graphics/libyui/libyui_git.bb b/meta-oe/recipes-graphics/libyui/libyui_git.bb index 9b1d1d818..92d96044e 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 \ | |||
9 | " | 9 | " |
10 | 10 | ||
11 | PV = "3.3.3+git" | 11 | PV = "3.3.3+git" |
12 | SRCREV = "f4ccea39f6b6f37eabd0a4df49db5f9bcb3c013a" | 12 | SRCREV = "2b634cb7821e2e79dd4b7a73caf8e67c50189376" |
13 | 13 | ||
14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
15 | 15 | ||