summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-04-30 16:55:14 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-04-30 17:10:04 +0200
commit561b236e2de6fba8273ebcea260c8624014fb381 (patch)
treea3fd070b7b84590723c412011fef54ad680d5e78
parentdev-python/suds: Drop to m-needed (diff)
downloadgentoo-561b236e2de6fba8273ebcea260c8624014fb381.tar.gz
gentoo-561b236e2de6fba8273ebcea260c8624014fb381.tar.bz2
gentoo-561b236e2de6fba8273ebcea260c8624014fb381.zip
kde-apps/ktp-kded-module: Fix timeout caused by misnamed kded module
Closes: https://bugs.gentoo.org/719830 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-apps/ktp-kded-module/files/ktp-kded-module-20.04.0-ktp_integration_module.patch49
-rw-r--r--kde-apps/ktp-kded-module/ktp-kded-module-20.04.0-r1.ebuild45
2 files changed, 94 insertions, 0 deletions
diff --git a/kde-apps/ktp-kded-module/files/ktp-kded-module-20.04.0-ktp_integration_module.patch b/kde-apps/ktp-kded-module/files/ktp-kded-module-20.04.0-ktp_integration_module.patch
new file mode 100644
index 000000000000..f008b02ab8a3
--- /dev/null
+++ b/kde-apps/ktp-kded-module/files/ktp-kded-module-20.04.0-ktp_integration_module.patch
@@ -0,0 +1,49 @@
+From 5b412673cbbd7739b8de8c477e048e7bba85edc1 Mon Sep 17 00:00:00 2001
+From: Serg Truf <strufkin@gmail.com>
+Date: Thu, 30 Apr 2020 16:16:27 +0200
+Subject: rename ktp_integration target so it comply to the name in dbus
+ service file
+
+Summary:
+kded was complaining that it could not find some of the modules
+
+```
+kded5[7242]: kf5.kded: could not find kded module with id "ktp_integration_module"
+```
+
+so let's rename target from ktp_integration to ktp_integration_module so we comply with what configured in service file:
+```
+[D-BUS Service]
+Name=org.freedesktop.Telepathy.Client.KTp.KdedIntegrationModule
+Exec=/usr/bin/dbus-send --session --type=method_call --dest=org.kde.kded5 /kded org.kde.kded5.loadModule string:"ktp_integration_module"
+```
+
+Reviewers: #kde_telepathy, akulichalexandr, nicolasfella
+
+Reviewed By: #kde_telepathy, akulichalexandr
+
+Subscribers: asturmlechner, rdieter, arojas, #kde_telepathy
+
+Tags: #kde_telepathy
+
+Differential Revision: https://phabricator.kde.org/D28604
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3f8130c..66d95bc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -54,7 +54,7 @@ set (kded_ktp_integration_module_SRCS
+ )
+
+ add_library (kded_ktp_integration_module MODULE ${kded_ktp_integration_module_SRCS})
+-set_target_properties (kded_ktp_integration_module PROPERTIES OUTPUT_NAME ktp_integration)
++set_target_properties (kded_ktp_integration_module PROPERTIES OUTPUT_NAME ktp_integration_module)
+ kcoreaddons_desktop_to_json(kded_ktp_integration_module ktp_integration_module.desktop)
+
+ target_link_libraries (kded_ktp_integration_module
+--
+cgit v1.1
+
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-20.04.0-r1.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-20.04.0-r1.ebuild
new file mode 100644
index 000000000000..f8f16590c5db
--- /dev/null
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-20.04.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.69.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Telepathy workspace integration"
+HOMEPAGE="https://community.kde.org/KTp"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND="
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kidletime-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-apps/ktp-common-internals-${PVCUT}:5
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ net-libs/telepathy-qt[qt5(+)]
+"
+DEPEND="${COMMON_DEPEND}
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+ >=kde-apps/signon-kwallet-extension-${PVCUT}:5
+"
+
+PATCHES=( "${WORKDIR}/${P}-ktp_integration_module.patch" )