[gentoo-commits] repo/gentoo:master commit in: kde-apps/messagelib/files/, kde-apps/messagelib/

[Andreas Sturmlechner]

commit:     a2f44bc2d62d2a1d21135803743d503d225e7806
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 21 22:38:57 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 22:42:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2f44bc2

kde-apps/messagelib: Fix message format preference setting

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 kde-apps/messagelib/Manifest                       |  2 +-
 .../files/messagelib-17.08.3-richtextsetting.patch | 29 +++++++++
 kde-apps/messagelib/messagelib-17.08.3-r1.ebuild   | 73 ++++++++++++++++++++++
 3 files changed, 103 insertions(+), 1 deletion(-)

diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 1891d58a5c4..d8a870b8a48 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,2 +1,2 @@
 DIST messagelib-17.04.3.tar.xz 10498000 SHA256 53e8c256bb016506ecc163ba3e3a387f6f5c958e325e8cae3e74d6461ce85b96 SHA512 20f9e0089c89cc1c61e887832e1499bf7dedee785679d2b780aa1ef5b9029868cd3269c226c7c0814f7048c9d880cc88f94f8ab2c63e8bf6bda9cbeec9f0fa0c WHIRLPOOL 1fc6a51b14301bc35ef2864591c0e8930843a96e548bc8959a72092a46d268253176f05de34287027a41d0bf811aa65d25bae751b2bd5b1e798082b55bb38ead
-DIST messagelib-17.08.3.tar.xz 10463496 SHA256 b63568097bf8741b0ff5bd1911564449f80c1e6f59ca35907d5b6ee55b3ab1db SHA512 572dbb06aec537e224bc87a7863cec394664969a881f98b065d13a6690e908b7d026bee61f49114bc6f75bc5d4e219cf2d1d9420b6d55f91a14e55595f78904a WHIRLPOOL e4d7b4ec00facfc769e4f91bea09ba902370019beae5fd113b57fddfe8843983fcc641eedecaca055efb583498756ee96446f09cff7db746352b1faa1d8fe719
+DIST messagelib-17.08.3.tar.xz 10463496 BLAKE2B 612672462e77217555fd48e7038e727d8115d1f151e82720e2934f2c98ac3012abbb3e1402befa4704fbcb7234b604f93ad3d1af4fb853e3f7173758240c6f12 SHA512 572dbb06aec537e224bc87a7863cec394664969a881f98b065d13a6690e908b7d026bee61f49114bc6f75bc5d4e219cf2d1d9420b6d55f91a14e55595f78904a

diff --git a/kde-apps/messagelib/files/messagelib-17.08.3-richtextsetting.patch b/kde-apps/messagelib/files/messagelib-17.08.3-richtextsetting.patch
new file mode 100644
index 00000000000..42cf01165d5
--- /dev/null
+++ b/kde-apps/messagelib/files/messagelib-17.08.3-richtextsetting.patch
@@ -0,0 +1,29 @@
+From ece5c76c708797f2b1ec5bb22460089428ab6d80 Mon Sep 17 00:00:00 2001
+From: Montel Laurent <montel@×××.org>
+Date: Thu, 9 Nov 2017 07:48:59 +0100
+Subject: Fix Bug 386660 - Rich text setting is not saved
+
+BUG: 386660
+---
+ templateparser/src/templateparserjob.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/templateparser/src/templateparserjob.cpp b/templateparser/src/templateparserjob.cpp
+index b43e7e6..e836c5b 100644
+--- a/templateparser/src/templateparserjob.cpp
++++ b/templateparser/src/templateparserjob.cpp
+@@ -1115,9 +1115,11 @@ void TemplateParserJob::slotExtractInfoDone(const TemplateParserExtractHtmlInfoR
+     if (mMode == NewMessage && plainBody.isEmpty() && !mExtractHtmlInfoResult.mPlainText.isEmpty()) {
+         plainBody = mExtractHtmlInfoResult.mPlainText;
+     }
++    /*
+     if (mMode == NewMessage && htmlBody.isEmpty() && !mExtractHtmlInfoResult.mHtmlElement.isEmpty()) {
+         htmlBody = mExtractHtmlInfoResult.mHtmlElement;
+     }
++    */
+ 
+     addProcessedBodyToMessage(plainBody, htmlBody);
+     Q_EMIT parsingDone(mForceCursorPosition);
+-- 
+cgit v0.11.2
+

diff --git a/kde-apps/messagelib/messagelib-17.08.3-r1.ebuild b/kde-apps/messagelib/messagelib-17.08.3-r1.ebuild
new file mode 100644
index 00000000000..7a14b735d24
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-17.08.3-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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=""
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.8.0
+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 '' '' '5=')
+	$(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
+"
+
+PATCHES=( "${FILESDIR}/${P}-richtextsetting.patch" )
+
+# bug 579630
+RESTRICT+=" test"