gentoo auto-resync : 23:04:2023 - 18:08:08

4 files changed, 52 insertions, 5 deletions

diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index 621abda034fc..993444635710 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,6 +1,7 @@
 AUX kdeconnect-21.07.80-revert-disable-kpeople.patch 961 BLAKE2B 01322bdec48897cb763c551ed2210d4d86edd456d734639eda83dd4062197332c565fe337c90329de33290d55609a5586585376a4c28ac86cde645b3ae9d1d06 SHA512 d75a3b02c35d5d14cde7d34aca5b3e762dd12eb1492e5871c1db23d783f4f4caedec0116f041b9230e783ccdb1fde8a2625a58aec9d07bc0f708299048e1f885
+AUX kdeconnect-23.04.0-telephony-optional.patch 1369 BLAKE2B 971b2cc3cf133ccc71ab295301c483e781ed024607f679433d742db28c4560a689af52bec31678b2d0f7cb5025a28c3f2c97b57d9b204b2446e0af05751bed9f SHA512 a42af32867630aa48a48c9919779e2cec9058092c1846c5dd32576fc11fd5c3074c503b88104578146ca60e8e080383e82cf06c7933bce5dc7edfd18fe7d61fc
 DIST kdeconnect-kde-22.12.3.tar.xz 638472 BLAKE2B 3e03c46c4903c2d7d026e2df8d60024516b991570c2c5c04d1ca056db311d0169d68406f25ce5a706250a96c84447b712a611f145ecabf0f5b5d3f00c022f8a9 SHA512 2a6e0b76c49200662c2dcc7ce1ab60e6292d76727197f1b5cd8426422175180226a2b351b21bc947162d61358f906c319369f417c10561d2e9267f95912a629a
 DIST kdeconnect-kde-23.04.0.tar.xz 649120 BLAKE2B 9c3b497191e35e0b755b65d4dc124c132c13cb03e87a572128ab4c5a98a2b14cf82ae844dc136eafeeccc50e12e0fd534b4f5a5c78a5cb04b126d6fcb4866de8 SHA512 bd4165241116f05aed16b6ed785c91e40f8ff4645033e8da63c9cfa76aca5f844e2e8b1899dc6ab8f159d21a8867bdee6c98a8ad9c885c4ac7ef89ad84514155
 EBUILD kdeconnect-22.12.3.ebuild 2546 BLAKE2B 8e0619c1d251b3f414121bfb3655f6fa9e8e27b594a4092e27f90d07b72a4f3900410ec62583e63ee23126b95229c6c12b6aca47c9206f4bcb1a8292216f3013 SHA512 068b0074561cb7166711f5ddfff158c878c3cc6e4c1ebde1e8b9a5d92e6c8f7adb5ac0e0ff03db26e1b29be00dcb325abefb6848fd96b41d677b69d056daed16
-EBUILD kdeconnect-23.04.0.ebuild 2537 BLAKE2B 001f967c5efe6491fe36184809d30a26634e9e8fa2c575369c0b1ebea2f04ca4ec7dd1e5c8354d258c073412925d500624f6b4fb00fda90cdaa193df3be1791e SHA512 6489e5e9363725446d5e6868eebd56bdc8fe8c877e9e7d9d3ee4fe5e3040c3943c4173e16b288ac5275cdbd0cad8f4fd9df9cbdec9e2e21e9b95c89d65716cc2
-MISC metadata.xml 597 BLAKE2B 7b3ee7f7324ee87bc92965a8c0298924a16031f79b71a884d5dcb376d8b79586f545badaea5d8d483db3b1d66d962c7f325f78c03134cae081808f59b00d61f1 SHA512 4ea036e03ed5f0417472d7afedf39ea92fa844e1aaf76ab02498b92000c1417adce1dd6c604ced6a59e7fade1a1ec1c9cd59ae60d72f2fa13e5d7cdbcd36d62a
+EBUILD kdeconnect-23.04.0-r1.ebuild 2731 BLAKE2B 53247d85fce7071b77de96ca596ecf8bf219959a2eb100788d3973f74df6584e5d255e223823d32d7c9e553a8823e74ec927356fe155be3439b850b1ec04680a SHA512 81972908595c8557b36e47959a86de9b10dc62317ec7736f7a6e5ccb7cedf770da3d9fd7ada4f434dbe66db49295460ba6e37c6f957d3c276c3089a06dd346e4
+MISC metadata.xml 701 BLAKE2B fcdabc79552d433f9ae184555cb3feacb2ea21a169c0224ab8c9aca748e9f30c6a111ac2ae85feea8ccaef779e05521471a51c557ac0cb32f966141f6c7c13fc SHA512 4d1f483df712166749b1f998580fc09cb2fe64d8ec27307560756f352f70ca0955f43e665357b9f35107beb3fecb6ab598cca5a3f21ad99bd6b6ba92f09308ed
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 000000000000..bec66fd64538
--- /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 <heiko.becker@kde.org>
+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.0.ebuild b/kde-misc/kdeconnect/kdeconnect-23.04.0-r1.ebuild
index 4adb4b1c1e2f..83f731cb0357 100644
--- a/kde-misc/kdeconnect/kdeconnect-23.04.0.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-23.04.0-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect/"
 LICENSE="GPL-2+"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-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/metadata.xml b/kde-misc/kdeconnect/metadata.xml
index e2d036edeeab..f2331e3e263e 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>