summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-11-30 00:58:46 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-11-30 01:00:26 +0100
commita82f2d534f3fb1f4c460fc81b9f23b2317bfe6c8 (patch)
treedff02e78941212e20a3d57e82ce461d57d80ca39 /kde-apps/messagelib
parentsys-cluster/ceph: Version bump to 12.2.10 (diff)
downloadgentoo-a82f2d534f3fb1f4c460fc81b9f23b2317bfe6c8.tar.gz
gentoo-a82f2d534f3fb1f4c460fc81b9f23b2317bfe6c8.tar.bz2
gentoo-a82f2d534f3fb1f4c460fc81b9f23b2317bfe6c8.zip
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@gentoo.org>
Diffstat (limited to 'kde-apps/messagelib')
-rw-r--r--kde-apps/messagelib/files/messagelib-18.08.3-newmail-crash.patch29
-rw-r--r--kde-apps/messagelib/messagelib-18.08.3-r1.ebuild71
2 files changed, 100 insertions, 0 deletions
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 000000000000..f80f8201effa
--- /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 000000000000..d6af7c835c07
--- /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" )