Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/quassel/
Date: Mon, 04 Apr 2022 20:49:25
Message-Id: 1649105347.4d72e5b0e08226161feff394b585d1e1b8e6ea01.sam@gentoo
1 commit: 4d72e5b0e08226161feff394b585d1e1b8e6ea01
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 4 20:48:49 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 4 20:49:07 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d72e5b0
7
8 net-irc/quassel: fix unused warnings
9
10 They're unused in some cases.
11
12 Closes: https://bugs.gentoo.org/830708
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 net-irc/quassel/quassel-0.14.0-r1.ebuild | 15 +++++++++++----
16 net-irc/quassel/quassel-9999.ebuild | 15 +++++++++++----
17 2 files changed, 22 insertions(+), 8 deletions(-)
18
19 diff --git a/net-irc/quassel/quassel-0.14.0-r1.ebuild b/net-irc/quassel/quassel-0.14.0-r1.ebuild
20 index f25fed0bc1d5..d6aa1c14902d 100644
21 --- a/net-irc/quassel/quassel-0.14.0-r1.ebuild
22 +++ b/net-irc/quassel/quassel-0.14.0-r1.ebuild
23 @@ -99,19 +99,26 @@ src_configure() {
24 -DEMBED_DATA=OFF
25 -DWITH_WEBKIT=OFF
26 -DWITH_BUNDLED_ICONS=$(usex bundled-icons)
27 - $(cmake_use_find_package dbus dbusmenu-qt5)
28 - $(cmake_use_find_package dbus Qt5DBus)
29 -DWITH_KDE=$(usex kde)
30 -DWITH_LDAP=$(usex ldap)
31 -DWANT_MONO=$(usex monolithic)
32 -DWITH_OXYGEN_ICONS=$(usex oxygen)
33 -DWANT_CORE=$(usex server)
34 - $(cmake_use_find_package snorenotify LibsnoreQt5)
35 - $(cmake_use_find_package spell KF5Sonnet)
36 -DWITH_WEBENGINE=$(usex urlpreview)
37 -DWANT_QTCLIENT=$(usex X)
38 )
39
40 + if use X || use monolithic ; then
41 + # We can't always pass these (avoid "unused" warning)
42 + # bug #830708
43 + mycmakeargs+=(
44 + $(cmake_use_find_package dbus dbusmenu-qt5)
45 + $(cmake_use_find_package dbus Qt5DBus)
46 + $(cmake_use_find_package snorenotify LibsnoreQt5)
47 + $(cmake_use_find_package spell KF5Sonnet)
48 + )
49 + fi
50 +
51 if use server || use monolithic ; then
52 mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) )
53 fi
54
55 diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
56 index d4dca6dc95f1..b00f930b98b5 100644
57 --- a/net-irc/quassel/quassel-9999.ebuild
58 +++ b/net-irc/quassel/quassel-9999.ebuild
59 @@ -95,19 +95,26 @@ src_configure() {
60 -DEMBED_DATA=OFF
61 -DWITH_WEBKIT=OFF
62 -DWITH_BUNDLED_ICONS=$(usex bundled-icons)
63 - $(cmake_use_find_package dbus dbusmenu-qt5)
64 - $(cmake_use_find_package dbus Qt5DBus)
65 -DWITH_KDE=$(usex kde)
66 -DWITH_LDAP=$(usex ldap)
67 -DWANT_MONO=$(usex monolithic)
68 -DWITH_OXYGEN_ICONS=$(usex oxygen)
69 -DWANT_CORE=$(usex server)
70 - $(cmake_use_find_package snorenotify LibsnoreQt5)
71 - $(cmake_use_find_package spell KF5Sonnet)
72 -DWITH_WEBENGINE=$(usex urlpreview)
73 -DWANT_QTCLIENT=$(usex X)
74 )
75
76 + if use X || use monolithic ; then
77 + # We can't always pass these (avoid "unused" warning)
78 + # bug #830708
79 + mycmakeargs+=(
80 + $(cmake_use_find_package dbus dbusmenu-qt5)
81 + $(cmake_use_find_package dbus Qt5DBus)
82 + $(cmake_use_find_package snorenotify LibsnoreQt5)
83 + $(cmake_use_find_package spell KF5Sonnet)
84 + )
85 + fi
86 +
87 if use server || use monolithic ; then
88 mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) )
89 fi