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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7462515808B for ; Sat, 19 Feb 2022 18:53:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6615E07DB; Sat, 19 Feb 2022 18:53:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 72FEAE07DB for ; Sat, 19 Feb 2022 18:53:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4710F343966 for ; Sat, 19 Feb 2022 18:53:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87DE7250 for ; Sat, 19 Feb 2022 18:53:06 +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: <1645296579.7152515a653ccfb6c88f2dab607521cae31cba09.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdepim-runtime/, kde-apps/kdepim-runtime/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-disable-google-sync-contacts.patch kde-apps/kdepim-runtime/kdepim-runtime-21.08.3-r2.ebuild kde-apps/kdepim-runtime/kdepim-runtime-21.12.2-r1.ebuild X-VCS-Directories: kde-apps/kdepim-runtime/ kde-apps/kdepim-runtime/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7152515a653ccfb6c88f2dab607521cae31cba09 X-VCS-Branch: master Date: Sat, 19 Feb 2022 18:53:06 +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: 5541e69e-525a-4d88-8c3f-9856cfb7d858 X-Archives-Hash: f3755b5ecbb582976b02bd984c523a0b commit: 7152515a653ccfb6c88f2dab607521cae31cba09 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 19 18:49:39 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 19 18:49:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7152515a kde-apps/kdepim-runtime: Disable google address book resource See also: https://mail.kde.org/pipermail/distributions/2022-February/001147.html KDE-bug: https://bugs.kde.org/show_bug.cgi?id=449024 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> ...time-21.08.3-disable-google-sync-contacts.patch | 27 +++++++ .../kdepim-runtime-21.08.3-r2.ebuild | 93 ++++++++++++++++++++++ .../kdepim-runtime-21.12.2-r1.ebuild | 90 +++++++++++++++++++++ 3 files changed, 210 insertions(+) diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-disable-google-sync-contacts.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-disable-google-sync-contacts.patch new file mode 100644 index 000000000000..7270d6e42aaf --- /dev/null +++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-disable-google-sync-contacts.patch @@ -0,0 +1,27 @@ +From 624ef213e50ae4712bfe2a254c5f444caaacfa22 Mon Sep 17 00:00:00 2001 +From: Laurent Montel +Date: Mon, 7 Feb 2022 06:58:43 +0100 +Subject: [PATCH] Apply patch for disable sync contact as it don't ported yet. + +BUG:449024 +--- + resources/google-groupware/googleresource.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/resources/google-groupware/googleresource.cpp b/resources/google-groupware/googleresource.cpp +index 62b08fab0..a0d74e738 100644 +--- a/resources/google-groupware/googleresource.cpp ++++ b/resources/google-groupware/googleresource.cpp +@@ -104,7 +104,9 @@ GoogleResource::GoogleResource(const QString &id) + m_freeBusyHandler = std::make_unique(m_iface, m_settings); + m_handlers.clear(); + m_handlers.push_back(GenericHandler::Ptr(new CalendarHandler(m_iface, m_settings))); ++#ifdef DISABLE_UNTIL_LIBKGAPI_PORTED + m_handlers.push_back(GenericHandler::Ptr(new ContactHandler(m_iface, m_settings))); ++#endif + m_handlers.push_back(GenericHandler::Ptr(new TaskHandler(m_iface, m_settings))); + + new SettingsAdaptor(m_settings); +-- +GitLab + diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-21.08.3-r2.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-21.08.3-r2.ebuild new file mode 100644 index 000000000000..8c5ff5754427 --- /dev/null +++ b/kde-apps/kdepim-runtime/kdepim-runtime-21.08.3-r2.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="forceoptional" +PVCUT=$(ver_cut 1-3) +KFMIN=5.84.0 +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM" +HOMEPAGE="https://apps.kde.org/kontact/" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="" + +RESTRICT="test" + +# TODO kolab +RDEPEND=" + >=app-crypt/qca-2.3.0:2 + dev-libs/cyrus-sasl:2 + dev-libs/libical:= + dev-libs/qtkeychain:= + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtnetworkauth-${QTMIN}:5 + >=dev-qt/qtspeech-${QTMIN}:5 + >=dev-qt/qtwebengine-${QTMIN}:5[widgets] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-apps/akonadi-${PVCUT}:5 + >=kde-apps/akonadi-calendar-${PVCUT}:5 + >=kde-apps/akonadi-contacts-${PVCUT}:5 + >=kde-apps/akonadi-mime-${PVCUT}:5 + >=kde-apps/akonadi-notes-${PVCUT}:5 + >=kde-apps/grantleetheme-${PVCUT}:5 + >=kde-apps/kalarmcal-${PVCUT}:5 + >=kde-apps/kcalutils-${PVCUT}:5 + >=kde-apps/kidentitymanagement-${PVCUT}:5 + >=kde-apps/kimap-${PVCUT}:5 + >=kde-apps/kldap-${PVCUT}:5 + >=kde-apps/kmailtransport-${PVCUT}:5 + >=kde-apps/kmbox-${PVCUT}:5 + >=kde-apps/kmime-${PVCUT}:5 + >=kde-apps/libkdepim-${PVCUT}:5 + >=kde-apps/libkgapi-${PVCUT}:5 + >=kde-apps/pimcommon-${PVCUT}:5 + >=kde-frameworks/kcalendarcore-${KFMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kcodecs-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcontacts-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdav-${KFMIN}:5 + >=kde-frameworks/kholidays-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 +" +DEPEND="${RDEPEND} + >=dev-qt/qtxmlpatterns-${QTMIN}:5 + test? ( >=kde-apps/kimap-${PVCUT}:5[test] ) +" +BDEPEND="dev-libs/libxslt" + +PATCHES=( + "${FILESDIR}"/${P}-CVE-2020-15954.patch # bug 734126 + "${FILESDIR}"/${P}-disable-google-sync-contacts.patch +) + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON + ) + ecm_src_configure +} diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-21.12.2-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-21.12.2-r1.ebuild new file mode 100644 index 000000000000..935ec9a7e3f1 --- /dev/null +++ b/kde-apps/kdepim-runtime/kdepim-runtime-21.12.2-r1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="forceoptional" +PVCUT=$(ver_cut 1-3) +KFMIN=5.88.0 +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM" +HOMEPAGE="https://apps.kde.org/kontact/" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="speech" + +RESTRICT="test" + +# TODO kolab +RDEPEND=" + >=app-crypt/qca-2.3.0:2 + dev-libs/cyrus-sasl:2 + dev-libs/libical:= + dev-libs/qtkeychain:= + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtnetworkauth-${QTMIN}:5 + >=dev-qt/qtwebengine-${QTMIN}:5[widgets] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-apps/akonadi-${PVCUT}:5 + >=kde-apps/akonadi-calendar-${PVCUT}:5 + >=kde-apps/akonadi-contacts-${PVCUT}:5 + >=kde-apps/akonadi-mime-${PVCUT}:5 + >=kde-apps/akonadi-notes-${PVCUT}:5 + >=kde-apps/kalarmcal-${PVCUT}:5 + >=kde-apps/kcalutils-${PVCUT}:5 + >=kde-apps/kidentitymanagement-${PVCUT}:5 + >=kde-apps/kimap-${PVCUT}:5 + >=kde-apps/kldap-${PVCUT}:5 + >=kde-apps/kmailtransport-${PVCUT}:5 + >=kde-apps/kmbox-${PVCUT}:5 + >=kde-apps/kmime-${PVCUT}:5 + >=kde-apps/libkdepim-${PVCUT}:5 + >=kde-apps/libkgapi-${PVCUT}:5 + >=kde-frameworks/kcalendarcore-${KFMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kcodecs-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcontacts-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdav-${KFMIN}:5 + >=kde-frameworks/kholidays-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + speech? ( >=dev-qt/qtspeech-${QTMIN}:5 ) +" +DEPEND="${RDEPEND} + >=dev-qt/qtxmlpatterns-${QTMIN}:5 + test? ( >=kde-apps/kimap-${PVCUT}:5[test] ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-21.08.3-disable-google-sync-contacts.patch # KDE-bug 449024 +) + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON + $(cmake_use_find_package speech Qt5TextToSpeech) + ) + ecm_src_configure +}