* [gentoo-commits] repo/gentoo:master commit in: kde-apps/messagelib/, kde-apps/messagelib/files/
@ 2018-11-30 0:00 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2018-11-30 0:00 UTC (permalink / raw
To: gentoo-commits
commit: a82f2d534f3fb1f4c460fc81b9f23b2317bfe6c8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 29 23:58:46 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 30 00:00:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a82f2d53
kde-apps/messagelib: Fix runtime crash on new mail dialog
Switch to KDE_HANDBOOK=forceoptional
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/messagelib-18.08.3-newmail-crash.patch | 29 +++++++++
kde-apps/messagelib/messagelib-18.08.3-r1.ebuild | 71 ++++++++++++++++++++++
2 files changed, 100 insertions(+)
diff --git a/kde-apps/messagelib/files/messagelib-18.08.3-newmail-crash.patch b/kde-apps/messagelib/files/messagelib-18.08.3-newmail-crash.patch
new file mode 100644
index 00000000000..f80f8201eff
--- /dev/null
+++ b/kde-apps/messagelib/files/messagelib-18.08.3-newmail-crash.patch
@@ -0,0 +1,29 @@
+From 32bbd45cdbbb8c60105ced80debab1eb6ed40226 Mon Sep 17 00:00:00 2001
+From: Allen Winter <winter@kde.org>
+Date: Thu, 29 Nov 2018 09:21:24 -0500
+Subject: templateparserextracthtmlinfo.cpp - deleteLater in dtor
+
+ack'd by Laurent
+BUG: 401337
+FIXED-IN: 18.12.0
+---
+ templateparser/src/templateparserextracthtmlinfo.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/templateparser/src/templateparserextracthtmlinfo.cpp b/templateparser/src/templateparserextracthtmlinfo.cpp
+index 72dddbd..c99eb0a 100644
+--- a/templateparser/src/templateparserextracthtmlinfo.cpp
++++ b/templateparser/src/templateparserextracthtmlinfo.cpp
+@@ -31,8 +31,8 @@ TemplateParserExtractHtmlInfo::TemplateParserExtractHtmlInfo(QObject *parent)
+
+ TemplateParserExtractHtmlInfo::~TemplateParserExtractHtmlInfo()
+ {
+- delete mTemplateWebEngineView;
+- delete mExtractHtmlElementWebEngineView;
++ mTemplateWebEngineView->deleteLater();
++ mExtractHtmlElementWebEngineView->deleteLater();
+ }
+
+ void TemplateParserExtractHtmlInfo::setHtmlForExtractingTextPlain(const QString &html)
+--
+cgit v0.11.2
diff --git a/kde-apps/messagelib/messagelib-18.08.3-r1.ebuild b/kde-apps/messagelib/messagelib-18.08.3-r1.ebuild
new file mode 100644
index 00000000000..d6af7c835c0
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-18.08.3-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Libraries for messaging functions"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep karchive)
+ $(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 ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ $(add_frameworks_dep syntax-highlighting)
+ $(add_kdeapps_dep akonadi)
+ $(add_kdeapps_dep akonadi-contacts)
+ $(add_kdeapps_dep akonadi-mime)
+ $(add_kdeapps_dep grantleetheme)
+ $(add_kdeapps_dep incidenceeditor)
+ $(add_kdeapps_dep kcalcore)
+ $(add_kdeapps_dep kcontacts)
+ $(add_kdeapps_dep kdepim-apps-libs)
+ $(add_kdeapps_dep kidentitymanagement)
+ $(add_kdeapps_dep kldap)
+ $(add_kdeapps_dep kmailtransport)
+ $(add_kdeapps_dep kmbox)
+ $(add_kdeapps_dep kmime)
+ $(add_kdeapps_dep kpimtextedit)
+ $(add_kdeapps_dep libgravatar)
+ $(add_kdeapps_dep libkdepim)
+ $(add_kdeapps_dep libkleo)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtwebengine 'widgets')
+ $(add_qt_dep qtwidgets)
+ >=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
+ >=dev-libs/grantlee-5.1.0:5
+"
+RDEPEND="${DEPEND}
+ !kde-apps/kdepim-common-libs:4
+ !kde-apps/kdepim-l10n
+ !=kde-apps/kmail-4.4*:4
+"
+
+# bug 579630
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-newmail-crash.patch" )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/messagelib/, kde-apps/messagelib/files/
@ 2018-12-01 2:38 Michael Palimaka
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2018-12-01 2:38 UTC (permalink / raw
To: gentoo-commits
commit: 4b7826b1c6186fe0dea304ff3108cf9610210925
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 1 02:37:24 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Dec 1 02:37:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b7826b1
kde-apps/messagelib: revision bump resolving CVE-2018-19516
Bug: https://bugs.gentoo.org/672312
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>
.../files/messagelib-18.04.3-CVE-2018-19516.patch | 17 +++++
.../files/messagelib-18.08.3-CVE-2018-19516.patch | 29 +++++++++
kde-apps/messagelib/messagelib-18.04.3-r1.ebuild | 72 +++++++++++++++++++++
kde-apps/messagelib/messagelib-18.08.3-r2.ebuild | 74 ++++++++++++++++++++++
4 files changed, 192 insertions(+)
diff --git a/kde-apps/messagelib/files/messagelib-18.04.3-CVE-2018-19516.patch b/kde-apps/messagelib/files/messagelib-18.04.3-CVE-2018-19516.patch
new file mode 100644
index 00000000000..4d3fac7334b
--- /dev/null
+++ b/kde-apps/messagelib/files/messagelib-18.04.3-CVE-2018-19516.patch
@@ -0,0 +1,17 @@
+diff --git a/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp b/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
+index 0d209524..0dad4174 100644
+--- a/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
++++ b/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
+@@ -299,6 +299,12 @@ QString processHtml(const QString &htmlSource, QString &extraHead)
+ return htmlSource;
+ }
+ extraHead = s.mid(6, idx - 6);
++
++ //Don't authorize to refresh content.
++ if (s.contains(QStringLiteral("http-equiv=\"REFRESH\""), Qt::CaseInsensitive)) {
++ extraHead.clear();
++ }
++
+ s = s.mid(idx + 7).trimmed();
+ }
+
diff --git a/kde-apps/messagelib/files/messagelib-18.08.3-CVE-2018-19516.patch b/kde-apps/messagelib/files/messagelib-18.08.3-CVE-2018-19516.patch
new file mode 100644
index 00000000000..21108ae1fb6
--- /dev/null
+++ b/kde-apps/messagelib/files/messagelib-18.08.3-CVE-2018-19516.patch
@@ -0,0 +1,29 @@
+From 1fd737870f5a9c5bf44ad9fbd153ab4cf44e135d Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Fri, 23 Nov 2018 07:37:02 +0100
+Subject: [PATCH] Exclude Refresh from MetaData (Not necessary)
+
+---
+ .../src/messagepartthemes/default/defaultrenderer.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp b/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
+index a7ffe824..d5d41cf6 100644
+--- a/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
++++ b/messageviewer/src/messagepartthemes/default/defaultrenderer.cpp
+@@ -308,6 +308,12 @@ QString processHtml(const QString &htmlSource, QString &extraHead)
+ return htmlSource;
+ }
+ extraHead = s.mid(startIndex + 6 , endIndex - startIndex - 6);
++
++ //Don't authorize to refresh content.
++ if (s.contains(QStringLiteral("http-equiv=\"REFRESH\""), Qt::CaseInsensitive)) {
++ extraHead.clear();
++ }
++
+ s = s.mid(endIndex + 7).trimmed();
+ }
+
+--
+2.19.2
+
diff --git a/kde-apps/messagelib/messagelib-18.04.3-r1.ebuild b/kde-apps/messagelib/messagelib-18.04.3-r1.ebuild
new file mode 100644
index 00000000000..05699236352
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-18.04.3-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional-recursive"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Libraries for messaging functions"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep karchive)
+ $(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 ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ $(add_frameworks_dep syntax-highlighting)
+ $(add_kdeapps_dep akonadi)
+ $(add_kdeapps_dep akonadi-contacts)
+ $(add_kdeapps_dep akonadi-mime)
+ $(add_kdeapps_dep grantleetheme)
+ $(add_kdeapps_dep incidenceeditor)
+ $(add_kdeapps_dep kcalcore)
+ $(add_kdeapps_dep kcontacts)
+ $(add_kdeapps_dep kdepim-apps-libs)
+ $(add_kdeapps_dep kidentitymanagement)
+ $(add_kdeapps_dep kldap)
+ $(add_kdeapps_dep kmailtransport)
+ $(add_kdeapps_dep kmbox)
+ $(add_kdeapps_dep kmime)
+ $(add_kdeapps_dep kpimtextedit)
+ $(add_kdeapps_dep libgravatar)
+ $(add_kdeapps_dep libkdepim)
+ $(add_kdeapps_dep libkleo)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtwebengine 'widgets')
+ $(add_qt_dep qtwidgets)
+ >=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
+ >=dev-libs/grantlee-5.1.0:5
+"
+RDEPEND="${DEPEND}
+ !<kde-apps/kdepim-addons-16.08.50:5
+ !kde-apps/kdepim-common-libs:4
+ !kde-apps/kdepim-l10n
+ !=kde-apps/kmail-4.4*:4
+"
+
+# bug 579630
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-CVE-2018-19516.patch" )
diff --git a/kde-apps/messagelib/messagelib-18.08.3-r2.ebuild b/kde-apps/messagelib/messagelib-18.08.3-r2.ebuild
new file mode 100644
index 00000000000..6056ee7e12e
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-18.08.3-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Libraries for messaging functions"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep karchive)
+ $(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 ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ $(add_frameworks_dep syntax-highlighting)
+ $(add_kdeapps_dep akonadi)
+ $(add_kdeapps_dep akonadi-contacts)
+ $(add_kdeapps_dep akonadi-mime)
+ $(add_kdeapps_dep grantleetheme)
+ $(add_kdeapps_dep incidenceeditor)
+ $(add_kdeapps_dep kcalcore)
+ $(add_kdeapps_dep kcontacts)
+ $(add_kdeapps_dep kdepim-apps-libs)
+ $(add_kdeapps_dep kidentitymanagement)
+ $(add_kdeapps_dep kldap)
+ $(add_kdeapps_dep kmailtransport)
+ $(add_kdeapps_dep kmbox)
+ $(add_kdeapps_dep kmime)
+ $(add_kdeapps_dep kpimtextedit)
+ $(add_kdeapps_dep libgravatar)
+ $(add_kdeapps_dep libkdepim)
+ $(add_kdeapps_dep libkleo)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtwebengine 'widgets')
+ $(add_qt_dep qtwidgets)
+ >=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
+ >=dev-libs/grantlee-5.1.0:5
+"
+RDEPEND="${DEPEND}
+ !kde-apps/kdepim-common-libs:4
+ !kde-apps/kdepim-l10n
+ !=kde-apps/kmail-4.4*:4
+"
+
+# bug 579630
+RESTRICT+=" test"
+
+PATCHES=(
+ "${FILESDIR}/${P}-newmail-crash.patch"
+ "${FILESDIR}/${PN}-18.08.3-CVE-2018-19516.patch"
+)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/messagelib/, kde-apps/messagelib/files/
@ 2019-06-01 8:42 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-06-01 8:42 UTC (permalink / raw
To: gentoo-commits
commit: a8e77815125e73f7baf630855845a5f4bb041e51
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 1 08:38:46 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 1 08:42:37 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8e77815
kde-apps/messagelib: Fix messagewindow crash with Qt 5.12.3
Reported-by: Erik Quaeghebeur <gentoobugzilla <AT> equaeghe.nospammail.net>
Thanks-to: Giuseppe Vitillaro <giuseppe <AT> vitillaro.org>
Closes: https://bugs.gentoo.org/686842
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../messagelib-18.12.3-qtwebengine-5.12.3.patch | 172 +++++++++++++++++++++
kde-apps/messagelib/messagelib-18.12.3-r2.ebuild | 71 +++++++++
2 files changed, 243 insertions(+)
diff --git a/kde-apps/messagelib/files/messagelib-18.12.3-qtwebengine-5.12.3.patch b/kde-apps/messagelib/files/messagelib-18.12.3-qtwebengine-5.12.3.patch
new file mode 100644
index 00000000000..3fdc1527951
--- /dev/null
+++ b/kde-apps/messagelib/files/messagelib-18.12.3-qtwebengine-5.12.3.patch
@@ -0,0 +1,172 @@
+From 9f0ce086c6a4e487cee1f01acb15290ebff19ac3 Mon Sep 17 00:00:00 2001
+From: Jonathan Marten <jjm@keelhaul.me.uk>
+Date: Tue, 12 Mar 2019 08:47:43 +0000
+Subject: Move management of QWebEngineProfile to WebEnginePage
+
+To avoid a crash on KMail quit or viewer window close, caused by the
+MailWebEnginePage being deleted while its QWebEngineProfile is still
+active. Simplified management of the profile by handling its creation
+and deletion within WebEnginePage.
+
+Deprecate the 2-argument WebEnginePage constructor which allows an
+already allocated profile to be used. This constructor is used by
+Akregator which specifies the global profile; it will be changed to
+use a private profile instead.
+
+Differential Revision: https://phabricator.kde.org/D19559
+---
+ .../src/viewer/webengine/mailwebenginepage.cpp | 10 -------
+ .../src/viewer/webengine/mailwebenginepage.h | 3 +-
+ .../src/viewer/webengine/mailwebengineview.cpp | 3 +-
+ webengineviewer/src/webenginepage.cpp | 22 ++++++++++----
+ webengineviewer/src/webenginepage.h | 35 ++++++++++++++++++++--
+ 5 files changed, 52 insertions(+), 21 deletions(-)
+
+diff --git a/messageviewer/src/viewer/webengine/mailwebenginepage.cpp b/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
+index cd91494..f3790b9 100644
+--- a/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
++++ b/messageviewer/src/viewer/webengine/mailwebenginepage.cpp
+@@ -29,16 +29,6 @@ MailWebEnginePage::MailWebEnginePage(QObject *parent)
+ initialize();
+ }
+
+-MailWebEnginePage::MailWebEnginePage(QWebEngineProfile *profile, QObject *parent)
+- : WebEngineViewer::WebEnginePage(profile, parent)
+-{
+- initialize();
+-}
+-
+-MailWebEnginePage::~MailWebEnginePage()
+-{
+-}
+-
+ void MailWebEnginePage::initialize()
+ {
+ settings()->setAttribute(QWebEngineSettings::JavascriptEnabled, false);
+diff --git a/messageviewer/src/viewer/webengine/mailwebenginepage.h b/messageviewer/src/viewer/webengine/mailwebenginepage.h
+index 7f8e6eb..d581efd 100644
+--- a/messageviewer/src/viewer/webengine/mailwebenginepage.h
++++ b/messageviewer/src/viewer/webengine/mailwebenginepage.h
+@@ -28,8 +28,7 @@ class MESSAGEVIEWER_EXPORT MailWebEnginePage : public WebEngineViewer::WebEngine
+ Q_OBJECT
+ public:
+ explicit MailWebEnginePage(QObject *parent = nullptr);
+- explicit MailWebEnginePage(QWebEngineProfile *profile, QObject *parent = nullptr);
+- ~MailWebEnginePage();
++ virtual ~MailWebEnginePage() = default;
+
+ void setPrintElementBackground(bool printElementBackground);
+
+diff --git a/messageviewer/src/viewer/webengine/mailwebengineview.cpp b/messageviewer/src/viewer/webengine/mailwebengineview.cpp
+index 0685a8d..09224cf 100644
+--- a/messageviewer/src/viewer/webengine/mailwebengineview.cpp
++++ b/messageviewer/src/viewer/webengine/mailwebengineview.cpp
+@@ -34,7 +34,6 @@
+ #include <QContextMenuEvent>
+ #include <WebEngineViewer/WebHitTest>
+
+-#include <QWebEngineProfile>
+ #include <QPrinter>
+
+ #include <WebEngineViewer/WebHitTestResult>
+@@ -81,7 +80,7 @@ MailWebEngineView::MailWebEngineView(KActionCollection *ac, QWidget *parent)
+ : WebEngineViewer::WebEngineView(parent)
+ , d(new MessageViewer::MailWebEngineViewPrivate)
+ {
+- d->mPageEngine = new MailWebEnginePage(new QWebEngineProfile(this), this);
++ d->mPageEngine = new MailWebEnginePage(this);
+ setPage(d->mPageEngine);
+ d->mWebViewAccessKey = new WebEngineViewer::WebEngineAccessKey(this, this);
+ d->mWebViewAccessKey->setActionCollection(ac);
+diff --git a/webengineviewer/src/webenginepage.cpp b/webengineviewer/src/webenginepage.cpp
+index 447ac26..2fcb6c2 100644
+--- a/webengineviewer/src/webenginepage.cpp
++++ b/webengineviewer/src/webenginepage.cpp
+@@ -33,8 +33,24 @@
+ using namespace WebEngineViewer;
+
+ WebEnginePage::WebEnginePage(QObject *parent)
+- : QWebEnginePage(parent)
++ : QWebEnginePage(new QWebEngineProfile, parent)
+ {
++ // Create a private (off the record) QWebEngineProfile here to isolate the
++ // browsing settings, and adopt it as a child so that it will be deleted
++ // when we are destroyed. The profile must remain active for as long as
++ // any QWebEnginePage's belonging to it exist, see the API documentation
++ // of QWebEnginePage::QWebEnginePage(QWebEngineProfile *, QObject *).
++ // Deleting it as our child on destruction is safe.
++ //
++ // Do not try to save a line of code by setting the parent on construction:
++ //
++ // WebEnginePage::WebEnginePage(QObject *parent)
++ // : QWebEnginePage(new QWebEngineProfile(this), parent)
++ //
++ // because the QWebEngineProfile constructor will call out to the QWebEnginePage
++ // and crash because the QWebEnginePage is not fully constructed yet.
++ profile()->setParent(this);
++
+ init();
+ }
+
+@@ -44,10 +60,6 @@ WebEnginePage::WebEnginePage(QWebEngineProfile *profile, QObject *parent)
+ init();
+ }
+
+-WebEnginePage::~WebEnginePage()
+-{
+-}
+-
+ void WebEnginePage::init()
+ {
+ connect(profile(), &QWebEngineProfile::downloadRequested, this, &WebEnginePage::saveHtml);
+diff --git a/webengineviewer/src/webenginepage.h b/webengineviewer/src/webenginepage.h
+index be38368..95c7c76 100644
+--- a/webengineviewer/src/webenginepage.h
++++ b/webengineviewer/src/webenginepage.h
+@@ -31,10 +31,41 @@ class WEBENGINEVIEWER_EXPORT WebEnginePage : public QWebEnginePage
+ {
+ Q_OBJECT
+ public:
++ /**
++ * Constructor.
++ *
++ * A private QWebEngineProfile, only applying to this QWebEnginePage,
++ * will be created to implement browser settings. It can be accessed via
++ * @c profile(), but it should not be shared or reused unless care is
++ * taken that the profile is not deleted until all of the QWebEnginePage's
++ * belonging to it are deleted first.
++ *
++ * @param parent The parent object
++ **/
+ explicit WebEnginePage(QObject *parent = nullptr);
+- explicit WebEnginePage(QWebEngineProfile *profile, QObject *parent = nullptr);
+
+- ~WebEnginePage() override;
++ /**
++ * Constructor.
++ *
++ * The specified QWebEngineProfile will be used. See the description of
++ * @c WebEnginePage(QObject *) and the API documentation of QWebEnginePage
++ * for caution regarding the lifetime of the profile.
++ *
++ * @param profile The profile to be used
++ * @param parent The parent object
++ * @deprecated Use the single argument constructor, which creates and uses
++ * a private profile.
++ **/
++#ifndef WEBENGINEVIEWER_NO_DEPRECATED
++ explicit WEBENGINEVIEWER_DEPRECATED WebEnginePage(QWebEngineProfile *profile, QObject *parent = nullptr);
++#endif
++
++ /**
++ * Destructor. If there is a private QWebEngineProfile then it will also
++ * be destroyed.
++ **/
++ virtual ~WebEnginePage() override = default;
++
+ WebEngineViewer::WebHitTest *hitTestContent(const QPoint &pos);
+
+ void saveHtml(QWebEngineDownloadItem *download);
+--
+cgit v1.1
+
diff --git a/kde-apps/messagelib/messagelib-18.12.3-r2.ebuild b/kde-apps/messagelib/messagelib-18.12.3-r2.ebuild
new file mode 100644
index 00000000000..6dd0db1af4a
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-18.12.3-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional-recursive"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Libraries for messaging functions"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep karchive)
+ $(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 ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ $(add_frameworks_dep syntax-highlighting)
+ $(add_kdeapps_dep akonadi '' 18.12.3-r1)
+ $(add_kdeapps_dep akonadi-contacts)
+ $(add_kdeapps_dep akonadi-mime)
+ $(add_kdeapps_dep grantleetheme)
+ $(add_kdeapps_dep incidenceeditor)
+ $(add_kdeapps_dep kcalcore)
+ $(add_kdeapps_dep kcontacts)
+ $(add_kdeapps_dep kdepim-apps-libs)
+ $(add_kdeapps_dep kidentitymanagement)
+ $(add_kdeapps_dep kldap)
+ $(add_kdeapps_dep kmailtransport)
+ $(add_kdeapps_dep kmbox)
+ $(add_kdeapps_dep kmime)
+ $(add_kdeapps_dep kpimtextedit)
+ $(add_kdeapps_dep libgravatar)
+ $(add_kdeapps_dep libkdepim)
+ $(add_kdeapps_dep libkleo)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtwebengine 'widgets')
+ $(add_qt_dep qtwidgets)
+ >=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
+ >=dev-libs/grantlee-5.1.0:5
+"
+RDEPEND="${DEPEND}
+ !kde-apps/kdepim-common-libs:4
+ !kde-apps/kdepim-l10n
+ !=kde-apps/kmail-4.4*:4
+"
+
+# bug 579630
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-qtwebengine-5.12.3.patch" ) # bug 686842
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-06-01 8:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-30 0:00 [gentoo-commits] repo/gentoo:master commit in: kde-apps/messagelib/, kde-apps/messagelib/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2018-12-01 2:38 Michael Palimaka
2019-06-01 8:42 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox