From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- sys-power/thermald/Manifest | 5 +-- .../files/thermald-1.9-size_t-format.patch | 44 -------------------- sys-power/thermald/thermald-1.9.ebuild | 47 ---------------------- sys-power/thermald/thermald-2.2.ebuild | 46 +++++++++++++++++++++ 4 files changed, 48 insertions(+), 94 deletions(-) delete mode 100644 sys-power/thermald/files/thermald-1.9-size_t-format.patch delete mode 100644 sys-power/thermald/thermald-1.9.ebuild create mode 100644 sys-power/thermald/thermald-2.2.ebuild (limited to 'sys-power/thermald') diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest index 1c5a0c9b1f4c..504f6be20df3 100644 --- a/sys-power/thermald/Manifest +++ b/sys-power/thermald/Manifest @@ -1,9 +1,8 @@ AUX thermald 374 BLAKE2B 2ea9775b75acb7797c078c8c7786d442bd9c98102cd53073e1c040a0972dfd6be8424a62889a666573ee72ce5273bc53169fae5762bc0005a1c899324a699d27 SHA512 17f1c2133e47e897c4a5407ef622adfebb8498fce7ea9bf17cfd177269a3d869bdc21c3d2558010e9669ddc53e69e521bb4c1e112c51010168aa3c074c259e02 -AUX thermald-1.9-size_t-format.patch 2375 BLAKE2B 1f795d846a6012f69bb5c5e27a2b503a206a85565ef18c5d13b01bc6f12c80b81e565d78cc1d6cd5d494d639fbba712ccfbdca8b893ef4e2d6a5ac274a9bd908 SHA512 dc470f499bac68e8154f90d233321b0ca2932a814e2e59fd5ab1bb9a1163fc25e9be26557bef987676591f05effa99ad5b4e00139b9492c6b354345c0cc478b3 DIST thermald-1.9.1.tar.gz 429116 BLAKE2B 7b6105b25e89e68f82368e154b4ca2a826192d596c7427ebea3c6aa726c28b5409cf7e0f022132e2ee47423cc732a6d37b2eb05236c579e2c725820516f6993f SHA512 7c16871316fb264abad9d0182cf8b6b5c1b4c747093672e74b7db2b6aa4f322fafdf6a94bfc8a11f427f7be2ee5e5691dc6a25bb5357ce45e7afe868f89b89e1 -DIST thermald-1.9.tar.gz 427380 BLAKE2B 1954531838c0fc3677ab8f91476d5670a6b5d067d580c7c570b37e5d8d8ac408cacb218531bc8363cfd56eee9331291959ff11851550c6c782a43b19bacca01a SHA512 71fa6e9fc2f55623ed0acdb65f9699d5ea2c89c4092546a73d53ac3ea3ca0a5c60f3360c8bef0af9daeeecfe9a20411d9e4d25bc1d89349cfe83ebb03ba387a8 DIST thermald-2.1.tar.gz 435310 BLAKE2B 7a5b67c2f8cb56276427188a91cc0d0c5cc7975ea847abe6eddc41b5dba77f908bc1ab97234568c65b2bcbb3bfff7881412cef2f8aa422139c64d5fb089a6511 SHA512 407d743d2799f84cd178e17ef694f0825f03db4ce80a47df95826bc26a9f142b80295905707fcba41bd5268d411a03478cd9d432545f9e2f1394d7d61539e169 +DIST thermald-2.2.tar.gz 435659 BLAKE2B 500189b924594e5b1d68adc776b3ad0c1d531d4259c65dd77f9166648c9b4273c52e1f8222254ec6500b3d37e39deb4ec862443728d50e9be95dee8e43496645 SHA512 f2c691061436699aef5bb7d9681370306dc7a64c453208911077c9a4af50e35b32247fc0a35853bb314d0e4289dd07f6116a3ade7fa278b521ed9b7b13db949b EBUILD thermald-1.9.1.ebuild 922 BLAKE2B d5481f4bf46b429ce06e194fab8665d7edc46ec73c15ca16479b33455fc6d71f51c204e01cadbfe39dd970f386168c4ec33d1b8edbc8e74fbd31d5830e5f2c1d SHA512 3f4bef46cf1ec58ee2da8f243102ef7710efde6357d60e150d4ada0310111d49a7c176e844799b9763d33ef484dae84db60261fd9b269b09ae2f0caf21073450 -EBUILD thermald-1.9.ebuild 969 BLAKE2B 552f431a2298645c8ba1bffa43c44ebb0a377a82ddb567bbb3755597ded23adcc338c874a4151ee9a6180b999b6d58ef8b9624b41f44af6fcd062f94a1bed2df SHA512 0eba38d7d333c205349366da32a1ba4e522d8914a30c9ace287917be586ae8d53fc515c9a6a87bf4b8a52def446fff670b269e7a952674737086bcced0f27ead EBUILD thermald-2.1.ebuild 924 BLAKE2B 22a248bb8becef8fbb2dd4ebca3d20e879508bae70a3b2690b9e27f04451a9d0c44cca46d1e82f20560d5cdb9c81c5843433fefd7b8af3a39f64c272b22696dc SHA512 de36365498bf49ef44c2e5830e1def6bf4a9fdf8f8888d7b66b9890b433a2c981f40c63b51df77aff4fa248d0587b1f5785a1ec7298f940edc584e5bd3105c07 +EBUILD thermald-2.2.ebuild 922 BLAKE2B d5481f4bf46b429ce06e194fab8665d7edc46ec73c15ca16479b33455fc6d71f51c204e01cadbfe39dd970f386168c4ec33d1b8edbc8e74fbd31d5830e5f2c1d SHA512 3f4bef46cf1ec58ee2da8f243102ef7710efde6357d60e150d4ada0310111d49a7c176e844799b9763d33ef484dae84db60261fd9b269b09ae2f0caf21073450 MISC metadata.xml 643 BLAKE2B 92fe71631920f61dd6667c2dc8b4e27d2ea1e9bfb64509a9b4a9b0a72e9b4a11b7ae06febf120564c28272b9e079cf71a114bca620ce2651ec615439dd5ff9b3 SHA512 bad363023e01da0232632d54b2cb65dce89a7c70441f05fc873640a29f6fd4ec4ea30b00f94f723a786de1eef87b94673dad455102bc57a11573346e3a8ae2e8 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 324b3b97f79a..000000000000 --- 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 -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::size_type' {aka 'unsigned int'} [-Werror=format=] -| 322 | thd_log_info("trip_points.size():%lu\n", trip_points.size()); -| | ^~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~ -| | | -| | std::vector::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 ---- - 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"); diff --git a/sys-power/thermald/thermald-1.9.ebuild b/sys-power/thermald/thermald-1.9.ebuild deleted file mode 100644 index 03b369146fb8..000000000000 --- a/sys-power/thermald/thermald-1.9.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic out-of-source systemd - -DESCRIPTION="Thermal daemon for Intel architectures" -HOMEPAGE="https://01.org/linux-thermal-daemon" -SRC_URI="https://github.com/01org/thermal_daemon/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=" - dev-libs/dbus-glib:= - dev-libs/glib:= - dev-libs/libxml2:= - sys-apps/dbus:=" -DEPEND="${RDEPEND} - dev-util/glib-utils" - -S=${WORKDIR}/thermal_daemon-${PV} -DOCS=( thermal_daemon_usage.txt README.txt ) - -src_prepare() { - eapply "${FILESDIR}/${P}-size_t-format.patch" - default - eautoreconf -} - -my_src_configure() { - # bug 618948 - append-cxxflags -std=c++14 - - ECONF_SOURCE="${S}" econf \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" -} - -my_src_install_all() { - einstalldocs - - rm -rf "${ED}"/etc/init || die - doinitd "${FILESDIR}"/thermald -} diff --git a/sys-power/thermald/thermald-2.2.ebuild b/sys-power/thermald/thermald-2.2.ebuild new file mode 100644 index 000000000000..fefc84b2d488 --- /dev/null +++ b/sys-power/thermald/thermald-2.2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic out-of-source systemd + +DESCRIPTION="Thermal daemon for Intel architectures" +HOMEPAGE="https://01.org/linux-thermal-daemon" +SRC_URI="https://github.com/01org/thermal_daemon/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +RDEPEND=" + dev-libs/dbus-glib:= + dev-libs/glib:= + dev-libs/libxml2:= + sys-apps/dbus:=" +DEPEND="${RDEPEND} + dev-util/glib-utils" + +S=${WORKDIR}/thermal_daemon-${PV} +DOCS=( thermal_daemon_usage.txt README.txt ) + +src_prepare() { + default + eautoreconf +} + +my_src_configure() { + # bug 618948 + append-cxxflags -std=c++14 + + ECONF_SOURCE="${S}" econf \ + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" +} + +my_src_install_all() { + einstalldocs + + rm -rf "${ED}"/etc/init || die + doinitd "${FILESDIR}"/thermald +} -- cgit v1.2.3