diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2021-07-16 23:19:17 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-07-17 09:50:53 +0200 |
| commit | 480cbe1f570320084b5032f369d8f77eefa05a55 (patch) | |
| tree | 23d901c105c6b74ed6447be36a73730dcc591fca /kde-misc/kdeconnect | |
| parent | d9516a146d33fbacdbc8d5ff6ca38e4214e52d2c (diff) | |
| download | kde-480cbe1f570320084b5032f369d8f77eefa05a55.tar.gz kde-480cbe1f570320084b5032f369d8f77eefa05a55.tar.bz2 kde-480cbe1f570320084b5032f369d8f77eefa05a55.zip | |
kde-misc/kdeconnect: Revert upstream disabling kpeople
See also: https://mail.kde.org/pipermail/kdeconnect/2021-June/007223.html
We don't have to do that, because we already apply downstream magic
and set -DECM_DISABLE_QMLPLUGINDUMP=ON globally.
See also: https://phabricator.kde.org/D25812
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-misc/kdeconnect')
| -rw-r--r-- | kde-misc/kdeconnect/files/kdeconnect-21.07.80-revert-disable-kpeople.patch | 31 | ||||
| -rw-r--r-- | kde-misc/kdeconnect/kdeconnect-9999.ebuild | 2 |
2 files changed, 33 insertions, 0 deletions
diff --git a/kde-misc/kdeconnect/files/kdeconnect-21.07.80-revert-disable-kpeople.patch b/kde-misc/kdeconnect/files/kdeconnect-21.07.80-revert-disable-kpeople.patch new file mode 100644 index 00000000000..bd7063f93ee --- /dev/null +++ b/kde-misc/kdeconnect/files/kdeconnect-21.07.80-revert-disable-kpeople.patch @@ -0,0 +1,31 @@ +From eab3dd5f39b7633a3bc074713da69c53f123345d Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Fri, 16 Jul 2021 23:15:26 +0200 +Subject: [PATCH] Revert "Disable kpeople qml module finding" + +This reverts commit 89f52af4389e9e98f7428db670355d144b6045a2. + +We don't have to do that, because we already apply downstream magic +and set -DECM_DISABLE_QMLPLUGINDUMP=ON globally. + +See also: https://phabricator.kde.org/D25812 +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 44af637f..b2027e92 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -84,7 +84,7 @@ else() + + add_definitions(-DHAVE_KIO) + +- #ecm_find_qmlmodule(org.kde.people 1.0) FIXME This results in KPeople code being called which triggers DBus calls which breaks the Windows CI ++ ecm_find_qmlmodule(org.kde.people 1.0) + ecm_find_qmlmodule(QtQuick.Particles 2.0) + + endif() +-- +2.32.0 + diff --git a/kde-misc/kdeconnect/kdeconnect-9999.ebuild b/kde-misc/kdeconnect/kdeconnect-9999.ebuild index 8827618b1c6..f09475e72d4 100644 --- a/kde-misc/kdeconnect/kdeconnect-9999.ebuild +++ b/kde-misc/kdeconnect/kdeconnect-9999.ebuild @@ -66,6 +66,8 @@ RDEPEND="${DEPEND} net-fs/sshfs " +PATCHES=( "${FILESDIR}/${PN}-21.07.80-revert-disable-kpeople.patch" ) + src_configure() { local mycmakeargs=( -DBLUETOOTH_ENABLED=$(usex bluetooth) |