From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6C0C8138350 for ; Thu, 30 Apr 2020 15:10:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 617D0E097C; Thu, 30 Apr 2020 15:10:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 34764E097C for ; Thu, 30 Apr 2020 15:10:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 732A634EE5F for ; Thu, 30 Apr 2020 15:10:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB6331EB for ; Thu, 30 Apr 2020 15:10:50 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1588259404.561b236e2de6fba8273ebcea260c8624014fb381.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/ktp-kded-module/files/, kde-apps/ktp-kded-module/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/ktp-kded-module/files/ktp-kded-module-20.04.0-ktp_integration_module.patch kde-apps/ktp-kded-module/ktp-kded-module-20.04.0-r1.ebuild X-VCS-Directories: kde-apps/ktp-kded-module/files/ kde-apps/ktp-kded-module/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 561b236e2de6fba8273ebcea260c8624014fb381 X-VCS-Branch: master Date: Thu, 30 Apr 2020 15:10:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cc4d2d60-cfee-4abd-b985-b42c72eac55e X-Archives-Hash: b35fc48c861676e9c2a497137ae43516 commit: 561b236e2de6fba8273ebcea260c8624014fb381 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Apr 30 14:55:14 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 30 15:10:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=561b236e 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 gentoo.org> ...ded-module-20.04.0-ktp_integration_module.patch | 49 ++++++++++++++++++++++ .../ktp-kded-module-20.04.0-r1.ebuild | 45 ++++++++++++++++++++ 2 files changed, 94 insertions(+) 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 00000000000..f008b02ab8a --- /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 +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 00000000000..f8f16590c5d --- /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" )