commit: 9ae64903ffdcd696129fc4af20f585fb882047ab Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Apr 23 10:54:52 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Apr 23 10:57:23 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9ae64903
kde-misc/kdeconnect: Add IUSE telephony Upstream commits: 7b1f10d4d514285017928b79316ff5e061f16e86 97e47efdf6626fa0ae282684ab50ee6fce67d642 Bug: https://bugs.gentoo.org/904823 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../kdeconnect-23.04.0-telephony-optional.patch | 40 ++++++++++++++++++++++ .../kdeconnect/kdeconnect-23.04.49.9999.ebuild | 11 ++++-- kde-misc/kdeconnect/kdeconnect-9999.ebuild | 6 ++-- kde-misc/kdeconnect/metadata.xml | 1 + 4 files changed, 53 insertions(+), 5 deletions(-) diff --git a/kde-misc/kdeconnect/files/kdeconnect-23.04.0-telephony-optional.patch b/kde-misc/kdeconnect/files/kdeconnect-23.04.0-telephony-optional.patch new file mode 100644 index 0000000000..bec66fd645 --- /dev/null +++ b/kde-misc/kdeconnect/files/kdeconnect-23.04.0-telephony-optional.patch @@ -0,0 +1,40 @@ +From 97e47efdf6626fa0ae282684ab50ee6fce67d642 Mon Sep 17 00:00:00 2001 +From: Heiko Becker <[email protected]> +Date: Mon, 20 Mar 2023 20:33:11 +0100 +Subject: [PATCH] Make mmtelephony plugin optional + +I see little purpose in pulling that stack in on a desktop computer, +which doesn't even have a modem. +--- + plugins/CMakeLists.txt | 5 ++++- + plugins/mmtelephony/CMakeLists.txt | 1 - + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt +index dda19398b..1e304b88e 100644 +--- a/plugins/CMakeLists.txt ++++ b/plugins/CMakeLists.txt +@@ -39,7 +39,10 @@ if(NOT SAILFISHOS) + add_subdirectory(virtualmonitor) + + if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") +- add_subdirectory(mmtelephony) ++ find_package(KF5ModemManagerQt ${KF5_MIN_VERSION}) ++ if (TARGET KF5::ModemManagerQt) ++ add_subdirectory(mmtelephony) ++ endif() + endif() + + if(NOT WIN32) +diff --git a/plugins/mmtelephony/CMakeLists.txt b/plugins/mmtelephony/CMakeLists.txt +index 1fd9afe1e..c792b4c7c 100644 +--- a/plugins/mmtelephony/CMakeLists.txt ++++ b/plugins/mmtelephony/CMakeLists.txt +@@ -1,4 +1,3 @@ +-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS ModemManagerQt) + set(debug_file_SRCS) + ecm_qt_declare_logging_category( + debug_file_SRCS HEADER plugin_mmtelephony_debug.h +-- +GitLab + diff --git a/kde-misc/kdeconnect/kdeconnect-23.04.49.9999.ebuild b/kde-misc/kdeconnect/kdeconnect-23.04.49.9999.ebuild index ebc5a9f396..af65e0957d 100644 --- a/kde-misc/kdeconnect/kdeconnect-23.04.49.9999.ebuild +++ b/kde-misc/kdeconnect/kdeconnect-23.04.49.9999.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect/"; LICENSE="GPL-2+" SLOT="5" KEYWORDS="" -IUSE="bluetooth pulseaudio X" +IUSE="bluetooth pulseaudio telephony X" RESTRICT="test" @@ -53,12 +53,13 @@ DEPEND=" >=kde-frameworks/solid-${KFMIN}:5 x11-libs/libxkbcommon bluetooth? ( >=dev-qt/qtbluetooth-${QTMIN}:5 ) + pulseaudio? ( media-libs/pulseaudio-qt:= ) + telephony? ( >=kde-frameworks/modemmanager-qt-${KFMIN}:5 ) X? ( x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst ) - pulseaudio? ( media-libs/pulseaudio-qt:= ) " RDEPEND="${DEPEND} dev-libs/kpeoplevcard @@ -72,12 +73,16 @@ BDEPEND=" dev-util/wayland-scanner " -PATCHES=( "${FILESDIR}/${PN}-21.07.80-revert-disable-kpeople.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-21.07.80-revert-disable-kpeople.patch" + "${FILESDIR}/${PN}-23.04.0-telephony-optional.patch" # bug 904823 +) src_configure() { local mycmakeargs=( -DBLUETOOTH_ENABLED=$(usex bluetooth) $(cmake_use_find_package pulseaudio KF5PulseAudioQt) + $(cmake_use_find_package telephony KF5ModemManagerQt) $(cmake_use_find_package X LibFakeKey) ) ecm_src_configure diff --git a/kde-misc/kdeconnect/kdeconnect-9999.ebuild b/kde-misc/kdeconnect/kdeconnect-9999.ebuild index ebc5a9f396..ffe7acb245 100644 --- a/kde-misc/kdeconnect/kdeconnect-9999.ebuild +++ b/kde-misc/kdeconnect/kdeconnect-9999.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect/"; LICENSE="GPL-2+" SLOT="5" KEYWORDS="" -IUSE="bluetooth pulseaudio X" +IUSE="bluetooth pulseaudio telephony X" RESTRICT="test" @@ -53,12 +53,13 @@ DEPEND=" >=kde-frameworks/solid-${KFMIN}:5 x11-libs/libxkbcommon bluetooth? ( >=dev-qt/qtbluetooth-${QTMIN}:5 ) + pulseaudio? ( media-libs/pulseaudio-qt:= ) + telephony? ( >=kde-frameworks/modemmanager-qt-${KFMIN}:5 ) X? ( x11-libs/libfakekey x11-libs/libX11 x11-libs/libXtst ) - pulseaudio? ( media-libs/pulseaudio-qt:= ) " RDEPEND="${DEPEND} dev-libs/kpeoplevcard @@ -78,6 +79,7 @@ src_configure() { local mycmakeargs=( -DBLUETOOTH_ENABLED=$(usex bluetooth) $(cmake_use_find_package pulseaudio KF5PulseAudioQt) + $(cmake_use_find_package telephony KF5ModemManagerQt) $(cmake_use_find_package X LibFakeKey) ) ecm_src_configure diff --git a/kde-misc/kdeconnect/metadata.xml b/kde-misc/kdeconnect/metadata.xml index e2d036edee..f2331e3e26 100644 --- a/kde-misc/kdeconnect/metadata.xml +++ b/kde-misc/kdeconnect/metadata.xml @@ -11,6 +11,7 @@ </upstream> <use> <flag name="pulseaudio">Enable system volume control plugin using <pkg>media-sound/pulseaudio</pkg></flag> + <flag name="telephony">Enable telephony plugin using <pkg>kde-frameworks/modemmanager-qt</pkg></flag> <flag name="X">Enable remote input mousepad plugin using <pkg>x11-libs/libfakekey</pkg></flag> </use> </pkgmetadata>
