diff options
| author | wangmy <wangmy@fujitsu.com> | 2022-04-04 02:47:27 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-19 14:14:10 +0100 |
| commit | ecbf60aa99f99094900eb682db83bba5bf45d794 (patch) | |
| tree | ad1ae55f127ee8d36fea62c0cfea5e5a54579993 /meta/recipes-extended/mc/files | |
| parent | f528d9878a4e875c2dc771810ca4fc871917480b (diff) | |
| download | poky-ecbf60aa99f99094900eb682db83bba5bf45d794.tar.gz | |
mc: upgrade 4.8.27 -> 4.8.28
Remove unsupported option of smb
0001-Ticket-4200-fix-FTBFS-with-ncurses-build-with-disabl.patch
removed since it's included in 4.8.28
(From OE-Core rev: c448df46a31c21f156b5b9feb7f513dbb8b62520)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/mc/files')
| -rw-r--r-- | meta/recipes-extended/mc/files/0001-Ticket-4200-fix-FTBFS-with-ncurses-build-with-disabl.patch | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/meta/recipes-extended/mc/files/0001-Ticket-4200-fix-FTBFS-with-ncurses-build-with-disabl.patch b/meta/recipes-extended/mc/files/0001-Ticket-4200-fix-FTBFS-with-ncurses-build-with-disabl.patch deleted file mode 100644 index 408473664f..0000000000 --- a/meta/recipes-extended/mc/files/0001-Ticket-4200-fix-FTBFS-with-ncurses-build-with-disabl.patch +++ /dev/null | |||
| @@ -1,87 +0,0 @@ | |||
| 1 | From e7bbf72544ab62db9c92bfe7bd1155227e78c621 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Andrew Borodin <aborodin@vmail.ru> | ||
| 3 | Date: Sat, 28 Aug 2021 11:46:53 +0300 | ||
| 4 | Subject: [PATCH] Ticket #4200: fix FTBFS with ncurses build with | ||
| 5 | --disable-widec. | ||
| 6 | |||
| 7 | Upstream-Status: Accepted [https://github.com/MidnightCommander/mc/commit/e7bbf72544] | ||
| 8 | Signed-off-by: Andrew Borodin <aborodin@vmail.ru> | ||
| 9 | --- | ||
| 10 | lib/tty/tty-ncurses.c | 8 ++++++++ | ||
| 11 | lib/tty/tty-ncurses.h | 5 +++++ | ||
| 12 | lib/tty/tty-slang.h | 2 ++ | ||
| 13 | src/filemanager/boxes.c | 2 ++ | ||
| 14 | 4 files changed, 17 insertions(+) | ||
| 15 | |||
| 16 | diff --git a/lib/tty/tty-ncurses.c b/lib/tty/tty-ncurses.c | ||
| 17 | index f619c0a7bf31..13058a624208 100644 | ||
| 18 | --- a/lib/tty/tty-ncurses.c | ||
| 19 | +++ b/lib/tty/tty-ncurses.c | ||
| 20 | @@ -560,6 +560,7 @@ tty_fill_region (int y, int x, int rows, int cols, unsigned char ch) | ||
| 21 | void | ||
| 22 | tty_colorize_area (int y, int x, int rows, int cols, int color) | ||
| 23 | { | ||
| 24 | +#ifdef ENABLE_SHADOWS | ||
| 25 | cchar_t *ctext; | ||
| 26 | wchar_t wch[10]; /* TODO not sure if the length is correct */ | ||
| 27 | attr_t attrs; | ||
| 28 | @@ -585,6 +586,13 @@ tty_colorize_area (int y, int x, int rows, int cols, int color) | ||
| 29 | } | ||
| 30 | |||
| 31 | g_free (ctext); | ||
| 32 | +#else | ||
| 33 | + (void) y; | ||
| 34 | + (void) x; | ||
| 35 | + (void) rows; | ||
| 36 | + (void) cols; | ||
| 37 | + (void) color; | ||
| 38 | +#endif /* ENABLE_SHADOWS */ | ||
| 39 | } | ||
| 40 | |||
| 41 | /* --------------------------------------------------------------------------------------------- */ | ||
| 42 | diff --git a/lib/tty/tty-ncurses.h b/lib/tty/tty-ncurses.h | ||
| 43 | index d75df9533ab9..8feb17ccd045 100644 | ||
| 44 | --- a/lib/tty/tty-ncurses.h | ||
| 45 | +++ b/lib/tty/tty-ncurses.h | ||
| 46 | @@ -30,6 +30,11 @@ | ||
| 47 | #define NCURSES_CONST const | ||
| 48 | #endif | ||
| 49 | |||
| 50 | +/* do not draw shadows if NCurses is built with --disable-widec */ | ||
| 51 | +#if defined(NCURSES_WIDECHAR) && NCURSES_WIDECHAR | ||
| 52 | +#define ENABLE_SHADOWS 1 | ||
| 53 | +#endif | ||
| 54 | + | ||
| 55 | /*** typedefs(not structures) and defined constants **********************************************/ | ||
| 56 | |||
| 57 | /*** enums ***************************************************************************************/ | ||
| 58 | diff --git a/lib/tty/tty-slang.h b/lib/tty/tty-slang.h | ||
| 59 | index 5b12c6512853..eeaade388af4 100644 | ||
| 60 | --- a/lib/tty/tty-slang.h | ||
| 61 | +++ b/lib/tty/tty-slang.h | ||
| 62 | @@ -23,6 +23,8 @@ | ||
| 63 | #define COLS SLtt_Screen_Cols | ||
| 64 | #define LINES SLtt_Screen_Rows | ||
| 65 | |||
| 66 | +#define ENABLE_SHADOWS 1 | ||
| 67 | + | ||
| 68 | /*** enums ***************************************************************************************/ | ||
| 69 | |||
| 70 | enum | ||
| 71 | diff --git a/src/filemanager/boxes.c b/src/filemanager/boxes.c | ||
| 72 | index 3eb525be4a9b..98df5ff2ed9a 100644 | ||
| 73 | --- a/src/filemanager/boxes.c | ||
| 74 | +++ b/src/filemanager/boxes.c | ||
| 75 | @@ -280,7 +280,9 @@ appearance_box_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm | ||
| 76 | switch (msg) | ||
| 77 | { | ||
| 78 | case MSG_INIT: | ||
| 79 | +#ifdef ENABLE_SHADOWS | ||
| 80 | if (!tty_use_colors ()) | ||
| 81 | +#endif | ||
| 82 | { | ||
| 83 | Widget *shadow; | ||
| 84 | |||
| 85 | -- | ||
| 86 | 2.34.1 | ||
| 87 | |||
