kde-misc/kdeconnect: fix DBus service file

Closes: https://bugs.gentoo.org/934785
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=489343
Signed-off-by: Sam James <sam@gentoo.org>

2 files changed, 177 insertions, 0 deletions

diff --git a/kde-misc/kdeconnect/files/kdeconnect-24.08.1-dbus-path.patch b/kde-misc/kdeconnect/files/kdeconnect-24.08.1-dbus-path.patch
new file mode 100644
index 000000000000..495668916e71
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-24.08.1-dbus-path.patch
@@ -0,0 +1,66 @@
+https://bugs.gentoo.org/934785
+https://bugs.kde.org/show_bug.cgi?id=489343
+https://invent.kde.org/network/kdeconnect-kde/-/merge_requests/732
+
+From 7274c62c7c6418a88bdb0b5ce558d5fd0e749ec8 Mon Sep 17 00:00:00 2001
+From: Albert Vaca Cintora <albertvaka@gmail.com>
+Date: Thu, 12 Sep 2024 08:03:07 +0000
+Subject: [PATCH 1/2] Revert "Revert "Use absolute path in D-Bus service file""
+
+This reverts commit 01a2db20c49729d70e4bdf800bc7e889d254e36e
+
+(cherry picked from commit 0477bc93d01649ed88fbe6738751b800f11df4b6)
+---
+ daemon/org.kde.kdeconnect.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/daemon/org.kde.kdeconnect.service.in b/daemon/org.kde.kdeconnect.service.in
+index 95d9a1594..4c972e4d6 100644
+--- a/daemon/org.kde.kdeconnect.service.in
++++ b/daemon/org.kde.kdeconnect.service.in
+@@ -1,3 +1,3 @@
+ [D-BUS Service]
+ Name=org.kde.kdeconnect
+-Exec=kdeconnectd
++Exec==@KDE_INSTALL_FULL_BINDIR@/kdeconnectd
+-- 
+GitLab
+
+
+From a7045bfe0d2c6521d5fd2806e076eee3ddb8f863 Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@kde.org>
+Date: Thu, 12 Sep 2024 20:46:35 +0200
+Subject: [PATCH 2/2] Don't set an absolute D-Bus service path on Windows and
+ macOS
+
+(cherry picked from commit f00e04c07d64641e811ba663bd9fa9c51c7b27aa)
+---
+ daemon/CMakeLists.txt                | 3 +++
+ daemon/org.kde.kdeconnect.service.in | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
+index 34fb74e70..5f2d0271e 100644
+--- a/daemon/CMakeLists.txt
++++ b/daemon/CMakeLists.txt
+@@ -20,6 +20,9 @@ ecm_mark_nongui_executable(kdeconnectd)
+ 
+ configure_file(org.kde.kdeconnect.daemon.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.daemon.desktop)
+ 
++if (UNIX AND NOT APPLE)
++    set(kdeconnectd_prefix "${KDE_INSTALL_FULL_BINDIR}/")
++endif()
+ configure_file(org.kde.kdeconnect.service.in ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.service)
+ 
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.daemon.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
+diff --git a/daemon/org.kde.kdeconnect.service.in b/daemon/org.kde.kdeconnect.service.in
+index 4c972e4d6..cb3f5ddbe 100644
+--- a/daemon/org.kde.kdeconnect.service.in
++++ b/daemon/org.kde.kdeconnect.service.in
+@@ -1,3 +1,3 @@
+ [D-BUS Service]
+ Name=org.kde.kdeconnect
+-Exec==@KDE_INSTALL_FULL_BINDIR@/kdeconnectd
++Exec=@kdeconnectd_prefix@kdeconnectd
+-- 
+GitLab
diff --git a/kde-misc/kdeconnect/kdeconnect-24.08.1-r1.ebuild b/kde-misc/kdeconnect/kdeconnect-24.08.1-r1.ebuild
new file mode 100644
index 000000000000..562214c3808e
--- /dev/null
+++ b/kde-misc/kdeconnect/kdeconnect-24.08.1-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KDE_ORG_NAME="${PN}-kde"
+KDE_SELINUX_MODULE="${PN}"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm flag-o-matic 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="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="bluetooth pulseaudio telephony zeroconf X"
+
+RESTRICT="test"
+
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
+# TODO: make conditional on X upstream
+COMMON_DEPEND="
+	dev-libs/openssl:=
+	>=dev-libs/wayland-1.15.0
+	>=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/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/qtconnectivity-${QTMIN}:6[bluetooth] )
+	pulseaudio? ( >=media-libs/pulseaudio-qt-1.4:= )
+	telephony? ( >=kde-frameworks/modemmanager-qt-${KFMIN}:6 )
+	zeroconf? ( >=kde-frameworks/kdnssd-${KFMIN}:6 )
+	X? (
+		x11-libs/libfakekey
+		x11-libs/libX11
+		x11-libs/libXtst
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/wayland-protocols
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-libs/kirigami-addons:6
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+	>=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+	|| (
+		>=dev-qt/qttools-${QTMIN}:6[qdbus]
+		dev-qt/qdbus:*
+	)
+	>=kde-frameworks/kdeclarative-${KFMIN}:6
+	kde-plasma/libplasma:6
+	net-fs/sshfs
+"
+BDEPEND="
+	>=dev-qt/qtwayland-${QTMIN}:6
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/kdeconnect-24.08.1-dbus-path.patch # KDE-bug 489343
+)
+
+src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/921648
+	# https://bugs.kde.org/show_bug.cgi?id=480522
+	filter-lto
+
+	local mycmakeargs=(
+		-DMDNS_ENABLED=$(usex zeroconf)
+		-DBLUETOOTH_ENABLED=$(usex bluetooth)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		$(cmake_use_find_package telephony KF6ModemManagerQt)
+		-DWITH_X11=$(usex X)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	elog "The Android .apk file is available via"
+	elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"
+	elog "or via"
+	elog "https://f-droid.org/packages/org.kde.kdeconnect_tp/"
+}