From 0f830bc11ea4edc11c05531957ae838d631f5f73 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 12 Nov 2026 02:05:17 -0800 Subject: [PATCH] libyui, libyui-ncurses: upgrade 4.6.2 -> 4.7.7 Drop 0001-NCurses-cast-wchar_t-before-streaming-to-narrow-ostr.patch, upstream now streams these as std::wstring. AI-Generated: Uses Claude Code Signed-off-by: Khem Raj --- ...ar_t-before-streaming-to-narrow-ostr.patch | 46 ------------------- ...urses_4.6.2.bb => libyui-ncurses_4.7.7.bb} | 3 +- .../{libyui_4.6.2.bb => libyui_4.7.7.bb} | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 meta-oe/recipes-graphics/libyui/files/0001-NCurses-cast-wchar_t-before-streaming-to-narrow-ostr.patch rename meta-oe/recipes-graphics/libyui/{libyui-ncurses_4.6.2.bb => libyui-ncurses_4.7.7.bb} (92%) rename meta-oe/recipes-graphics/libyui/{libyui_4.6.2.bb => libyui_4.7.7.bb} (95%) diff --git a/meta-oe/recipes-graphics/libyui/files/0001-NCurses-cast-wchar_t-before-streaming-to-narrow-ostr.patch b/meta-oe/recipes-graphics/libyui/files/0001-NCurses-cast-wchar_t-before-streaming-to-narrow-ostr.patch deleted file mode 100644 index 3193147b4b..0000000000 --- a/meta-oe/recipes-graphics/libyui/files/0001-NCurses-cast-wchar_t-before-streaming-to-narrow-ostr.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: Khem Raj -Date: Wed, 25 Jun 2026 00:00:00 +0000 -Subject: [PATCH] NCurses: cast wchar_t before streaming to narrow ostream - -GCC 16 / libstdc++ implements the C++20 deletion of -std::operator<<(std::ostream&, wchar_t). Two debug-output sites stream a -wchar_t directly into a narrow std::ostream, which is now ill-formed: - - NCtext.cc:348:34: error: use of deleted function - 'std::basic_ostream& std::operator<<(basic_ostream&, wchar_t)' - NCRichText.cc:521:59: error: use of deleted function ... wchar_t ... - -Both values are ASCII characters used purely for debug output, so cast -them to char to keep the previous behaviour. - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - src/NCRichText.cc | 2 +- - src/NCtext.cc | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - ---- a/src/NCtext.cc -+++ b/src/NCtext.cc -@@ -345,7 +345,7 @@ - str << "[label" << obj.size() << ':' << obj[0].str(); - - if ( obj.hasHotkey() ) -- str << ':' << obj.hotkey() << " at " << obj.hotpos(); -+ str << ':' << static_cast( obj.hotkey() ) << " at " << obj.hotpos(); - - return str << ']'; - } ---- a/src/NCRichText.cc -+++ b/src/NCRichText.cc -@@ -518,7 +518,7 @@ - break; - - default: -- yuiDebug() << "Ignoring " << *wch << std::endl; -+ yuiDebug() << "Ignoring " << static_cast( *wch ) << std::endl; - } - ++wch; - } diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.6.2.bb b/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.7.7.bb similarity index 92% rename from meta-oe/recipes-graphics/libyui/libyui-ncurses_4.6.2.bb rename to meta-oe/recipes-graphics/libyui/libyui-ncurses_4.7.7.bb index d2d786c66f..43b5afa2f2 100644 --- a/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.6.2.bb +++ b/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.7.7.bb @@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = "file://../COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad0 " SRC_URI = "git://github.com/libyui/libyui.git;branch=master;protocol=https;tag=${PV} \ - file://0001-NCurses-cast-wchar_t-before-streaming-to-narrow-ostr.patch \ " SRC_URI:append:class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" -SRCREV = "e691b563262306a40a61bbf228839fa06e4f0516" +SRCREV = "9149299f60237acc8d360403d317854d484bcde3" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" diff --git a/meta-oe/recipes-graphics/libyui/libyui_4.6.2.bb b/meta-oe/recipes-graphics/libyui/libyui_4.7.7.bb similarity index 95% rename from meta-oe/recipes-graphics/libyui/libyui_4.6.2.bb rename to meta-oe/recipes-graphics/libyui/libyui_4.7.7.bb index 19b53a3e00..e48755c80a 100644 --- a/meta-oe/recipes-graphics/libyui/libyui_4.6.2.bb +++ b/meta-oe/recipes-graphics/libyui/libyui_4.7.7.bb @@ -10,7 +10,7 @@ SRC_URI = "git://github.com/libyui/libyui.git;branch=master;protocol=https;tag=$ file://0001-Use-relative-install-paths-for-CMake.patch \ " -SRCREV = "e691b563262306a40a61bbf228839fa06e4f0516" +SRCREV = "9149299f60237acc8d360403d317854d484bcde3" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)"