commit:     b1161d3963e2a6e4a6eb414478a107c641980b40
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jul 12 20:01:04 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 01:36:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1161d39

sys-power/thermald: remove unused patch

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16682
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../files/thermald-1.9-size_t-format.patch         | 44 ----------------------
 1 file changed, 44 deletions(-)

diff --git a/sys-power/thermald/files/thermald-1.9-size_t-format.patch 
b/sys-power/thermald/files/thermald-1.9-size_t-format.patch
deleted file mode 100644
index 324b3b97f79..00000000000
--- a/sys-power/thermald/files/thermald-1.9-size_t-format.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From dcdaf523393a6e7c07b5a510c573223722b0289b Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <[email protected]>
-Date: Thu, 1 Aug 2019 08:15:52 +0800
-Subject: [PATCH] Use correct format specifier for size_t
-
-%zu instead of %lu, otherwise on 32 bit:
-
-| 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 <[email protected]>
----
- src/thd_zone.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/thd_zone.cpp b/src/thd_zone.cpp
-index dd485d9..eb81d61 100644
---- a/src/thd_zone.cpp
-+++ b/src/thd_zone.cpp
-@@ -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()) {
--              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");

Reply via email to