diff options
Diffstat (limited to 'meta/recipes-core/ncurses/files')
4 files changed, 50 insertions, 25 deletions
diff --git a/meta/recipes-core/ncurses/files/0001-tic-hang.patch b/meta/recipes-core/ncurses/files/0001-tic-hang.patch index f98a943e5c..8cb92a3939 100644 --- a/meta/recipes-core/ncurses/files/0001-tic-hang.patch +++ b/meta/recipes-core/ncurses/files/0001-tic-hang.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 168ba7a681be73ac024438e33e14fde1d5aea97d Mon Sep 17 00:00:00 2001 | 1 | From a51a53f0eecfd4d083aba8dfcd47c65e93978ff1 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Fri, 30 Mar 2018 10:02:24 +0800 | 3 | Date: Fri, 30 Mar 2018 10:02:24 +0800 |
4 | Subject: [PATCH 1/2] tic hang | 4 | Subject: [PATCH] tic hang |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [configuration] | 6 | Upstream-Status: Inappropriate [configuration] |
7 | 7 | ||
@@ -17,10 +17,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
17 | 1 file changed, 5 insertions(+), 6 deletions(-) | 17 | 1 file changed, 5 insertions(+), 6 deletions(-) |
18 | 18 | ||
19 | diff --git a/misc/terminfo.src b/misc/terminfo.src | 19 | diff --git a/misc/terminfo.src b/misc/terminfo.src |
20 | index 84f4810..6b385ec 100644 | 20 | index 5d575b8e..f9cc6880 100644 |
21 | --- a/misc/terminfo.src | 21 | --- a/misc/terminfo.src |
22 | +++ b/misc/terminfo.src | 22 | +++ b/misc/terminfo.src |
23 | @@ -5562,12 +5562,11 @@ konsole-xf3x|KDE console window with keyboard for XFree86 3.x xterm, | 23 | @@ -6518,12 +6518,11 @@ konsole-xf3x|KDE console window with keyboard for XFree86 3.x xterm, |
24 | # The value for kbs (see konsole-vt100) reflects local customization rather | 24 | # The value for kbs (see konsole-vt100) reflects local customization rather |
25 | # than the settings used for XFree86 xterm. | 25 | # than the settings used for XFree86 xterm. |
26 | konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm, | 26 | konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm, |
@@ -38,6 +38,3 @@ index 84f4810..6b385ec 100644 | |||
38 | 38 | ||
39 | # Obsolete: vt100.keymap | 39 | # Obsolete: vt100.keymap |
40 | # KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but | 40 | # KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but |
41 | -- | ||
42 | 1.8.3.1 | ||
43 | |||
diff --git a/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch b/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch index 572195611e..11ca66c8e8 100644 --- a/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch +++ b/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 2a53c03ffa90f0050a949fc5920f0df3e668ff42 Mon Sep 17 00:00:00 2001 | 1 | From 63cf58044f4ab3297c5a2d0e132e87ebfa80c753 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Wed, 16 Aug 2017 14:45:27 +0800 | 3 | Date: Wed, 16 Aug 2017 14:45:27 +0800 |
4 | Subject: [PATCH 2/2] configure: reproducible | 4 | Subject: [PATCH] configure: reproducible |
5 | 5 | ||
6 | "configure" enforces -U for ar flags, breaking deterministic builds. | 6 | "configure" enforces -U for ar flags, breaking deterministic builds. |
7 | The flag was added to fix some vaguely specified "recent POSIX binutil | 7 | The flag was added to fix some vaguely specified "recent POSIX binutil |
@@ -18,18 +18,15 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
19 | 19 | ||
20 | diff --git a/configure b/configure | 20 | diff --git a/configure b/configure |
21 | index adead92..fa4fdb7 100755 | 21 | index 488d93fc..005d44e2 100755 |
22 | --- a/configure | 22 | --- a/configure |
23 | +++ b/configure | 23 | +++ b/configure |
24 | @@ -4503,7 +4503,7 @@ if test "${cf_cv_ar_flags+set}" = set; then | 24 | @@ -5129,7 +5129,7 @@ else |
25 | else | 25 | ;; |
26 | (*) | ||
27 | cf_cv_ar_flags=unknown | ||
28 | - for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv | ||
29 | + for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv | ||
30 | do | ||
26 | 31 | ||
27 | cf_cv_ar_flags=unknown | 32 | # check if $ARFLAGS already contains this choice |
28 | - for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv | ||
29 | + for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv | ||
30 | do | ||
31 | |||
32 | # check if $ARFLAGS already contains this choice | ||
33 | -- | ||
34 | 1.8.3.1 | ||
35 | |||
diff --git a/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch b/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch index 1eb17767a0..d89399bbe5 100644 --- a/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch +++ b/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3b3e87934bb6d8511261d7c3d6e39b4f71849272 Mon Sep 17 00:00:00 2001 | 1 | From 5962a5ee2885f67a396f7e8955ac1bbd7f15d4aa Mon Sep 17 00:00:00 2001 |
2 | From: Nathan Rossi <nathan@nathanrossi.com> | 2 | From: Nathan Rossi <nathan@nathanrossi.com> |
3 | Date: Mon, 14 Dec 2020 13:39:02 +1000 | 3 | Date: Mon, 14 Dec 2020 13:39:02 +1000 |
4 | Subject: [PATCH] gen-pkgconfig.in: Do not include LDFLAGS in generated pc | 4 | Subject: [PATCH] gen-pkgconfig.in: Do not include LDFLAGS in generated pc |
@@ -15,14 +15,14 @@ Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> | |||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in | 17 | diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in |
18 | index 8f00b824b9..009d215663 100644 | 18 | index 89a5cd4a..07d94d17 100644 |
19 | --- a/misc/gen-pkgconfig.in | 19 | --- a/misc/gen-pkgconfig.in |
20 | +++ b/misc/gen-pkgconfig.in | 20 | +++ b/misc/gen-pkgconfig.in |
21 | @@ -80,7 +80,7 @@ if [ "$includedir" != "/usr/include" ]; then | 21 | @@ -83,7 +83,7 @@ if [ "$includedir" != "/usr/include" ]; then |
22 | fi | 22 | fi |
23 | 23 | ||
24 | lib_flags= | 24 | lib_flags= |
25 | -for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ | 25 | -for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ @LIBS@ |
26 | +for opt in -L$libdir @LIBS@ | 26 | +for opt in -L$libdir @LIBS@ |
27 | do | 27 | do |
28 | case $opt in | 28 | case $opt in |
diff --git a/meta/recipes-core/ncurses/files/exit_prototype.patch b/meta/recipes-core/ncurses/files/exit_prototype.patch new file mode 100644 index 0000000000..299852d2c0 --- /dev/null +++ b/meta/recipes-core/ncurses/files/exit_prototype.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From af798dceafec8a9ea3f83fc250d784511ca0a29c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 30 Aug 2022 15:58:32 -0700 | ||
4 | Subject: [PATCH] Add needed headers for including mbstate_t and exit() | ||
5 | |||
6 | Upstream-Status: Inappropriate [Reconfigure will solve it] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | configure | 2 ++ | ||
10 | 1 file changed, 2 insertions(+) | ||
11 | |||
12 | diff --git a/configure b/configure | ||
13 | index 005d44e2..72fa6c23 100755 | ||
14 | --- a/configure | ||
15 | +++ b/configure | ||
16 | @@ -3462,6 +3462,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" | ||
17 | cat >"conftest.$ac_ext" <<_ACEOF | ||
18 | #line 3463 "configure" | ||
19 | #include "confdefs.h" | ||
20 | +#include <stdlib.h> | ||
21 | $ac_declaration | ||
22 | int | ||
23 | main (void) | ||
24 | @@ -13533,6 +13534,7 @@ cat >"conftest.$ac_ext" <<_ACEOF | ||
25 | #include <stdlib.h> | ||
26 | #include <stdarg.h> | ||
27 | #include <stdio.h> | ||
28 | +#include <wchar.h> | ||
29 | #ifdef HAVE_LIBUTF8_H | ||
30 | #include <libutf8.h> | ||
31 | #endif | ||