* [gentoo-commits] proj/kde:master commit in: kde-plasma/kdeplasma-addons/files/, kde-plasma/kdeplasma-addons/
@ 2020-07-07 20:37 Andreas Sturmlechner
0 siblings, 0 replies; only message in thread
From: Andreas Sturmlechner @ 2020-07-07 20:37 UTC (permalink / raw
To: gentoo-commits
commit: fd84408b22de5409e78483092a6342cc14f4d11a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 7 20:33:16 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 7 20:33:16 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fd84408b
kde-plasma/kdeplasma-addons: Add IUSE=comic
Making kde-frameworks/kross optional.
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kdeplasma-addons-5.19.3-kross-optional.patch | 65 ++++++++++++++++++++++
.../kdeplasma-addons-5.19.49.9999.ebuild | 7 ++-
.../kdeplasma-addons/kdeplasma-addons-9999.ebuild | 7 ++-
kde-plasma/kdeplasma-addons/metadata.xml | 1 +
4 files changed, 76 insertions(+), 4 deletions(-)
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.3-kross-optional.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.3-kross-optional.patch
new file mode 100644
index 0000000000..485acd542a
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.3-kross-optional.patch
@@ -0,0 +1,65 @@
+From bbaaa3e2eac712887780c0849f955889e64ff358 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 7 Jul 2020 22:22:13 +0200
+Subject: [PATCH] Make KF5Kross optional, it is only used for comic applet
+
+---
+ CMakeLists.txt | 7 ++++++-
+ applets/CMakeLists.txt | 4 +++-
+ dataengines/CMakeLists.txt | 4 +++-
+ 3 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9c4697a52..e5d14bc8c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -48,7 +48,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+ IconThemes
+ KIO
+ KCMUtils
+- Kross
+ Notifications
+ Plasma
+ Runner
+@@ -59,6 +58,12 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+ NewStuff
+ )
+
++find_package(KF5Kross CONFIG QUIET)
++set_package_properties(KF5Kross PROPERTIES
++ PURPOSE "Needed for Comic applet"
++ TYPE OPTIONAL
++)
++
+ find_package(KF5Purpose CONFIG QUIET)
+ set_package_properties(KF5Purpose PROPERTIES
+ DESCRIPTION "Framework for cross-application services and actions"
+diff --git a/applets/CMakeLists.txt b/applets/CMakeLists.txt
+index 93b637b1b..6af5ffc67 100644
+--- a/applets/CMakeLists.txt
++++ b/applets/CMakeLists.txt
+@@ -6,7 +6,9 @@ plasma_install_package(keyboardindicator org.kde.plasma.keyboardindicator)
+ add_subdirectory(binary-clock)
+ add_subdirectory(calculator)
+ add_subdirectory(colorpicker)
+-add_subdirectory(comic)
++if(KF5Kross_FOUND)
++ add_subdirectory(comic)
++endif()
+ add_subdirectory(dict)
+ if(NOT WIN32)
+ # uses the command line tool 'quota', does not make sense on Windows
+diff --git a/dataengines/CMakeLists.txt b/dataengines/CMakeLists.txt
+index 8d91dd84f..38f715b11 100644
+--- a/dataengines/CMakeLists.txt
++++ b/dataengines/CMakeLists.txt
+@@ -1,3 +1,5 @@
+- add_subdirectory(comic)
++if(KF5Kross_FOUND)
++ add_subdirectory(comic)
++endif()
+ add_subdirectory(potd)
+ add_subdirectory(konsoleprofiles)
+--
+2.27.0
+
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.49.9999.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.49.9999.ebuild
index 76a63ed539..c6426888e0 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.49.9999.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.49.9999.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Extra Plasma applets and engines"
LICENSE="GPL-2 LGPL-2"
SLOT="5"
KEYWORDS=""
-IUSE="share webengine"
+IUSE="+comic share webengine"
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
@@ -35,7 +35,6 @@ DEPEND="
>=kde-frameworks/knewstuff-${KFMIN}:5
>=kde-frameworks/knotifications-${KFMIN}:5
>=kde-frameworks/kpackage-${KFMIN}:5
- >=kde-frameworks/kross-${KFMIN}:5
>=kde-frameworks/krunner-${KFMIN}:5
>=kde-frameworks/kservice-${KFMIN}:5
>=kde-frameworks/kunitconversion-${KFMIN}:5
@@ -44,6 +43,7 @@ DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/plasma-${KFMIN}:5
>=kde-frameworks/sonnet-${KFMIN}:5
+ comic? ( >=kde-frameworks/kross-${KFMIN}:5 )
share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
"
@@ -53,8 +53,11 @@ RDEPEND="${DEPEND}
>=kde-plasma/plasma-workspace-${PVCUT}:5
"
+PATCHES=( "${FILESDIR}/${PN}-5.19.3-kross-optional.patch" )
+
src_configure() {
local mycmakeargs=(
+ $(cmake_use_find_package comic KF5Kross)
$(cmake_use_find_package share KF5Purpose)
$(cmake_use_find_package webengine Qt5WebEngine)
)
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
index 3593e826a1..fb32f6b2c7 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Extra Plasma applets and engines"
LICENSE="GPL-2 LGPL-2"
SLOT="5"
KEYWORDS=""
-IUSE="share webengine"
+IUSE="comic share webengine"
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
@@ -37,7 +37,6 @@ DEPEND="
>=kde-frameworks/knewstuff-${KFMIN}:5
>=kde-frameworks/knotifications-${KFMIN}:5
>=kde-frameworks/kpackage-${KFMIN}:5
- >=kde-frameworks/kross-${KFMIN}:5
>=kde-frameworks/krunner-${KFMIN}:5
>=kde-frameworks/kservice-${KFMIN}:5
>=kde-frameworks/kunitconversion-${KFMIN}:5
@@ -46,6 +45,7 @@ DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/plasma-${KFMIN}:5
>=kde-frameworks/sonnet-${KFMIN}:5
+ comic? ( >=kde-frameworks/kross-${KFMIN}:5 )
share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
"
@@ -55,8 +55,11 @@ RDEPEND="${DEPEND}
>=kde-plasma/plasma-workspace-${PVCUT}:5
"
+PATCHES=( "${FILESDIR}/${PN}-5.19.3-kross-optional.patch" )
+
src_configure() {
local mycmakeargs=(
+ $(cmake_use_find_package comic KF5Kross)
$(cmake_use_find_package share KF5Purpose)
$(cmake_use_find_package webengine Qt5WebEngine)
)
diff --git a/kde-plasma/kdeplasma-addons/metadata.xml b/kde-plasma/kdeplasma-addons/metadata.xml
index a3b3507b1a..7421b6e64e 100644
--- a/kde-plasma/kdeplasma-addons/metadata.xml
+++ b/kde-plasma/kdeplasma-addons/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo KDE Project</name>
</maintainer>
<use>
+ <flag name="comic">Enable comic applet (requires deprecated <pkg>kde-frameworks/kross</pkg>)</flag>
<flag name="share">Enable applet for quickly sharing data to a variety of sources</flag>
<flag name="webengine">Enable dictionary and web browser applets using <pkg>dev-qt/qtwebengine</pkg></flag>
</use>
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-07-07 20:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-07 20:37 [gentoo-commits] proj/kde:master commit in: kde-plasma/kdeplasma-addons/files/, kde-plasma/kdeplasma-addons/ Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox