summaryrefslogtreecommitdiff
path: root/sys-power/thermald
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-11-18 09:38:27 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-11-18 09:38:27 +0000
commit536c3711867ec947c1738f2c4b96f22e4863322d (patch)
tree697733f5cb713908dcf378e13fd15a798a906a91 /sys-power/thermald
parentf65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff)
gentoo resync : 18.11.2018
Diffstat (limited to 'sys-power/thermald')
-rw-r--r--sys-power/thermald/Manifest3
-rw-r--r--sys-power/thermald/files/thermald-1.8-x86-fix.patch31
-rw-r--r--sys-power/thermald/thermald-1.8-r1.ebuild (renamed from sys-power/thermald/thermald-1.8.ebuild)1
3 files changed, 34 insertions, 1 deletions
diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index 398b4b5ec4fc..964d87622e36 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -1,6 +1,7 @@
AUX thermald 374 BLAKE2B 2ea9775b75acb7797c078c8c7786d442bd9c98102cd53073e1c040a0972dfd6be8424a62889a666573ee72ce5273bc53169fae5762bc0005a1c899324a699d27 SHA512 17f1c2133e47e897c4a5407ef622adfebb8498fce7ea9bf17cfd177269a3d869bdc21c3d2558010e9669ddc53e69e521bb4c1e112c51010168aa3c074c259e02
+AUX thermald-1.8-x86-fix.patch 1314 BLAKE2B c563b2a23d1f96ae508c55bc17e3c8c0289221aba0c640aa87734630f2fb44d65d0e1b6b087207cfafc45bec25e235f4f95662ca951f37df0724cece1b3276d3 SHA512 dfe3a14856f631c698baf6eb7894b07ebaff38886eb94aaadc0258b4a2f69e7034dbce4c4802ed0136d0967fd90cb6a1a4db473d1ed7fb373668dd2c93de8cd5
DIST thermald-1.7.1.tar.gz 420725 BLAKE2B 99e176e978e56d453fe5ff409f048122d18b9c554ed3128dac1c704a61ab483ab3ca21c2c360d1dc763de9770f877948d62d8c2216072d23fa1b828913a8e766 SHA512 a78f8aa9ef0f3e3b57fc1ebbd7ad7e67985676ad7adf5b6a6d23e4aed4e2ccb8273fb67ccd9a2133f91f7f6b19f793c9ba68e41208aabde4248ca666061fe5e0
DIST thermald-1.8.tar.gz 422982 BLAKE2B 6970190182a6ebcd6b39fcd34d75221173e1bbbf32cb7c0009001cd2934cf18bbc524ec43d1e99dbf7a1a0bda53b0b2239c9e25e08c4cb9435bceb0a512c5e3b SHA512 2360cfad311a804d7609b9879c5a0db749e1813085093e535eaa948b6fa289c385b8e6762ab15270e2e19170a4f48e0b0d736ffff029651289ec23c8dfc61743
EBUILD thermald-1.7.1.ebuild 926 BLAKE2B f762bc030610b646ef784b0f51b5d80648fe1c70e362fffc2fd7254fbecf8fbecb848fd3309cda10d836471fcff4a24d5f907624b5b3a07f9899c565d4095bbb SHA512 37de5bf2a66a67a126a94d566d000854d2ce2977c6cf1a398ef4cd44dce932f0bca682d0424edca16cd1aeff4d8beb91bf5a72ec32311559c6320b646f0891ea
-EBUILD thermald-1.8.ebuild 926 BLAKE2B f762bc030610b646ef784b0f51b5d80648fe1c70e362fffc2fd7254fbecf8fbecb848fd3309cda10d836471fcff4a24d5f907624b5b3a07f9899c565d4095bbb SHA512 37de5bf2a66a67a126a94d566d000854d2ce2977c6cf1a398ef4cd44dce932f0bca682d0424edca16cd1aeff4d8beb91bf5a72ec32311559c6320b646f0891ea
+EBUILD thermald-1.8-r1.ebuild 969 BLAKE2B 79aa181356e669bac648ea93f540effaa6db2cc52a44e6d4d0a7b321c0b1428f7df7b2ada6a1e6465a4f938ef363f4500746d32e541029971698f1767f9ea055 SHA512 4ed59800c405feaf3b0ae2b16eb81615e91b09042f02bf414af66022031c1064c7a2c21d80d22a9db3afcae66c7d89b551008b4c32bc2c32b102ebcafc3bc463
MISC metadata.xml 643 BLAKE2B 92fe71631920f61dd6667c2dc8b4e27d2ea1e9bfb64509a9b4a9b0a72e9b4a11b7ae06febf120564c28272b9e079cf71a114bca620ce2651ec615439dd5ff9b3 SHA512 bad363023e01da0232632d54b2cb65dce89a7c70441f05fc873640a29f6fd4ec4ea30b00f94f723a786de1eef87b94673dad455102bc57a11573346e3a8ae2e8
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 000000000000..e944003b79b7
--- /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.mittal@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.mittal@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
index 525bb27d6f06..e578d903b8eb 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
}