Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/powerdevil/files/, kde-plasma/powerdevil/
Date: Sat, 01 Aug 2020 22:58:01
Message-Id: 1596322638.0a1734960f32f53fd522cce1bfe806ea00093375.asturm@gentoo
1 commit: 0a1734960f32f53fd522cce1bfe806ea00093375
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 1 16:12:48 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 1 22:57:18 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a173496
7
8 kde-plasma/powerdevil: Fix build with app-misc/ddcutil-0.9.9
9
10 Reported-by: Stefano Crocco <stefano.crocco <AT> alice.it>
11 Thanks-to: Mike Lothian <mike <AT> fireburn.co.uk>
12 Closes: https://bugs.gentoo.org/734918
13 Package-Manager: Portage-3.0.1, Repoman-2.3.23
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 .../files/powerdevil-5.19.4-ddcutil-0.9.9.patch | 24 ++++++++++++++++++++++
17 kde-plasma/powerdevil/powerdevil-5.19.4.ebuild | 2 ++
18 2 files changed, 26 insertions(+)
19
20 diff --git a/kde-plasma/powerdevil/files/powerdevil-5.19.4-ddcutil-0.9.9.patch b/kde-plasma/powerdevil/files/powerdevil-5.19.4-ddcutil-0.9.9.patch
21 new file mode 100644
22 index 00000000000..3a1c4c38155
23 --- /dev/null
24 +++ b/kde-plasma/powerdevil/files/powerdevil-5.19.4-ddcutil-0.9.9.patch
25 @@ -0,0 +1,24 @@
26 +From fcb26be2fb279e6ad3b7b814d26a5921d16201eb Mon Sep 17 00:00:00 2001
27 +From: Johannes Jordan <kde@××××××××.de>
28 +Date: Mon, 29 Jun 2020 10:51:40 +0000
29 +Subject: [PATCH] Fix compilation with ddcutil 0.9.9
30 +
31 +---
32 + daemon/backends/upower/ddcutilbrightness.cpp | 1 -
33 + 1 file changed, 1 deletion(-)
34 +
35 +diff --git a/daemon/backends/upower/ddcutilbrightness.cpp b/daemon/backends/upower/ddcutilbrightness.cpp
36 +index e712c05a..a75aac5c 100644
37 +--- a/daemon/backends/upower/ddcutilbrightness.cpp
38 ++++ b/daemon/backends/upower/ddcutilbrightness.cpp
39 +@@ -56,7 +56,6 @@ void DDCutilBrightness::detect()
40 +
41 + DDCA_Feature_List vcpList;
42 + ddca_get_feature_list_by_dref(DDCA_SUBSET_COLOR, dh, false, &vcpList);
43 +- qCDebug(POWERDEVIL) << "ddca_feature_list: "<< ddca_feature_list_string(&vcpList, "0x", ",");
44 + QVector<uint16_t> tmpVcpList;
45 + for (int iVcp = 0; iVcp < m_usedVcp.count(); ++iVcp) {
46 + DDCA_Non_Table_Vcp_Value returnValue;
47 +--
48 +GitLab
49 +
50
51 diff --git a/kde-plasma/powerdevil/powerdevil-5.19.4.ebuild b/kde-plasma/powerdevil/powerdevil-5.19.4.ebuild
52 index 4f9763f2ecb..4452b67c937 100644
53 --- a/kde-plasma/powerdevil/powerdevil-5.19.4.ebuild
54 +++ b/kde-plasma/powerdevil/powerdevil-5.19.4.ebuild
55 @@ -56,6 +56,8 @@ RDEPEND="${DEPEND}
56 >=sys-power/upower-0.9.23
57 "
58
59 +PATCHES=( "${FILESDIR}/${P}-ddcutil-0.9.9.patch" ) # bug 734918
60 +
61 src_configure() {
62 local mycmakeargs=(
63 -DHAVE_DDCUTIL=$(usex brightness-control)