From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1A33A15803E for ; Sun, 31 Dec 2023 21:16:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 015542BC027; Sun, 31 Dec 2023 21:16:12 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DD9302BC027 for ; Sun, 31 Dec 2023 21:16:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 18A80335D77 for ; Sun, 31 Dec 2023 21:16:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4CFDA13DB for ; Sun, 31 Dec 2023 21:16:09 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1704056862.732a0ce760e29de2207abf428ed0a0982ffdc604.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-misc/kdeconnect/ X-VCS-Repository: proj/kde X-VCS-Files: kde-misc/kdeconnect/kdeconnect-9999.ebuild X-VCS-Directories: kde-misc/kdeconnect/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 732a0ce760e29de2207abf428ed0a0982ffdc604 X-VCS-Branch: master Date: Sun, 31 Dec 2023 21:16:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 679e0704-f57e-4666-acf0-5fac038abe3c X-Archives-Hash: cff0c48cef5cd3aef9480e474faf4d36 commit: 732a0ce760e29de2207abf428ed0a0982ffdc604 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 31 20:29:56 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 31 21:07:42 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=732a0ce7 kde-misc/kdeconnect: Port to KF6, set ECM_HANDBOOK=forceoptional Upstream dependency changes commits: 495e3019e48c5c577c7ffd92554b1ac90b182f20 b8b30ba571d2c155a09bc7d10fb65338e06ecea9 d948d882aa77cfbe9440912fd3972ef6a81be7f5 0baeece353489128e53c51fc3f2de95cdf14b0f0 7c9032c85af8fed4e5cfa688e101b0ed39f37683 Thanks-to: Aidan Harris aidanharr.is> Closes: https://github.com/gentoo/kde/pull/970 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-misc/kdeconnect/kdeconnect-9999.ebuild | 88 ++++++++++++++---------------- 1 file changed, 42 insertions(+), 46 deletions(-) diff --git a/kde-misc/kdeconnect/kdeconnect-9999.ebuild b/kde-misc/kdeconnect/kdeconnect-9999.ebuild index 14e1a7f6aa..ca0253c71e 100644 --- a/kde-misc/kdeconnect/kdeconnect-9999.ebuild +++ b/kde-misc/kdeconnect/kdeconnect-9999.ebuild @@ -3,59 +3,56 @@ EAPI=8 -ECM_HANDBOOK="optional" +ECM_HANDBOOK="forceoptional" ECM_TEST="true" KDE_ORG_NAME="${PN}-kde" KDE_SELINUX_MODULE="${PN}" -KFMIN=5.106.0 -QTMIN=5.15.9 +KFMIN=5.247.0 +QTMIN=6.6.0 inherit ecm gear.kde.org DESCRIPTION="Adds communication between KDE Plasma and your smartphone" HOMEPAGE="https://kdeconnect.kde.org/ https://apps.kde.org/kdeconnect/" LICENSE="GPL-2+" -SLOT="5" +SLOT="6" KEYWORDS="" IUSE="bluetooth pulseaudio telephony X" RESTRICT="test" COMMON_DEPEND=" - >=app-crypt/qca-2.3.0:2[qt5(+),ssl] dev-libs/glib:2 + dev-libs/openssl:= >=dev-libs/wayland-1.15.0 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5= - >=dev-qt/qtmultimedia-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=dev-qt/qtwayland-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kpeople-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=kde-plasma/libplasma-${KFMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtmultimedia-${QTMIN}:6 + >=dev-qt/qtwayland-${QTMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kdnssd-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kpeople-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + sys-apps/dbus x11-libs/libxkbcommon - bluetooth? ( >=dev-qt/qtbluetooth-${QTMIN}:5 ) - pulseaudio? ( media-libs/pulseaudio-qt:= ) - telephony? ( >=kde-frameworks/modemmanager-qt-${KFMIN}:5 ) + bluetooth? ( >=dev-qt/qtconnectivity-${QTMIN}:6[bluetooth] ) + pulseaudio? ( >=media-libs/pulseaudio-qt-1.4:= ) + telephony? ( >=kde-frameworks/modemmanager-qt-${KFMIN}:6 ) X? ( x11-libs/libfakekey x11-libs/libX11 @@ -66,27 +63,26 @@ DEPEND="${COMMON_DEPEND} dev-libs/wayland-protocols " RDEPEND="${COMMON_DEPEND} - dev-libs/kirigami-addons:5 - dev-libs/kpeoplevcard:5 - >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=dev-qt/qtmultimedia-${QTMIN}:5[qml] - >=kde-frameworks/kdeclarative-${KFMIN}:5 + dev-libs/kirigami-addons:6 + >=dev-qt/qt5compat-${QTMIN}:6[qml] + >=dev-qt/qtmultimedia-${QTMIN}:6[qml] + >=kde-frameworks/kdeclarative-${KFMIN}:6 + kde-plasma/libplasma:6 net-fs/sshfs " BDEPEND=" - >=dev-qt/qtwaylandscanner-${QTMIN}:5 + >=dev-qt/qtwayland-${QTMIN}:6 dev-util/wayland-scanner virtual/pkgconfig " -PATCHES=( "${FILESDIR}/${PN}-21.07.80-revert-disable-kpeople.patch" ) - src_configure() { local mycmakeargs=( + -DMDNS_ENABLED=ON -DBLUETOOTH_ENABLED=$(usex bluetooth) - $(cmake_use_find_package pulseaudio KF5PulseAudioQt) - $(cmake_use_find_package telephony KF5ModemManagerQt) - $(cmake_use_find_package X LibFakeKey) + -DWITH_PULSEAUDIO=$(usex pulseaudio) + $(cmake_use_find_package telephony KF6ModemManagerQt) + -DWITH_X11=$(usex X) ) ecm_src_configure }