From 5eb63df322ef73da4c1c9c229fefc44bf6bd4dc5 Mon Sep 17 00:00:00 2001 From: Milinda Brantini Date: Thu, 20 Jun 2024 14:46:08 +0800 Subject: [PATCH] powertop: update to 2.15 Release mainly focuses on bug fixes and patching compatibility issues. Also, adds support to multiple platforms. Removed obsolete patch as upstream has fixed. Signed-off-by: Milinda Brantini (cherry picked from commit 153984a8fb36134b410939f24c6425c785a66105) [Remove $(AUTORELEASE) to avoid frequent conflicts during cherry-pick updates.] Signed-off-by: Milinda Brantini --- utils/powertop/Makefile | 6 +-- utils/powertop/patches/010-ncurses63.patch | 45 ---------------------- 2 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 utils/powertop/patches/010-ncurses63.patch diff --git a/utils/powertop/Makefile b/utils/powertop/Makefile index 86bbbb58fb..c7d74fca33 100644 --- a/utils/powertop/Makefile +++ b/utils/powertop/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=powertop -PKG_VERSION:=2.14 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2.15 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/fenrus75/powertop -PKG_MIRROR_HASH:=9b49054a7e9684781287eb25c50003f68669e7dcad1c234573bd6a5e26474da7 +PKG_MIRROR_HASH:=50d98933e9c03acd8e600283dbb7ef08d56e10e09441aaf3880c1b0cb42d28c3 PKG_MAINTAINER:=Lucian Cristain PKG_LICENSE:=GPL-2.0-only diff --git a/utils/powertop/patches/010-ncurses63.patch b/utils/powertop/patches/010-ncurses63.patch deleted file mode 100644 index 53f9ff7078..0000000000 --- a/utils/powertop/patches/010-ncurses63.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 9ef1559a1582f23d599c149601c3a8e06809296c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 25 Oct 2021 17:47:23 +0200 -Subject: [PATCH] src: fix compatibility with ncurses 6.3 - -Signed-off-by: Alexander Kanavin ---- - src/devices/devfreq.cpp | 2 +- - src/display.cpp | 2 +- - src/lib.cpp | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - ---- 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"); - } ---- 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, - " %s | / %s | ", _("Exit"), ---- a/src/lib.cpp -+++ b/src/lib.cpp -@@ -583,7 +583,7 @@ void ui_notify_user_ncurses(const char * - * 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)); - } - -- 2.30.2