[PATCH 25/30] powertop: address ncurses 6.3 compatibility
From: Alexander Kanavin <hidden>
Date: 2021-10-27 09:07:57
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Alexander Kanavin <redacted> --- ...c-fix-compatibility-with-ncurses-6.3.patch | 52 +++++++++++++++++++ meta/recipes-kernel/powertop/powertop_2.14.bb | 5 +- 2 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-kernel/powertop/powertop/0001-src-fix-compatibility-with-ncurses-6.3.patch
diff --git a/meta/recipes-kernel/powertop/powertop/0001-src-fix-compatibility-with-ncurses-6.3.patch b/meta/recipes-kernel/powertop/powertop/0001-src-fix-compatibility-with-ncurses-6.3.patch
new file mode 100644
index 0000000000..84b05ac971
--- /dev/null
+++ b/meta/recipes-kernel/powertop/powertop/0001-src-fix-compatibility-with-ncurses-6.3.patch@@ -0,0 +1,52 @@ +From 76d3f0851520bc8488e432f423941f1e72cc7405 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Mon, 25 Oct 2021 17:47:23 +0200 +Subject: [PATCH] src: fix compatibility with ncurses 6.3 + +Upstream-Status: Submitted [https://github.com/fenrus75/powertop/pull/92] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + src/devices/devfreq.cpp | 2 +- + src/display.cpp | 2 +- + src/lib.cpp | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/devices/devfreq.cpp b/src/devices/devfreq.cpp +index 0509d0f..b194ac4 100644 +--- a/src/devices/devfreq.cpp ++++ b/src/devices/devfreq.cpp +@@ -297,7 +297,7 @@ void display_devfreq_devices(void) + df->fill_freq_utilization(j, buf); + strcat(fline, buf); + strcat(fline, "\n"); +- wprintw(win, fline); ++ wprintw(win, "%s", fline); + } + wprintw(win, "\n"); + } +diff --git a/src/display.cpp b/src/display.cpp +index 7131144..cc03919 100644 +--- a/src/display.cpp ++++ b/src/display.cpp +@@ -125,7 +125,7 @@ void show_tab(unsigned int tab) + + c = bottom_lines[tab_names[tab]].c_str(); + if (c && strlen(c) > 0) +- mvwprintw(bottom_line, 0,0, c); ++ mvwprintw(bottom_line, 0,0, "%s", c); + else + mvwprintw(bottom_line, 0, 0, + "<ESC> %s | <TAB> / <Shift + TAB> %s | ", _("Exit"), +diff --git a/src/lib.cpp b/src/lib.cpp +index 5e48f37..5cd1c4a 100644 +--- a/src/lib.cpp ++++ b/src/lib.cpp +@@ -583,7 +583,7 @@ void ui_notify_user_ncurses(const char *frmt, ...) + * buffer */ + vsnprintf(notify, UI_NOTIFY_BUFF_SZ - 1, frmt, list); + va_end(list); +- mvprintw(1, 0, notify); ++ mvprintw(1, 0, "%s", notify); + attroff(COLOR_PAIR(1)); + } +
diff --git a/meta/recipes-kernel/powertop/powertop_2.14.bb b/meta/recipes-kernel/powertop/powertop_2.14.bb
index c176cba388..3a7c3ba31e 100644
--- a/meta/recipes-kernel/powertop/powertop_2.14.bb
+++ b/meta/recipes-kernel/powertop/powertop_2.14.bb@@ -7,8 +7,9 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" SRC_URI = "git://github.com/fenrus75/powertop;protocol=https \ - file://0001-wakeup_xxx.h-include-limits.h.patch \ -" + file://0001-wakeup_xxx.h-include-limits.h.patch \ + file://0001-src-fix-compatibility-with-ncurses-6.3.patch \ + " SRCREV = "52f022f9bbe6e060fba11701d657a8d9762702ba" S = "${WORKDIR}/git"
--
2.20.1