* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdepim-runtime/files/, kde-apps/kdepim-runtime/
@ 2016-12-19 20:08 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2016-12-19 20:08 UTC (permalink / raw
To: gentoo-commits
commit: 5a888b5e522df982902580c5cbb9c5c0075ee3cb
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 20:00:05 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 20:08:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a888b5e
kde-apps/kdepim-runtime: Fix ical data loss
Revision bump adds upstream patch reported on release mailing list.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../kdepim-runtime-16.12.0-ical-data-loss.patch | 33 ++++++++
.../kdepim-runtime-16.12.0-r1.ebuild | 87 ++++++++++++++++++++++
2 files changed, 120 insertions(+)
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-16.12.0-ical-data-loss.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-16.12.0-ical-data-loss.patch
new file mode 100644
index 00000000..182b8f2
--- /dev/null
+++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-16.12.0-ical-data-loss.patch
@@ -0,0 +1,33 @@
+commit 8ae09b6f4afa8ceb2770da67b6dc79c78b86af47
+Author: David Faure <faure@kde.org>
+Date: Mon Dec 19 13:29:30 2016 +0100
+
+ Fix DATA LOSS bug in ical resource which failed to create std.ics if it didn't exist.
+
+ The default setup sets the Path to be a local path, not a URL.
+ => Use QUrl::fromUserInput so that it can deal with both cases, paths and URLs.
+
+ CCMAIL: smartins@kde.org, release-team@kde.org
+
+diff --git a/resources/shared/singlefileresource/singlefileresource.h b/resources/shared/singlefileresource/singlefileresource.h
+index f3c19aaf5..3f4149903 100644
+--- a/resources/shared/singlefileresource/singlefileresource.h
++++ b/resources/shared/singlefileresource/singlefileresource.h
+@@ -55,7 +55,7 @@ public:
+ , mSettings(new Settings(config()))
+ {
+ // The resource needs network when the path refers to a non local file.
+- setNeedsNetwork(!QUrl(mSettings->path()).isLocalFile());
++ setNeedsNetwork(!QUrl::fromUserInput(mSettings->path()).isLocalFile());
+ }
+ ~SingleFileResource()
+ {
+@@ -82,7 +82,7 @@ public:
+ return;
+ }
+
+- mCurrentUrl = QUrl(mSettings->path()); // path already has scheme
++ mCurrentUrl = QUrl::fromUserInput(mSettings->path()); // the string contains the scheme if remote, doesn't if local path
+ if (mCurrentHash.isEmpty())
+ {
+ // First call to readFile() lets see if there is a hash stored in a
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-16.12.0-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-16.12.0-r1.ebuild
new file mode 100644
index 00000000..797a075
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-16.12.0-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ssl"
+
+# TODO kolab, Qt5TextToSpeech
+
+CDEPEND="
+ $(add_frameworks_dep kcmutils)
+ $(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 kitemviews)
+ $(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 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 qtwidgets)
+ $(add_qt_dep qtxml)
+ $(add_qt_dep qtxmlpatterns)
+ dev-libs/libical:=
+ google? ( >=net-libs/libkgapi-5.1.0:5 )
+ ssl? ( dev-libs/cyrus-sasl )
+"
+DEPEND="${CDEPEND}
+ $(add_frameworks_dep kross)
+ dev-libs/cyrus-sasl:2
+ dev-libs/libxslt
+ x11-misc/shared-mime-info
+"
+RDEPEND="${CDEPEND}
+ !kde-apps/kdepim-kioslaves
+ $(add_frameworks_dep oxygen-icons)
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-ical-data-loss.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package google KF5GAPI)
+ $(cmake-utils_use_find_package ssl Sasl2)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdepim-runtime/files/, kde-apps/kdepim-runtime/
@ 2017-03-25 1:13 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2017-03-25 1:13 UTC (permalink / raw
To: gentoo-commits
commit: 5fd133dd5b792bfb732bec9f3e2f83208689360c
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 01:12:38 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 01:12:54 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fd133dd
kde-apps/kdepim-runtime: backport patch from upstream solving build failure
Gentoo-bug: 613394
Package-Manager: Portage-2.3.5, Repoman-2.3.2
.../files/kdepim-runtime-16.12.3-include.patch | 24 ++++++++++++++++++++++
.../kdepim-runtime-16.12.3-r1.ebuild | 2 ++
2 files changed, 26 insertions(+)
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-16.12.3-include.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-16.12.3-include.patch
new file mode 100644
index 00000000000..abde97f9f61
--- /dev/null
+++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-16.12.3-include.patch
@@ -0,0 +1,24 @@
+From bccc569b2c049e6eb1c43b45ba0e25bb39868913 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <sknauss@kde.org>
+Date: Wed, 25 Jan 2017 23:35:22 +0100
+Subject: [PATCH] import QImage directly instead of usage via KContacts
+
+---
+ resources/openxchange/oxa/contactutils.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/resources/openxchange/oxa/contactutils.cpp b/resources/openxchange/oxa/contactutils.cpp
+index dea8188..06bb34b 100644
+--- a/resources/openxchange/oxa/contactutils.cpp
++++ b/resources/openxchange/oxa/contactutils.cpp
+@@ -28,6 +28,7 @@
+ #include <Akonadi/Contact/ContactGroupExpandJob>
+
+ #include <QtCore/QBuffer>
++#include <QtGui/QImage>
+ #include <QtXml/QDomElement>
+
+ using namespace OXA;
+--
+2.10.2
+
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-16.12.3-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-16.12.3-r1.ebuild
index ea9c898e7f3..38c169b9c9b 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-16.12.3-r1.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-16.12.3-r1.ebuild
@@ -72,6 +72,8 @@ RDEPEND="${CDEPEND}
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${P}-include.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package google KF5GAPI)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdepim-runtime/files/, kde-apps/kdepim-runtime/
@ 2017-04-22 14:32 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2017-04-22 14:32 UTC (permalink / raw
To: gentoo-commits
commit: aafd9a4d3575a6d8fb4c3f0c527b57524b7571cf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 12:08:35 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 14:32:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aafd9a4d
kde-apps/kdepim-runtime: Add upstream fix for gmail accounts migration
See also:
https://mail.kde.org/pipermail/release-team/2017-April/010257.html
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../kdepim-runtime-17.04.0-gmail-migration.patch | 52 ++++++++++++++
.../kdepim-runtime-17.04.0-r1.ebuild | 81 ++++++++++++++++++++++
2 files changed, 133 insertions(+)
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-17.04.0-gmail-migration.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-17.04.0-gmail-migration.patch
new file mode 100644
index 00000000000..5ea301ccec8
--- /dev/null
+++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-17.04.0-gmail-migration.patch
@@ -0,0 +1,52 @@
+From c9ae16363e68d6958db0cd835cb0180b340594b5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
+Date: Sat, 22 Apr 2017 13:31:42 +0200
+Subject: [IMAP] Fix migration to new Gmail authentication
+
+Currently the settings would be migrated only if user opened the
+Settings dialog. The GmailPasswordRequester expects that the server
+settings is migrated correctly and always tries to authenticate via
+XOAUTH2, even if the configuration says "PLAIN" or other mechanism.
+This breaks login as we try to send XOAUTH2 tokens as PLAIN credentials.
+
+This change ensures that the encryption and auth mechanism settings
+is correctly migrated on resource startup.
+
+CCBUG: 378857
+CCBUG: 378876
+---
+ resources/imap/settings.cpp | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/resources/imap/settings.cpp b/resources/imap/settings.cpp
+index 53296b8..6a599ea 100644
+--- a/resources/imap/settings.cpp
++++ b/resources/imap/settings.cpp
+@@ -23,6 +23,7 @@
+
+ #include "imapaccount.h"
+ #include "utils.h"
++#include "config.h"
+
+ #include <kwallet.h>
+ using KWallet::Wallet;
+@@ -78,6 +79,17 @@ Settings::Settings(WId winId) : SettingsBase(), m_winId(winId)
+ {
+ load();
+
++#ifdef WITH_GMAIL_XOAUTH2
++ // Make sure that Gmail configuration is correctly migrated even if the user
++ // did not open the configuration dialog
++ if (Utils::isGmail(imapServer())) {
++ setImapPort(993);
++ setSafety(QStringLiteral("SSL"));
++ setAuthentication(MailTransport::Transport::EnumAuthenticationType::XOAUTH2);
++ save();
++ }
++#endif
++
+ new SettingsAdaptor(this);
+ QDBusConnection::sessionBus().registerObject(QStringLiteral("/Settings"), this, QDBusConnection::ExportAdaptors | QDBusConnection::ExportScriptableContents);
+ }
+--
+cgit v0.11.2
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-17.04.0-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-17.04.0-r1.ebuild
new file mode 100644
index 00000000000..e8bd49c7047
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-17.04.0-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-kioslaves
+ $(add_frameworks_dep oxygen-icons)
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-gmail-migration.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package google KPimGAPI)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdepim-runtime/files/, kde-apps/kdepim-runtime/
@ 2019-08-14 8:47 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-08-14 8:47 UTC (permalink / raw
To: gentoo-commits
commit: f23e06f706f5af1a23a0616588bda96e005f6dc0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 08:45:38 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 08:47:09 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f23e06f7
kde-apps/kdepim-runtime: Add another upstream race condition fix
It still may not be enough, but let's add it anyway.
Bug: https://bugs.gentoo.org/691938
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...me-19.04.3-ui_lockfilepage-race-condition.patch | 27 ++++++++++++++++++++++
.../kdepim-runtime/kdepim-runtime-19.04.3.ebuild | 2 ++
2 files changed, 29 insertions(+)
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_lockfilepage-race-condition.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_lockfilepage-race-condition.patch
new file mode 100644
index 00000000000..850c65862be
--- /dev/null
+++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_lockfilepage-race-condition.patch
@@ -0,0 +1,27 @@
+From 4585292dd34f894505f8fc19e2bf51263768d688 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Fri, 9 Aug 2019 12:54:01 +0200
+Subject: Fix another race condition found while packaging the 19.08.0 release
+
+BUG: 410474
+FIXED-IN: 19.08.0
+
+CCMAIL: cfeck@kde.org
+---
+ resources/mbox/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/resources/mbox/CMakeLists.txt b/resources/mbox/CMakeLists.txt
+index c6fa693..c52230f 100644
+--- a/resources/mbox/CMakeLists.txt
++++ b/resources/mbox/CMakeLists.txt
+@@ -17,6 +17,7 @@ set( mboxresource_SRCS
+ # Fix a race condition. mboxresource.cpp needs compactpage.h which includes ui_compactpage.h.
+ # Make sure the ui file is generated before building the akonadi_mbox_resource target.
+ set_source_files_properties(mboxresource.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ui_compactpage.h)
++set_source_files_properties(mboxresource.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ui_lockfilepage.h)
+
+ ecm_qt_declare_logging_category(mboxresource_SRCS HEADER mboxresource_debug.h IDENTIFIER MBOXRESOURCE_LOG CATEGORY_NAME org.kde.pim.mboxresource)
+
+--
+cgit v1.1
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild
index 5b9598cec0a..a187fe09102 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild
@@ -74,6 +74,8 @@ RDEPEND="${COMMON_DEPEND}
!kde-misc/akonadi-ews
"
+PATCHES=( "${FILESDIR}/${P}-ui_lockfilepage-race-condition.patch" )
+
RESTRICT+=" test"
src_prepare() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdepim-runtime/files/, kde-apps/kdepim-runtime/
@ 2019-10-03 17:42 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-10-03 17:42 UTC (permalink / raw
To: gentoo-commits
commit: f06daf5beb7b4f48d875ea818ba29d5ad385767c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 3 12:35:58 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 3 17:42:23 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f06daf5b
kde-apps/kdepim-runtime: Add another upstream race condition fix
Tested-by: Rutger van Bergen <rbergen <AT> xs4all.nl>
Closes: https://bugs.gentoo.org/691938
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ime-19.04.3-ui_compactpage-race-condition.patch | 50 ++++++++++++++++++++++
.../kdepim-runtime/kdepim-runtime-19.04.3.ebuild | 5 ++-
.../kdepim-runtime/kdepim-runtime-19.08.1.ebuild | 2 +
3 files changed, 56 insertions(+), 1 deletion(-)
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_compactpage-race-condition.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_compactpage-race-condition.patch
new file mode 100644
index 00000000000..cfee2009495
--- /dev/null
+++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_compactpage-race-condition.patch
@@ -0,0 +1,50 @@
+From 8ec4db907c403b24685a961b48be5f8a288d9bd9 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Wed, 2 Oct 2019 11:26:29 +0200
+Subject: Fix the dependencies on generated files differently.
+
+Some Gentoo users were still having build issues with the mbox resource.
+
+BUG: 410474
+FIXED-IN: 19.08.1
+---
+ resources/mbox/CMakeLists.txt | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/resources/mbox/CMakeLists.txt b/resources/mbox/CMakeLists.txt
+index c52230f..ca8bc1e 100644
+--- a/resources/mbox/CMakeLists.txt
++++ b/resources/mbox/CMakeLists.txt
+@@ -14,10 +14,18 @@ set( mboxresource_SRCS
+ ${mboxresource_common_SRCS}
+ )
+
+-# Fix a race condition. mboxresource.cpp needs compactpage.h which includes ui_compactpage.h.
+-# Make sure the ui file is generated before building the akonadi_mbox_resource target.
+-set_source_files_properties(mboxresource.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ui_compactpage.h)
+-set_source_files_properties(mboxresource.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ui_lockfilepage.h)
++# mboxresource.cpp needs UI files generated for another target. We must be sure the files
++# were created before building the akonadi_mbox_resource target.
++add_custom_target(generated_headers
++ DEPENDS
++ ${CMAKE_CURRENT_BINARY_DIR}/ui_compactpage.h
++ ${CMAKE_CURRENT_BINARY_DIR}/ui_lockfilepage.h
++)
++set_source_files_properties(
++ ${CMAKE_CURRENT_BINARY_DIR}/ui_compactpage.h
++ ${CMAKE_CURRENT_BINARY_DIR}/ui_lockfilepage.h
++ PROPERTIES GENERATED TRUE
++)
+
+ ecm_qt_declare_logging_category(mboxresource_SRCS HEADER mboxresource_debug.h IDENTIFIER MBOXRESOURCE_LOG CATEGORY_NAME org.kde.pim.mboxresource)
+
+@@ -29,6 +37,7 @@ qt5_add_dbus_adaptor(mboxresource_SRCS
+ )
+
+ add_executable(akonadi_mbox_resource ${mboxresource_SRCS})
++add_dependencies(akonadi_mbox_resource generated_headers)
+
+ if( APPLE )
+ set_target_properties(akonadi_mbox_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
+--
+cgit v1.1
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild
index a187fe09102..418ba920270 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild
@@ -74,7 +74,10 @@ RDEPEND="${COMMON_DEPEND}
!kde-misc/akonadi-ews
"
-PATCHES=( "${FILESDIR}/${P}-ui_lockfilepage-race-condition.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-ui_lockfilepage-race-condition.patch"
+ "${FILESDIR}/${P}-ui_compactpage-race-condition.patch"
+)
RESTRICT+=" test"
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.08.1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-19.08.1.ebuild
index 1afb7ce36c0..88e85dc3bb7 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-19.08.1.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-19.08.1.ebuild
@@ -74,6 +74,8 @@ RDEPEND="${COMMON_DEPEND}
!kde-misc/akonadi-ews
"
+PATCHES=( "${FILESDIR}/${PN}-19.04.3-ui_compactpage-race-condition.patch" ) # bug #691938
+
RESTRICT+=" test"
src_prepare() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdepim-runtime/files/, kde-apps/kdepim-runtime/
@ 2020-08-01 22:57 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-08-01 22:57 UTC (permalink / raw
To: gentoo-commits
commit: b890132492bdf7f2a8de0156c370574a4ab5f13a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 1 15:46:33 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 1 22:57:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8901324
kde-apps/kdepim-runtime: Fix CVE-2020-15954
Bug: https://bugs.gentoo.org/734126
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kdepim-runtime-20.04.3-CVE-2020-15954.patch | 28 +++++++
.../kdepim-runtime-20.04.3-r1.ebuild | 91 ++++++++++++++++++++++
2 files changed, 119 insertions(+)
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-20.04.3-CVE-2020-15954.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-20.04.3-CVE-2020-15954.patch
new file mode 100644
index 00000000000..92fec0bbcfc
--- /dev/null
+++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-20.04.3-CVE-2020-15954.patch
@@ -0,0 +1,28 @@
+From bd64ab29116aa7318fdee7f95878ff97580162f2 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Tue, 28 Jul 2020 13:35:24 +0200
+Subject: [PATCH] Fix Bug 423426 - POP3 setup wizard defaults to unencrypted
+ connections
+
+Make sure to use TLS when we create it
+CCBUG: 423426
+---
+ resources/pop3/wizard/pop3wizard.es | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/resources/pop3/wizard/pop3wizard.es b/resources/pop3/wizard/pop3wizard.es
+index 81d511d0a..aa83d0abf 100644
+--- a/resources/pop3/wizard/pop3wizard.es
++++ b/resources/pop3/wizard/pop3wizard.es
+@@ -53,7 +53,7 @@ function setup()
+ var smtp = SetupManager.createTransport( "smtp" );
+ smtp.setName( SetupManager.name() );
+ smtp.setHost( page.widget().outgoingAddress.text.trim() );
+- smtp.setEncryption( "NONE" );
++ smtp.setEncryption( "SSL" );
+
+ SetupManager.execute();
+ }
+--
+GitLab
+
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-20.04.3-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-20.04.3-r1.ebuild
new file mode 100644
index 00000000000..5284241615d
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-20.04.3-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.70.0
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
+HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# TODO kolab
+BDEPEND="
+ dev-libs/libxslt
+"
+RDEPEND="
+ >=app-crypt/qca-2.3.0:2
+ dev-libs/cyrus-sasl:2
+ dev-libs/libical:=
+ >=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/kalarmcal-${PVCUT}:5
+ >=kde-apps/kcalutils-${PVCUT}:5
+ || (
+ >=kde-frameworks/kdav-${KFMIN}:5
+ >=kde-apps/kdav-${PVCUT}:5
+ )
+ >=kde-apps/kidentitymanagement-${PVCUT}:5
+ >=kde-apps/kimap-${PVCUT}:5
+ >=kde-apps/kmailtransport-${PVCUT}:5
+ >=kde-apps/kmbox-${PVCUT}:5
+ >=kde-apps/kmime-${PVCUT}:5
+ >=kde-apps/libkgapi-${PVCUT}:5
+ >=kde-apps/pimcommon-${PVCUT}:5
+ >=kde-frameworks/kcalendarcore-${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/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/kwallet-${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] )
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-CVE-2020-15954.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
+ )
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-08-01 22:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-22 14:32 [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdepim-runtime/files/, kde-apps/kdepim-runtime/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-08-01 22:57 Andreas Sturmlechner
2019-10-03 17:42 Andreas Sturmlechner
2019-08-14 8:47 Andreas Sturmlechner
2017-03-25 1:13 Michael Palimaka
2016-12-19 20:08 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox