From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/discover/
Date: Sat, 13 Oct 2018 17:42:33 +0000 (UTC) [thread overview]
Message-ID: <1539451980.98510d2d278385aa220d725ae680294d9e24689f.asturm@gentoo> (raw)
commit: 98510d2d278385aa220d725ae680294d9e24689f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 17:33:00 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 17:33:00 2018 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=98510d2d
kde-plasma/discover: Fix DEPENDs, cmake options
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
kde-plasma/discover/discover-5.14.0.ebuild | 17 ++++++++++++-----
kde-plasma/discover/discover-5.14.49.9999.ebuild | 17 ++++++++++++-----
kde-plasma/discover/discover-9999.ebuild | 17 ++++++++++++-----
3 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/kde-plasma/discover/discover-5.14.0.ebuild b/kde-plasma/discover/discover-5.14.0.ebuild
index 14966180f4..8f09c25175 100644
--- a/kde-plasma/discover/discover-5.14.0.ebuild
+++ b/kde-plasma/discover/discover-5.14.0.ebuild
@@ -13,17 +13,18 @@ IUSE="firmware"
DEPEND="
$(add_frameworks_dep attica)
- $(add_frameworks_dep karchive)
$(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kcrash)
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep ki18n)
- $(add_frameworks_dep kitemmodels)
$(add_frameworks_dep kio)
$(add_frameworks_dep kirigami)
+ $(add_frameworks_dep kitemmodels)
$(add_frameworks_dep knewstuff)
$(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
$(add_qt_dep qtconcurrent)
$(add_qt_dep qtdbus)
@@ -31,15 +32,21 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
$(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
firmware? ( sys-apps/fwupd )
"
-# $(add_frameworks_dep kconfigwidgets)
RDEPEND="${DEPEND}"
+src_prepare() {
+ kde5_src_prepare
+ # we don't need it with PackageKitBackend off
+ punt_bogus_dep KF5 Archive
+}
+
src_configure() {
local mycmakeargs=(
- -DCMAKE_FIND_PACKAGE_packagekitqt5=OFF
- -DCMAKE_FIND_PACKAGE_AppStreamQt=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=OFF
$(cmake-utils_use_find_package firmware LIBFWUPD)
)
diff --git a/kde-plasma/discover/discover-5.14.49.9999.ebuild b/kde-plasma/discover/discover-5.14.49.9999.ebuild
index 602d92fe61..1eb798393b 100644
--- a/kde-plasma/discover/discover-5.14.49.9999.ebuild
+++ b/kde-plasma/discover/discover-5.14.49.9999.ebuild
@@ -13,17 +13,18 @@ IUSE="firmware"
DEPEND="
$(add_frameworks_dep attica)
- $(add_frameworks_dep karchive)
$(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kcrash)
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep ki18n)
- $(add_frameworks_dep kitemmodels)
$(add_frameworks_dep kio)
$(add_frameworks_dep kirigami)
+ $(add_frameworks_dep kitemmodels)
$(add_frameworks_dep knewstuff)
$(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
$(add_qt_dep qtconcurrent)
$(add_qt_dep qtdbus)
@@ -31,15 +32,21 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
$(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
firmware? ( sys-apps/fwupd )
"
-# $(add_frameworks_dep kconfigwidgets)
RDEPEND="${DEPEND}"
+src_prepare() {
+ kde5_src_prepare
+ # we don't need it with PackageKitBackend off
+ punt_bogus_dep KF5 Archive
+}
+
src_configure() {
local mycmakeargs=(
- -DCMAKE_FIND_PACKAGE_packagekitqt5=OFF
- -DCMAKE_FIND_PACKAGE_AppStreamQt=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=OFF
$(cmake-utils_use_find_package firmware LIBFWUPD)
)
diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild
index 602d92fe61..1eb798393b 100644
--- a/kde-plasma/discover/discover-9999.ebuild
+++ b/kde-plasma/discover/discover-9999.ebuild
@@ -13,17 +13,18 @@ IUSE="firmware"
DEPEND="
$(add_frameworks_dep attica)
- $(add_frameworks_dep karchive)
$(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kcrash)
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep ki18n)
- $(add_frameworks_dep kitemmodels)
$(add_frameworks_dep kio)
$(add_frameworks_dep kirigami)
+ $(add_frameworks_dep kitemmodels)
$(add_frameworks_dep knewstuff)
$(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
$(add_qt_dep qtconcurrent)
$(add_qt_dep qtdbus)
@@ -31,15 +32,21 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
$(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
firmware? ( sys-apps/fwupd )
"
-# $(add_frameworks_dep kconfigwidgets)
RDEPEND="${DEPEND}"
+src_prepare() {
+ kde5_src_prepare
+ # we don't need it with PackageKitBackend off
+ punt_bogus_dep KF5 Archive
+}
+
src_configure() {
local mycmakeargs=(
- -DCMAKE_FIND_PACKAGE_packagekitqt5=OFF
- -DCMAKE_FIND_PACKAGE_AppStreamQt=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=OFF
$(cmake-utils_use_find_package firmware LIBFWUPD)
)
next reply other threads:[~2018-10-13 17:42 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-13 17:42 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-14 15:16 [gentoo-commits] proj/kde:master commit in: kde-plasma/discover/ Andreas Sturmlechner
2024-02-25 10:32 Andreas Sturmlechner
2024-01-16 8:51 Andreas Sturmlechner
2023-12-23 0:21 Andreas Sturmlechner
2023-12-18 11:07 Andreas Sturmlechner
2023-12-16 13:53 Andreas Sturmlechner
2023-12-07 19:34 Andreas Sturmlechner
2023-12-07 19:34 Andreas Sturmlechner
2023-12-02 19:25 Andreas Sturmlechner
2023-04-21 20:19 Andrew Ammerlaan
2022-12-13 19:22 Andreas Sturmlechner
2022-10-09 16:39 Andreas Sturmlechner
2022-10-06 9:02 Andreas Sturmlechner
2022-10-05 18:53 Andreas Sturmlechner
2022-09-25 18:52 Andreas Sturmlechner
2022-09-23 13:05 Andreas Sturmlechner
2022-09-03 13:05 Andreas Sturmlechner
2022-09-03 13:05 Andreas Sturmlechner
2022-06-21 11:28 Andreas Sturmlechner
2022-01-15 15:06 Andreas Sturmlechner
2021-08-26 16:46 Andreas Sturmlechner
2021-04-04 19:51 Andreas Sturmlechner
2021-01-22 0:00 Andreas Sturmlechner
2021-01-22 0:00 Andreas Sturmlechner
2020-11-29 20:59 Andreas Sturmlechner
2020-10-25 0:26 Andreas Sturmlechner
2020-07-10 14:39 Andreas Sturmlechner
2019-10-11 20:27 Andreas Sturmlechner
2019-06-05 19:06 Andreas Sturmlechner
2019-03-02 11:41 Andreas Sturmlechner
2019-03-01 13:27 Andreas Sturmlechner
2019-02-25 17:11 Andreas Sturmlechner
2019-02-25 16:58 Andreas Sturmlechner
2019-02-19 14:48 Andreas Sturmlechner
2019-02-14 7:44 Andreas Sturmlechner
2019-01-30 17:44 Andreas Sturmlechner
2019-01-08 19:18 Andreas Sturmlechner
2018-11-30 1:16 Andreas Sturmlechner
2018-11-13 11:56 Andreas Sturmlechner
2018-11-07 18:41 Andreas Sturmlechner
2018-10-29 19:29 Andreas Sturmlechner
2018-10-16 14:10 Andreas Sturmlechner
2018-10-13 23:53 Andreas Sturmlechner
2018-10-11 19:37 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1539451980.98510d2d278385aa220d725ae680294d9e24689f.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox