update to 2.15

This commit is contained in:
panxiaohe 2023-05-06 17:32:59 +08:00
parent 8e7f83fafa
commit 7f54526eb4
5 changed files with 7 additions and 80 deletions

View File

@ -1,20 +0,0 @@
diff --git a/configure.ac b/configure.ac
index 2571c5d..c913368 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,6 +3,7 @@
AC_PREREQ([2.69])
AC_INIT([powertop], [2.14], [powertop@lists.01.org], [], [https://01.org/powertop])
+AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([
-Wall
1.12.2
@@ -37,6 +38,7 @@ AC_PROG_CC
AC_PROG_INSTALL
AM_PROG_CC_C_O
PKG_PROG_PKG_CONFIG
+AX_PTHREAD
# Checks for libraries.

View File

@ -1,54 +0,0 @@
From 9ef1559a1582f23d599c149601c3a8e06809296c 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
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));
}
--
1.8.3.1

Binary file not shown.

BIN
powertop-2.15.tar.gz Normal file

Binary file not shown.

View File

@ -1,17 +1,15 @@
Name: powertop
Version: 2.14
Release: 2
Version: 2.15
Release: 1
Summary: Power consumption tool for Linux
License: GPLv2
URL: http://01.org/powertop/
Source0: https://01.org/sites/default/files/downloads//%{name}-%{version}.tar.gz
Source0: http://github.com/fenrus75/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
Source1: powertop.service
Patch1: backport-powertop-2.7-always-create-params.patch
Patch2: backport-powertop-2.14-pthread.patch
Patch3: backport-src-fix-compatibility-with-ncurses-6.3.patch
BuildRequires: autoconf automake libtool
BuildRequires: autoconf autoconf-archive automake libtool
BuildRequires: gcc gcc-c++ systemd
BuildRequires: gettext-devel ncurses-devel pciutils-devel zlib-devel libnl3-devel
Requires(post): coreutils
@ -72,6 +70,9 @@ touch %{_localstatedir}/cache/powertop/{saved_parameters.powertop,saved_results.
%changelog
* Sat May 6 2023 panxiaohe <pan_xiaohe@hoperun.com> - 2.15-1
- update to 2.15
* Thu Feb 24 2022 wangchen <wangchen137@h-partners.com> - 2.14-2
- fix compatibility with ncurses-6.3