rpms/thermald
7
0
Fork 0
Code Issues Pull Requests Releases Activity

New upstream release (1.9)

Browse Source 
Update to upstream release 1.9.
Update the patch, committed in upstream git already with commit id
dcdaf523393a6e7c07b5a510c573223722b0289b
This commit is contained in:
Christian Kellner 2019-09-20 12:42:12 +02:00
parent 2f8fad1e47
commit 09e170e09e
3 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
0001-Use-correct-format-specifier-for-size_t.patch
View File

@ -1,15 +1,28 @@
From bb7631163c8f3f44d0dc83690765cdb799664fd5 Mon Sep 17 00:00:00 2001
From dcdaf523393a6e7c07b5a510c573223722b0289b Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
Date: Wed, 26 Sep 2018 10:34:15 +0800
Subject: [PATCH] Use correct format specifier for size_t
Date: Thu, 1 Aug 2019 08:15:52 +0800
Subject: [PATCH 1/3] Use correct format specifier for size_t
%zu instead of %lu, otherwise on 32 bit:
| ../git/src/thd_zone.cpp: In member function 'void cthd_zone::sort_and_update_poll_trip()':
| ../git/src/thd_zone.cpp:106:16: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'std::vector<cthd_trip_point>::size_type' {aka 'unsigned int'} [-Werror=format=]
| thd_log_debug("sort_and_update_poll_trip: trip_points_size =%lu\n",
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| trip_points.size());
| In file included from ../git/src/thd_common.h:27,
| from ../git/src/thd_zone.h:30,
| from ../git/src/thd_zone.cpp:34:
| ../git/src/thd_zone.cpp: In member function 'void cthd_zone::update_highest_trip_temp(cthd_trip_point&)':
| ../git/src/thd_zone.cpp:322:16: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'std::vector<cthd_trip_point>::size_type' {aka 'unsigned int'} [-Werror=format=]
| 322 | thd_log_info("trip_points.size():%lu\n", trip_points.size());
| | ^~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~
| | |
| | std::vector<cthd_trip_point>::size_type {aka unsigned int}
| ../git/src/thermald.h:82:57: note: in definition of macro 'thd_log_info'
| 82 | #define thd_log_info(...) g_log(NULL, G_LOG_LEVEL_INFO, __VA_ARGS__)
| | ^~~~~~~~~~~
| ../git/src/thd_zone.cpp:322:38: note: format string is defined here
| 322 | thd_log_info("trip_points.size():%lu\n", trip_points.size());
| | ~~^
| | |
| | long unsigned int
| | %u
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
@ -17,18 +30,18 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/thd_zone.cpp b/src/thd_zone.cpp
index b7edf9e..cb7b8e8 100644
index dd485d9..eb81d61 100644
--- a/src/thd_zone.cpp
+++ b/src/thd_zone.cpp
@@ -103,7 +103,7 @@ int cthd_zone::read_user_set_psv_temp() {
}
void cthd_zone::sort_and_update_poll_trip() {
- thd_log_debug("sort_and_update_poll_trip: trip_points_size =%lu\n",
+ thd_log_debug("sort_and_update_poll_trip: trip_points_size =%zu\n",
trip_points.size());
@@ -319,7 +319,7 @@ void cthd_zone::add_trip(cthd_trip_point &trip) {
void cthd_zone::update_highest_trip_temp(cthd_trip_point &trip)
{
if (trip_points.size()) {
unsigned int polling_trip = 0;
- thd_log_info("trip_points.size():%lu\n", trip_points.size());
+ thd_log_info("trip_points.size():%zu\n", trip_points.size());
for (unsigned int j = trip_points.size() - 1;; --j) {
if (trip_points[j].get_trip_type() == trip.get_trip_type()) {
thd_log_info("updating existing trip temp \n");
--
2.21.0

2
sources
View File

@ -1 +1 @@
SHA512 (thermald-1.8.tar.gz) = 2360cfad311a804d7609b9879c5a0db749e1813085093e535eaa948b6fa289c385b8e6762ab15270e2e19170a4f48e0b0d736ffff029651289ec23c8dfc61743
SHA512 (thermald-1.9.tar.gz) = 71fa6e9fc2f55623ed0acdb65f9699d5ea2c89c4092546a73d53ac3ea3ca0a5c60f3360c8bef0af9daeeecfe9a20411d9e4d25bc1d89349cfe83ebb03ba387a8

8
thermald.spec
View File

@ -7,8 +7,8 @@
Name: thermald
Version: 1.8
Release: 3%{?dist}
Version: 1.9
Release: 1%{?dist}
Summary: Thermal Management daemon
License: GPLv2+
@ -242,6 +242,10 @@ exit 0
%changelog
* Fri Sep 20 2019 Christian Kellner <ckellner@redhat.com> - 1.9-1
- New upstream release 1.9 (rhbz#1742290)
- Update patch0 (taken from upstream, commit dcdaf52...)
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild