mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
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>
This commit is contained in:
@@ -1,87 +0,0 @@
|
||||
From e7bbf72544ab62db9c92bfe7bd1155227e78c621 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Borodin <aborodin@vmail.ru>
|
||||
Date: Sat, 28 Aug 2021 11:46:53 +0300
|
||||
Subject: [PATCH] Ticket #4200: fix FTBFS with ncurses build with
|
||||
--disable-widec.
|
||||
|
||||
Upstream-Status: Accepted [https://github.com/MidnightCommander/mc/commit/e7bbf72544]
|
||||
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
|
||||
---
|
||||
lib/tty/tty-ncurses.c | 8 ++++++++
|
||||
lib/tty/tty-ncurses.h | 5 +++++
|
||||
lib/tty/tty-slang.h | 2 ++
|
||||
src/filemanager/boxes.c | 2 ++
|
||||
4 files changed, 17 insertions(+)
|
||||
|
||||
diff --git a/lib/tty/tty-ncurses.c b/lib/tty/tty-ncurses.c
|
||||
index f619c0a7bf31..13058a624208 100644
|
||||
--- a/lib/tty/tty-ncurses.c
|
||||
+++ b/lib/tty/tty-ncurses.c
|
||||
@@ -560,6 +560,7 @@ tty_fill_region (int y, int x, int rows, int cols, unsigned char ch)
|
||||
void
|
||||
tty_colorize_area (int y, int x, int rows, int cols, int color)
|
||||
{
|
||||
+#ifdef ENABLE_SHADOWS
|
||||
cchar_t *ctext;
|
||||
wchar_t wch[10]; /* TODO not sure if the length is correct */
|
||||
attr_t attrs;
|
||||
@@ -585,6 +586,13 @@ tty_colorize_area (int y, int x, int rows, int cols, int color)
|
||||
}
|
||||
|
||||
g_free (ctext);
|
||||
+#else
|
||||
+ (void) y;
|
||||
+ (void) x;
|
||||
+ (void) rows;
|
||||
+ (void) cols;
|
||||
+ (void) color;
|
||||
+#endif /* ENABLE_SHADOWS */
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------------------------------- */
|
||||
diff --git a/lib/tty/tty-ncurses.h b/lib/tty/tty-ncurses.h
|
||||
index d75df9533ab9..8feb17ccd045 100644
|
||||
--- a/lib/tty/tty-ncurses.h
|
||||
+++ b/lib/tty/tty-ncurses.h
|
||||
@@ -30,6 +30,11 @@
|
||||
#define NCURSES_CONST const
|
||||
#endif
|
||||
|
||||
+/* do not draw shadows if NCurses is built with --disable-widec */
|
||||
+#if defined(NCURSES_WIDECHAR) && NCURSES_WIDECHAR
|
||||
+#define ENABLE_SHADOWS 1
|
||||
+#endif
|
||||
+
|
||||
/*** typedefs(not structures) and defined constants **********************************************/
|
||||
|
||||
/*** enums ***************************************************************************************/
|
||||
diff --git a/lib/tty/tty-slang.h b/lib/tty/tty-slang.h
|
||||
index 5b12c6512853..eeaade388af4 100644
|
||||
--- a/lib/tty/tty-slang.h
|
||||
+++ b/lib/tty/tty-slang.h
|
||||
@@ -23,6 +23,8 @@
|
||||
#define COLS SLtt_Screen_Cols
|
||||
#define LINES SLtt_Screen_Rows
|
||||
|
||||
+#define ENABLE_SHADOWS 1
|
||||
+
|
||||
/*** enums ***************************************************************************************/
|
||||
|
||||
enum
|
||||
diff --git a/src/filemanager/boxes.c b/src/filemanager/boxes.c
|
||||
index 3eb525be4a9b..98df5ff2ed9a 100644
|
||||
--- a/src/filemanager/boxes.c
|
||||
+++ b/src/filemanager/boxes.c
|
||||
@@ -280,7 +280,9 @@ appearance_box_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm
|
||||
switch (msg)
|
||||
{
|
||||
case MSG_INIT:
|
||||
+#ifdef ENABLE_SHADOWS
|
||||
if (!tty_use_colors ())
|
||||
+#endif
|
||||
{
|
||||
Widget *shadow;
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -11,12 +11,10 @@ RRECOMMENDS:${PN} = "ncurses-terminfo"
|
||||
SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \
|
||||
file://0001-mc-replace-perl-w-with-use-warnings.patch \
|
||||
file://nomandate.patch \
|
||||
file://0001-Ticket-4200-fix-FTBFS-with-ncurses-build-with-disabl.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "2f52dd9c75c20d8eac7701bd3a8c6c125aaf8cdd9cf12b78ca50a0102b543407"
|
||||
SRC_URI[sha256sum] = "6bb47533d7a55bb21e46292d2f94786c9037bd7a70bf02b6a3c48adb0c9ce20c"
|
||||
|
||||
# remove at next version upgrade or when output changes
|
||||
PR = "r1"
|
||||
HASHEQUIV_HASH_VERSION .= ".2"
|
||||
|
||||
inherit autotools gettext pkgconfig
|
||||
@@ -25,7 +23,6 @@ inherit autotools gettext pkgconfig
|
||||
# Both Samba (smb) and sftp require package delivered from meta-openembedded
|
||||
#
|
||||
PACKAGECONFIG ??= ""
|
||||
PACKAGECONFIG[smb] = "--enable-vfs-smb,--disable-vfs-smb,samba,"
|
||||
PACKAGECONFIG[sftp] = "--enable-vfs-sftp,--disable-vfs-sftp,libssh2,"
|
||||
|
||||
# enable NCURSES_WIDECHAR=1 only if ENABLE_WIDEC has not been explicitly disabled (e.g. by the distro config).
|
||||
Reference in New Issue
Block a user