* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdepim-runtime/, kde-apps/kdepim-runtime/files/
@ 2022-02-19 18:53 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2022-02-19 18:53 UTC (permalink / raw
To: gentoo-commits
commit: 7152515a653ccfb6c88f2dab607521cae31cba09
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 18:49:39 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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 <montel@kde.org>
+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<FreeBusyHandler>(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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdepim-runtime/, kde-apps/kdepim-runtime/files/
@ 2021-12-16 16:59 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2021-12-16 16:59 UTC (permalink / raw
To: gentoo-commits
commit: cecff9745ecabf06913db8b591b2832a856c7401
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 16 15:16:01 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 16 16:59:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cecff974
kde-apps/kdepim-runtime: POP3: Fix SSL connections
See also:
https://mail.kde.org/pipermail/distributions/2021-December/001099.html
https://invent.kde.org/pim/kdepim-runtime/-/merge_requests/63
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=446751
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...-runtime-21.12.0-fix-pop3-ssl-connections.patch | 127 +++++++++++++++++++++
.../kdepim-runtime-21.12.0-r1.ebuild | 88 ++++++++++++++
2 files changed, 215 insertions(+)
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-21.12.0-fix-pop3-ssl-connections.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-21.12.0-fix-pop3-ssl-connections.patch
new file mode 100644
index 000000000000..e911588dbdcb
--- /dev/null
+++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-21.12.0-fix-pop3-ssl-connections.patch
@@ -0,0 +1,127 @@
+From f14fabcefb45790175e209ef8ae394def4a805e9 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Fri, 10 Dec 2021 21:55:13 +0100
+Subject: [PATCH] POP3: Fix SSL connections
+
+We need to go into ssl before trying to read from the socket, otherwise
+nothing works
+
+BUGS: 446751
+---
+ resources/pop3/pop3protocol.cpp | 72 ++++++++++++++++++++-------------
+ resources/pop3/pop3protocol.h | 2 +
+ 2 files changed, 45 insertions(+), 29 deletions(-)
+
+diff --git a/resources/pop3/pop3protocol.cpp b/resources/pop3/pop3protocol.cpp
+index c2d01d33a..15971919e 100644
+--- a/resources/pop3/pop3protocol.cpp
++++ b/resources/pop3/pop3protocol.cpp
+@@ -535,6 +535,39 @@ Result POP3Protocol::loginPASS()
+ return Result::pass();
+ }
+
++Result POP3Protocol::startSsl()
++{
++ mSocket->ignoreSslErrors(); // Don't worry, errors are handled manually below
++ mSocket->startClientEncryption();
++ const bool encryptionStarted = mSocket->waitForEncrypted(s_connectTimeout);
++
++ const QSslCipher cipher = mSocket->sessionCipher();
++ const QList<QSslError> errors = mSocket->sslHandshakeErrors();
++ if (!encryptionStarted || !errors.isEmpty() || !mSocket->isEncrypted() || cipher.isNull() || cipher.usedBits() == 0) {
++ QString errorString = std::accumulate(errors.begin(), errors.end(), QString(), [](QString cur, const QSslError &error) {
++ if (!cur.isEmpty())
++ cur += QLatin1Char('\n');
++ cur += error.errorString();
++ return cur;
++ });
++
++ qCDebug(POP3_LOG) << "Initial SSL handshake failed. cipher.isNull() is" << cipher.isNull() << ", cipher.usedBits() is" << cipher.usedBits()
++ << ", the socket says:" << mSocket->errorString() << "and the SSL errors are:" << errorString;
++ mContinueAfterSslError = false;
++ Q_EMIT sslError(KSslErrorUiData(mSocket));
++ if (!mContinueAfterSslError) {
++ if (errorString.isEmpty())
++ errorString = mSocket->errorString();
++ qCDebug(POP3_LOG) << "TLS setup has failed. Aborting." << errorString;
++ closeConnection();
++ return Result::fail(ERR_SSL_FAILURE, i18n("SSL/TLS error: %1", errorString));
++ }
++ } else {
++ qCDebug(POP3_LOG) << "TLS has been enabled.";
++ }
++ return Result::pass();
++}
++
+ Result POP3Protocol::openConnection()
+ {
+ m_try_apop = mSettings.authenticationMethod() == MailTransport::Transport::EnumAuthenticationType::APOP;
+@@ -560,6 +593,13 @@ Result POP3Protocol::openConnection()
+ return Result::fail(mSocket->error(), errorString);
+ }
+
++ if (mSettings.useSSL()) {
++ const Result res = startSsl();
++ if (!res.success) {
++ return res;
++ }
++ }
++
+ mConnected = true;
+
+ greeting_buf = new char[GREETING_BUF_LEN];
+@@ -608,35 +648,9 @@ Result POP3Protocol::openConnection()
+ "was unsuccessful.\nYou can "
+ "disable TLS in the POP account settings dialog."));
+ }
+- }
+- if (mSettings.useSSL() || mSettings.useTLS()) {
+- mSocket->ignoreSslErrors(); // Don't worry, errors are handled manually below
+- mSocket->startClientEncryption();
+- const bool encryptionStarted = mSocket->waitForEncrypted(s_connectTimeout);
+-
+- const QSslCipher cipher = mSocket->sessionCipher();
+- const QList<QSslError> errors = mSocket->sslHandshakeErrors();
+- if (!encryptionStarted || !errors.isEmpty() || !mSocket->isEncrypted() || cipher.isNull() || cipher.usedBits() == 0) {
+- QString errorString = std::accumulate(errors.begin(), errors.end(), QString(), [](QString cur, const QSslError &error) {
+- if (!cur.isEmpty())
+- cur += QLatin1Char('\n');
+- cur += error.errorString();
+- return cur;
+- });
+-
+- qCDebug(POP3_LOG) << "Initial SSL handshake failed. cipher.isNull() is" << cipher.isNull() << ", cipher.usedBits() is" << cipher.usedBits()
+- << ", the socket says:" << mSocket->errorString() << "and the SSL errors are:" << errorString;
+- mContinueAfterSslError = false;
+- Q_EMIT sslError(KSslErrorUiData(mSocket));
+- if (!mContinueAfterSslError) {
+- if (errorString.isEmpty())
+- errorString = mSocket->errorString();
+- qCDebug(POP3_LOG) << "TLS setup has failed. Aborting." << errorString;
+- closeConnection();
+- return Result::fail(ERR_SSL_FAILURE, i18n("SSL/TLS error: %1", errorString));
+- }
+- } else {
+- qCDebug(POP3_LOG) << "TLS has been enabled.";
++ const Result res = startSsl();
++ if (!res.success) {
++ return res;
+ }
+ }
+
+diff --git a/resources/pop3/pop3protocol.h b/resources/pop3/pop3protocol.h
+index 9b40b334f..d01f7ab7a 100644
+--- a/resources/pop3/pop3protocol.h
++++ b/resources/pop3/pop3protocol.h
+@@ -127,6 +127,8 @@ private:
+ */
+ Q_REQUIRED_RESULT Result loginPASS();
+
++ Q_REQUIRED_RESULT Result startSsl();
++
+ const Settings &mSettings;
+ QSslSocket *const mSocket;
+ unsigned short int m_iPort;
+--
+GitLab
+
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-21.12.0-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-21.12.0-r1.ebuild
new file mode 100644
index 000000000000..a66086cea67a
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-21.12.0-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 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}"/${P}-fix-pop3-ssl-connections.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
+ $(cmake_use_find_package speech Qt5TextToSpeech)
+ )
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdepim-runtime/, kde-apps/kdepim-runtime/files/
@ 2018-11-11 22:10 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-11-11 22:10 UTC (permalink / raw
To: gentoo-commits
commit: 75cbd8e3abe4e81fa1288ef2ecab51a86dfdbb05
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 11 09:49:59 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 11 21:34:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75cbd8e3
kde-apps/kdepim-runtime: Fix GMail resource runtime crash
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=400400
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...epim-runtime-18.08.3-gmail-resource-crash.patch | 25 ++++++
.../kdepim-runtime-18.08.3-r1.ebuild | 91 ++++++++++++++++++++++
2 files changed, 116 insertions(+)
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-18.08.3-gmail-resource-crash.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-18.08.3-gmail-resource-crash.patch
new file mode 100644
index 00000000000..37b67fd180f
--- /dev/null
+++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-18.08.3-gmail-resource-crash.patch
@@ -0,0 +1,25 @@
+From a4316a290e243fd71a565a9b936012d27f116029 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Sun, 28 Oct 2018 20:38:49 +0100
+Subject: Fix crash in failing GMail resource
+
+BUG: 400400
+---
+ resources/imap/gmailpasswordrequester.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/resources/imap/gmailpasswordrequester.h b/resources/imap/gmailpasswordrequester.h
+index b5b8aa8..6f013c9 100644
+--- a/resources/imap/gmailpasswordrequester.h
++++ b/resources/imap/gmailpasswordrequester.h
+@@ -45,7 +45,7 @@ private Q_SLOTS:
+
+ private:
+ ImapResourceBase *mResource = nullptr;
+- KGAPI2::AccountPromise *mPendingPromise = nullptr;
++ QPointer<KGAPI2::AccountPromise> mPendingPromise;
+ };
+
+ #endif
+--
+cgit v0.11.2
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-18.08.3-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-18.08.3-r1.ebuild
new file mode 100644
index 00000000000..87481aeb56d
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-18.08.3-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="speech"
+
+# TODO kolab
+CDEPEND="
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kholidays)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_kdeapps_dep akonadi)
+ $(add_kdeapps_dep akonadi-calendar)
+ $(add_kdeapps_dep akonadi-contacts)
+ $(add_kdeapps_dep akonadi-mime)
+ $(add_kdeapps_dep akonadi-notes)
+ $(add_kdeapps_dep kalarmcal)
+ $(add_kdeapps_dep kcalcore)
+ $(add_kdeapps_dep kcalutils)
+ $(add_kdeapps_dep kcontacts)
+ $(add_kdeapps_dep kdav)
+ $(add_kdeapps_dep kidentitymanagement)
+ $(add_kdeapps_dep kimap)
+ $(add_kdeapps_dep kmailtransport)
+ $(add_kdeapps_dep kmbox)
+ $(add_kdeapps_dep kmime)
+ $(add_kdeapps_dep libkgapi)
+ $(add_kdeapps_dep pimcommon)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtwebengine 'widgets')
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ dev-libs/cyrus-sasl:2
+ dev-libs/libical:=
+ speech? ( $(add_qt_dep qtspeech) )
+"
+DEPEND="${CDEPEND}
+ $(add_qt_dep qtxmlpatterns)
+ dev-libs/libxslt
+ test? ( $(add_kdeapps_dep kimap 'test') )
+"
+RDEPEND="${CDEPEND}
+ !kde-apps/kdepim-l10n
+ !kde-misc/akonadi-ews
+ $(add_frameworks_dep oxygen-icons)
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-gmail-resource-crash.patch" )
+
+src_prepare() {
+ kde5_src_prepare
+ # We don't build kolab, so we can disable this
+ punt_bogus_dep KF5 KDELibs4Support
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package speech Qt5TextToSpeech)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdepim-runtime/, kde-apps/kdepim-runtime/files/
@ 2017-05-26 15:40 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2017-05-26 15:40 UTC (permalink / raw
To: gentoo-commits
commit: 7738f0b375720dd9e0fa71a9a8aa6d0df8501b23
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 15:36:58 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 26 15:36:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7738f0b3
kde-apps/kdepim-runtime: Fix runtime crash when configuring imap resource
Reported-by: Niels Dettenbach <nd <AT> syndicat.com>
Gentoo-bug: 619548
Package-Manager: Portage-2.3.5, Repoman-2.3.1
...depim-runtime-17.04.1-imap-resource-crash.patch | 37 ++++++++++
.../kdepim-runtime-17.04.1-r1.ebuild | 81 ++++++++++++++++++++++
2 files changed, 118 insertions(+)
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-17.04.1-imap-resource-crash.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-17.04.1-imap-resource-crash.patch
new file mode 100644
index 00000000000..6b9eb2266a0
--- /dev/null
+++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-17.04.1-imap-resource-crash.patch
@@ -0,0 +1,37 @@
+From 611510d0a005bc93102aa4b9f1a5b5f9905c4179 Mon Sep 17 00:00:00 2001
+From: Montel Laurent <montel@kde.org>
+Date: Mon, 24 Apr 2017 12:32:36 +0200
+Subject: Fix Bug 379155 - Imap resources crash when trying to open settings
+
+BUG: 379155
+---
+ resources/imap/setupserver.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/resources/imap/setupserver.cpp b/resources/imap/setupserver.cpp
+index afaa678..2912972 100644
+--- a/resources/imap/setupserver.cpp
++++ b/resources/imap/setupserver.cpp
+@@ -597,8 +597,8 @@ void SetupServer::slotComplete()
+
+ void SetupServer::slotSafetyChanged()
+ {
+-#ifdef WITH_GMAIL_XOAUTH2
+ if (m_serverTest == nullptr) {
++#ifdef WITH_GMAIL_XOAUTH2
+ const bool isGmail = Utils::isGmail(m_ui->imapServer->text());
+ qCDebug(IMAPRESOURCE_LOG) << "serverTest null";
+ m_ui->noRadio->setEnabled(!isGmail);
+@@ -606,9 +606,9 @@ void SetupServer::slotSafetyChanged()
+ m_ui->tlsRadio->setEnabled(!isGmail);
+
+ m_ui->authenticationCombo->setEnabled(!isGmail);
++#endif
+ return;
+ }
+-#endif
+ QVector<int> protocols;
+
+ switch (m_ui->safeImapGroup->checkedId()) {
+--
+cgit v0.11.2
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-17.04.1-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-17.04.1-r1.ebuild
new file mode 100644
index 00000000000..0bc02e395f6
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-17.04.1-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="google"
+
+# TODO kolab, Qt5TextToSpeech
+CDEPEND="
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_kdeapps_dep akonadi)
+ $(add_kdeapps_dep akonadi-calendar)
+ $(add_kdeapps_dep akonadi-contacts)
+ $(add_kdeapps_dep akonadi-mime)
+ $(add_kdeapps_dep akonadi-notes)
+ $(add_kdeapps_dep kalarmcal)
+ $(add_kdeapps_dep kcalcore)
+ $(add_kdeapps_dep kcalutils)
+ $(add_kdeapps_dep kcontacts)
+ $(add_kdeapps_dep kdav)
+ $(add_kdeapps_dep kidentitymanagement)
+ $(add_kdeapps_dep kimap)
+ $(add_kdeapps_dep kmailtransport)
+ $(add_kdeapps_dep kmbox)
+ $(add_kdeapps_dep kmime)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtwebengine 'widgets')
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ dev-libs/cyrus-sasl:2
+ dev-libs/libical:=
+ google? ( $(add_kdeapps_dep libkgapi) )
+"
+DEPEND="${CDEPEND}
+ $(add_qt_dep qtxmlpatterns)
+ dev-libs/libxslt
+"
+RDEPEND="${CDEPEND}
+ !kde-apps/kdepim-l10n
+ $(add_frameworks_dep oxygen-icons)
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-imap-resource-crash.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package google KPimGAPI)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-02-19 18:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-19 18:53 [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdepim-runtime/, kde-apps/kdepim-runtime/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-12-16 16:59 Andreas Sturmlechner
2018-11-11 22:10 Andreas Sturmlechner
2017-05-26 15:40 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox