[gentoo-commits] repo/gentoo:master commit in: sys-power/thermald/, sys-power/thermald/files/

[Rick Farina]

commit:     8936b8d10e3758ed4142e6b0a1834cf7a560293f
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  7 18:20:40 2018 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Nov  7 18:20:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8936b8d1

sys-power/thermald: fixes bug #670624

apologies if the bump isn't correct, but I wasn't sure if this might
cause a runtime issue on other arches which successfully built and the
package takes 20 seconds to build

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 .../thermald/files/thermald-1.8-x86-fix.patch      | 31 ++++++++++++++++++++++
 ...{thermald-1.8.ebuild => thermald-1.8-r1.ebuild} |  1 +
 2 files changed, 32 insertions(+)

diff --git a/sys-power/thermald/files/thermald-1.8-x86-fix.patch 
b/sys-power/thermald/files/thermald-1.8-x86-fix.patch
new file mode 100644
index 00000000000..e944003b79b
--- /dev/null
+++ b/sys-power/thermald/files/thermald-1.8-x86-fix.patch
@@ -0,0 +1,31 @@
+From bb7631163c8f3f44d0dc83690765cdb799664fd5 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mit...@intel.com>
+Date: Wed, 26 Sep 2018 10:34:15 +0800
+Subject: [PATCH] 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());
+
+Signed-off-by: Anuj Mittal <anuj.mit...@intel.com>
+---
+ 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 b7edf9e..cb7b8e8 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());
+       if (trip_points.size()) {
+               unsigned int polling_trip = 0;

diff --git a/sys-power/thermald/thermald-1.8.ebuild 
b/sys-power/thermald/thermald-1.8-r1.ebuild
similarity index 95%
rename from sys-power/thermald/thermald-1.8.ebuild
rename to sys-power/thermald/thermald-1.8-r1.ebuild
index 525bb27d6f0..e578d903b8e 100644
--- a/sys-power/thermald/thermald-1.8.ebuild
+++ b/sys-power/thermald/thermald-1.8-r1.ebuild
@@ -26,6 +26,7 @@ S=${WORKDIR}/thermal_daemon-${PV}
 DOCS=( thermal_daemon_usage.txt README.txt )
 
 src_prepare() {
+       epatch "${FILESDIR}"/"${P}"-x86-fix.patch
        default
        eautoreconf
 }