1 |
commit: 561b236e2de6fba8273ebcea260c8624014fb381 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 30 14:55:14 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 30 15:10:04 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=561b236e |
7 |
|
8 |
kde-apps/ktp-kded-module: Fix timeout caused by misnamed kded module |
9 |
|
10 |
Closes: https://bugs.gentoo.org/719830 |
11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
...ded-module-20.04.0-ktp_integration_module.patch | 49 ++++++++++++++++++++++ |
15 |
.../ktp-kded-module-20.04.0-r1.ebuild | 45 ++++++++++++++++++++ |
16 |
2 files changed, 94 insertions(+) |
17 |
|
18 |
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 |
19 |
new file mode 100644 |
20 |
index 00000000000..f008b02ab8a |
21 |
--- /dev/null |
22 |
+++ b/kde-apps/ktp-kded-module/files/ktp-kded-module-20.04.0-ktp_integration_module.patch |
23 |
@@ -0,0 +1,49 @@ |
24 |
+From 5b412673cbbd7739b8de8c477e048e7bba85edc1 Mon Sep 17 00:00:00 2001 |
25 |
+From: Serg Truf <strufkin@×××××.com> |
26 |
+Date: Thu, 30 Apr 2020 16:16:27 +0200 |
27 |
+Subject: rename ktp_integration target so it comply to the name in dbus |
28 |
+ service file |
29 |
+ |
30 |
+Summary: |
31 |
+kded was complaining that it could not find some of the modules |
32 |
+ |
33 |
+``` |
34 |
+kded5[7242]: kf5.kded: could not find kded module with id "ktp_integration_module" |
35 |
+``` |
36 |
+ |
37 |
+so let's rename target from ktp_integration to ktp_integration_module so we comply with what configured in service file: |
38 |
+``` |
39 |
+[D-BUS Service] |
40 |
+Name=org.freedesktop.Telepathy.Client.KTp.KdedIntegrationModule |
41 |
+Exec=/usr/bin/dbus-send --session --type=method_call --dest=org.kde.kded5 /kded org.kde.kded5.loadModule string:"ktp_integration_module" |
42 |
+``` |
43 |
+ |
44 |
+Reviewers: #kde_telepathy, akulichalexandr, nicolasfella |
45 |
+ |
46 |
+Reviewed By: #kde_telepathy, akulichalexandr |
47 |
+ |
48 |
+Subscribers: asturmlechner, rdieter, arojas, #kde_telepathy |
49 |
+ |
50 |
+Tags: #kde_telepathy |
51 |
+ |
52 |
+Differential Revision: https://phabricator.kde.org/D28604 |
53 |
+--- |
54 |
+ CMakeLists.txt | 2 +- |
55 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
56 |
+ |
57 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
58 |
+index 3f8130c..66d95bc 100644 |
59 |
+--- a/CMakeLists.txt |
60 |
++++ b/CMakeLists.txt |
61 |
+@@ -54,7 +54,7 @@ set (kded_ktp_integration_module_SRCS |
62 |
+ ) |
63 |
+ |
64 |
+ add_library (kded_ktp_integration_module MODULE ${kded_ktp_integration_module_SRCS}) |
65 |
+-set_target_properties (kded_ktp_integration_module PROPERTIES OUTPUT_NAME ktp_integration) |
66 |
++set_target_properties (kded_ktp_integration_module PROPERTIES OUTPUT_NAME ktp_integration_module) |
67 |
+ kcoreaddons_desktop_to_json(kded_ktp_integration_module ktp_integration_module.desktop) |
68 |
+ |
69 |
+ target_link_libraries (kded_ktp_integration_module |
70 |
+-- |
71 |
+cgit v1.1 |
72 |
+ |
73 |
|
74 |
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 |
75 |
new file mode 100644 |
76 |
index 00000000000..f8f16590c5d |
77 |
--- /dev/null |
78 |
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-20.04.0-r1.ebuild |
79 |
@@ -0,0 +1,45 @@ |
80 |
+# Copyright 1999-2020 Gentoo Authors |
81 |
+# Distributed under the terms of the GNU General Public License v2 |
82 |
+ |
83 |
+EAPI=7 |
84 |
+ |
85 |
+PVCUT=$(ver_cut 1-3) |
86 |
+KFMIN=5.69.0 |
87 |
+QTMIN=5.12.3 |
88 |
+inherit ecm kde.org |
89 |
+ |
90 |
+DESCRIPTION="KDE Telepathy workspace integration" |
91 |
+HOMEPAGE="https://community.kde.org/KTp" |
92 |
+ |
93 |
+LICENSE="LGPL-2.1" |
94 |
+SLOT="5" |
95 |
+KEYWORDS="~amd64" |
96 |
+IUSE="" |
97 |
+ |
98 |
+COMMON_DEPEND=" |
99 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
100 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
101 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
102 |
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5 |
103 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
104 |
+ >=kde-frameworks/kidletime-${KFMIN}:5 |
105 |
+ >=kde-frameworks/kio-${KFMIN}:5 |
106 |
+ >=kde-frameworks/knotifications-${KFMIN}:5 |
107 |
+ >=kde-apps/ktp-common-internals-${PVCUT}:5 |
108 |
+ >=dev-qt/qtconcurrent-${QTMIN}:5 |
109 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
110 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
111 |
+ >=dev-qt/qtnetwork-${QTMIN}:5 |
112 |
+ >=dev-qt/qtsql-${QTMIN}:5 |
113 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
114 |
+ net-libs/telepathy-qt[qt5(+)] |
115 |
+" |
116 |
+DEPEND="${COMMON_DEPEND} |
117 |
+ >=kde-frameworks/kcmutils-${KFMIN}:5 |
118 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
119 |
+" |
120 |
+RDEPEND="${COMMON_DEPEND} |
121 |
+ >=kde-apps/signon-kwallet-extension-${PVCUT}:5 |
122 |
+" |
123 |
+ |
124 |
+PATCHES=( "${WORKDIR}/${P}-ktp_integration_module.patch" ) |