From d6106fb0c1ab8f79024ab6a9ac2062ddc85d4e07 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 6 Oct 2024 04:27:04 +0100 Subject: gentoo auto-resync : 06:10:2024 - 04:27:04 --- kde-misc/Manifest.gz | Bin 3725 -> 3722 bytes kde-misc/kdeconnect/Manifest | 2 + .../files/kdeconnect-24.08.1-dbus-path.patch | 66 ++++++++++++ kde-misc/kdeconnect/kdeconnect-24.08.1-r1.ebuild | 111 +++++++++++++++++++++ 4 files changed, 179 insertions(+) create mode 100644 kde-misc/kdeconnect/files/kdeconnect-24.08.1-dbus-path.patch create mode 100644 kde-misc/kdeconnect/kdeconnect-24.08.1-r1.ebuild (limited to 'kde-misc') diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz index d6321bc63144..9a6ee390fdf4 100644 Binary files a/kde-misc/Manifest.gz and b/kde-misc/Manifest.gz differ diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest index 4298175cfdef..7c68cffcfc1a 100644 --- a/kde-misc/kdeconnect/Manifest +++ b/kde-misc/kdeconnect/Manifest @@ -1,5 +1,7 @@ +AUX kdeconnect-24.08.1-dbus-path.patch 2404 BLAKE2B e0bae986f6878f733ddcd987e76e762b0c78286a69e3937d56e96f106f92200806a884d09a34873863fb42f24557371ab1346f8432623543c7d5a124df59eece SHA512 6f18fe4849d86a495f078fe43775ab3c3aeabdd29dcebb851347ff5adf7eccc5afd813803a347b3250bbbfd226b58d726b10c2c2ff0ff1f179896830bd38535e DIST kdeconnect-kde-24.05.2.tar.xz 693240 BLAKE2B f42aa3bfc0cfeff2e817c2551581a551c1b406cb755d994f99bc124cfce57bd8222529e43b78e4734abfa057769d02b528f3e489d9dca1c2494a027554fb745f SHA512 2bced3b594fd5b43e0c01acbe8d3ba93e745c759f2d12eebba66854c4e122635a5011d07be820001a676e50bb6e561d16945e04a984abafa30a26d856df53c79 DIST kdeconnect-kde-24.08.1.tar.xz 707056 BLAKE2B 780ad156399840270fc1992e0b9768cc63522fe016a053d814fcc3e2642807f6f1a99812b9fd1536e7b340362bf9e9989c32a2d94f5213b282bd264601a0fef3 SHA512 2e20d2fd8d577aae8c16d7277ad0eeb0aa1d11361f32616af5ca6aaff664ba13da06fe987f5ba1559413b86d789c8824379c97464203238c3092de6bc43bad6d EBUILD kdeconnect-24.05.2.ebuild 2944 BLAKE2B 9999203ea1c5e580fe09f713c8b54cdbb7ab520085114e24016d984cb69da502ac01162e2495c893726a4d95014a2f98fbfe99109981e21a5af3c1f2f73c04c3 SHA512 3bb54946c0cd046a9bb2346a8c7f7129ddd02f8870dbeb41d97761ae9b50b951b168406e0b77112b36daddd87aa222f3e00a85efe42a7267294ee74120315b5f +EBUILD kdeconnect-24.08.1-r1.ebuild 3026 BLAKE2B 3aaa5ddeae0d3fb19ec18512ccdab9c73c09624ab69356085ba0bfdeb4fbf70192452e0a8498ece2a99bed6d4ab9b4e3ef0b3f122d0836bd82d60918b3919fdf SHA512 550682c70f4215c32ea8199c43e356ca91bc920c751f71af6a382137c14244ebaf89973ca64a9d00ace681a0770c8ffda2f21faf47fe19a63147579e762ac004 EBUILD kdeconnect-24.08.1.ebuild 2946 BLAKE2B 8f1ee0ecc208f77854a56baf086947e76e8964c3a39fe6c518d6f12266937738900d258031ea2610c22eda1b9bdd7e3ac927e69ddc8cb72ef7e63c605e882532 SHA512 5ff7e662cffaf1662001c1bff16a5e6d9473098fa06805cfa4c9c1017e29ed446ec41462e8e8589a7f806a0bceaeb4efc86644d140bc0e0e338f847d77a263be MISC metadata.xml 698 BLAKE2B 763372c73042e8ff131825e8b8bcfa5f27599df5a3b69c9acdc7b6f65b6fb3e3f1960d91bda5120f330ed2c28f2d551fb3d2f3df592c2ae0ee0e7b52b8779812 SHA512 577ae940507147dd7bf6732454c30b4ace0e5d9f48555f1c2d3d35d7d94d54233feec0d7ee89c9ca1fd61eeb63b3225d8e7f5a7ec2e8405867d92bcc272d3eb7 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 +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 +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/" +} -- cgit v1.2.3