Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/messagelib/, kde-apps/messagelib/files/
Date: Fri, 30 Nov 2018 00:00:46
Message-Id: 1543536026.a82f2d534f3fb1f4c460fc81b9f23b2317bfe6c8.asturm@gentoo
1 commit: a82f2d534f3fb1f4c460fc81b9f23b2317bfe6c8
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 29 23:58:46 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 30 00:00:26 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a82f2d53
7
8 kde-apps/messagelib: Fix runtime crash on new mail dialog
9
10 Switch to KDE_HANDBOOK=forceoptional
11
12 Package-Manager: Portage-2.3.52, Repoman-2.3.12
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 .../files/messagelib-18.08.3-newmail-crash.patch | 29 +++++++++
16 kde-apps/messagelib/messagelib-18.08.3-r1.ebuild | 71 ++++++++++++++++++++++
17 2 files changed, 100 insertions(+)
18
19 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
20 new file mode 100644
21 index 00000000000..f80f8201eff
22 --- /dev/null
23 +++ b/kde-apps/messagelib/files/messagelib-18.08.3-newmail-crash.patch
24 @@ -0,0 +1,29 @@
25 +From 32bbd45cdbbb8c60105ced80debab1eb6ed40226 Mon Sep 17 00:00:00 2001
26 +From: Allen Winter <winter@×××.org>
27 +Date: Thu, 29 Nov 2018 09:21:24 -0500
28 +Subject: templateparserextracthtmlinfo.cpp - deleteLater in dtor
29 +
30 +ack'd by Laurent
31 +BUG: 401337
32 +FIXED-IN: 18.12.0
33 +---
34 + templateparser/src/templateparserextracthtmlinfo.cpp | 4 ++--
35 + 1 file changed, 2 insertions(+), 2 deletions(-)
36 +
37 +diff --git a/templateparser/src/templateparserextracthtmlinfo.cpp b/templateparser/src/templateparserextracthtmlinfo.cpp
38 +index 72dddbd..c99eb0a 100644
39 +--- a/templateparser/src/templateparserextracthtmlinfo.cpp
40 ++++ b/templateparser/src/templateparserextracthtmlinfo.cpp
41 +@@ -31,8 +31,8 @@ TemplateParserExtractHtmlInfo::TemplateParserExtractHtmlInfo(QObject *parent)
42 +
43 + TemplateParserExtractHtmlInfo::~TemplateParserExtractHtmlInfo()
44 + {
45 +- delete mTemplateWebEngineView;
46 +- delete mExtractHtmlElementWebEngineView;
47 ++ mTemplateWebEngineView->deleteLater();
48 ++ mExtractHtmlElementWebEngineView->deleteLater();
49 + }
50 +
51 + void TemplateParserExtractHtmlInfo::setHtmlForExtractingTextPlain(const QString &html)
52 +--
53 +cgit v0.11.2
54
55 diff --git a/kde-apps/messagelib/messagelib-18.08.3-r1.ebuild b/kde-apps/messagelib/messagelib-18.08.3-r1.ebuild
56 new file mode 100644
57 index 00000000000..d6af7c835c0
58 --- /dev/null
59 +++ b/kde-apps/messagelib/messagelib-18.08.3-r1.ebuild
60 @@ -0,0 +1,71 @@
61 +# Copyright 1999-2018 Gentoo Authors
62 +# Distributed under the terms of the GNU General Public License v2
63 +
64 +EAPI=6
65 +
66 +KDE_TEST="forceoptional"
67 +VIRTUALX_REQUIRED="test"
68 +inherit kde5
69 +
70 +DESCRIPTION="Libraries for messaging functions"
71 +LICENSE="GPL-2+ LGPL-2.1+"
72 +KEYWORDS="~amd64 ~x86"
73 +IUSE=""
74 +
75 +DEPEND="
76 + $(add_frameworks_dep karchive)
77 + $(add_frameworks_dep kcodecs)
78 + $(add_frameworks_dep kcompletion)
79 + $(add_frameworks_dep kconfig)
80 + $(add_frameworks_dep kconfigwidgets)
81 + $(add_frameworks_dep kcoreaddons)
82 + $(add_frameworks_dep kdbusaddons)
83 + $(add_frameworks_dep ki18n)
84 + $(add_frameworks_dep kiconthemes)
85 + $(add_frameworks_dep kio)
86 + $(add_frameworks_dep kitemmodels)
87 + $(add_frameworks_dep kitemviews)
88 + $(add_frameworks_dep kjobwidgets)
89 + $(add_frameworks_dep knotifications)
90 + $(add_frameworks_dep kservice)
91 + $(add_frameworks_dep ktextwidgets)
92 + $(add_frameworks_dep kwidgetsaddons)
93 + $(add_frameworks_dep kwindowsystem)
94 + $(add_frameworks_dep kxmlgui)
95 + $(add_frameworks_dep sonnet)
96 + $(add_frameworks_dep syntax-highlighting)
97 + $(add_kdeapps_dep akonadi)
98 + $(add_kdeapps_dep akonadi-contacts)
99 + $(add_kdeapps_dep akonadi-mime)
100 + $(add_kdeapps_dep grantleetheme)
101 + $(add_kdeapps_dep incidenceeditor)
102 + $(add_kdeapps_dep kcalcore)
103 + $(add_kdeapps_dep kcontacts)
104 + $(add_kdeapps_dep kdepim-apps-libs)
105 + $(add_kdeapps_dep kidentitymanagement)
106 + $(add_kdeapps_dep kldap)
107 + $(add_kdeapps_dep kmailtransport)
108 + $(add_kdeapps_dep kmbox)
109 + $(add_kdeapps_dep kmime)
110 + $(add_kdeapps_dep kpimtextedit)
111 + $(add_kdeapps_dep libgravatar)
112 + $(add_kdeapps_dep libkdepim)
113 + $(add_kdeapps_dep libkleo)
114 + $(add_qt_dep qtgui)
115 + $(add_qt_dep qtnetwork)
116 + $(add_qt_dep qtprintsupport)
117 + $(add_qt_dep qtwebengine 'widgets')
118 + $(add_qt_dep qtwidgets)
119 + >=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
120 + >=dev-libs/grantlee-5.1.0:5
121 +"
122 +RDEPEND="${DEPEND}
123 + !kde-apps/kdepim-common-libs:4
124 + !kde-apps/kdepim-l10n
125 + !=kde-apps/kmail-4.4*:4
126 +"
127 +
128 +# bug 579630
129 +RESTRICT+=" test"
130 +
131 +PATCHES=( "${FILESDIR}/${P}-newmail-crash.patch" )