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

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

[Andreas Sturmlechner]

commit:     5db4188c44153a9072a15f19ac05e91b7ab0aaa8
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat Jun  3 19:57:52 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun  3 21:26:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5db4188c

kde-apps/kmail: Fix building in C++ 2011 and 2014 mode

 kde-apps/kmail/files/kmail-4.4.2017.04-gcc6.patch | 42 +++++++++++++++++++++++
 kde-apps/kmail/kmail-4.4.2017.04.ebuild           |  2 ++
 2 files changed, 44 insertions(+)

diff --git a/kde-apps/kmail/files/kmail-4.4.2017.04-gcc6.patch b/kde-apps/kmail/files/kmail-4.4.2017.04-gcc6.patch
new file mode 100644
index 00000000000..e4a891b8d1c
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-4.4.2017.04-gcc6.patch
@@ -0,0 +1,42 @@
+--- a/kmail/folderview.cpp
++++ b/kmail/folderview.cpp
+@@ -1907,7 +1907,7 @@
+            KGuiItem( i18n( "Go To" ) ),
+            KGuiItem( i18n( "Do Not Go To" ) ), // defaults
+            ":kmail_AskNextFolder",
+-           false
++           0
+          ) == KMessageBox::No
+      )
+     return true; // assume selected (do not continue looping)
+--- a/kmail/kmmainwidget.cpp
++++ b/kmail/kmmainwidget.cpp
+@@ -1588,7 +1588,7 @@
+       i18n( "Security Warning" ),
+       KGuiItem(i18n( "Use HTML" )),
+       KStandardGuiItem::cancel(),
+-      "OverrideHtmlWarning", false);
++      "OverrideHtmlWarning", 0);
+     if( result == KMessageBox::Cancel ) {
+       mPreferHtmlAction->setChecked( false );
+       return;
+@@ -1617,7 +1617,7 @@
+       i18n( "Security Warning" ),
+       KGuiItem(i18n( "Load External References" )),
+       KStandardGuiItem::cancel(),
+-      "OverrideHtmlLoadExtWarning", false);
++      "OverrideHtmlLoadExtWarning", 0);
+     if( result == KMessageBox::Cancel ) {
+       mPreferHtmlLoadExtAction->setChecked( false );
+       return;
+--- a/kmail/kmsender.cpp
++++ b/kmail/kmsender.cpp
+@@ -575,7 +575,7 @@
+         i18n( "Security Warning" ),
+         KGuiItem( i18n( "Send Unencrypted" ) ),
+         KStandardGuiItem::cancel(),
+-        "useCustomTransportWithoutAsking", false );
++        "useCustomTransportWithoutAsking", 0 );
+ 
+       if ( result == KMessageBox::Cancel ) {
+         mProgressItem->cancel();

diff --git a/kde-apps/kmail/kmail-4.4.2017.04.ebuild b/kde-apps/kmail/kmail-4.4.2017.04.ebuild
index 30728aaf34b..00c3717ccfd 100644
--- a/kde-apps/kmail/kmail-4.4.2017.04.ebuild
+++ b/kde-apps/kmail/kmail-4.4.2017.04.ebuild
@@ -41,6 +41,8 @@ KMEXTRA="
 "
 KMLOADLIBS="libkdepim"
 
+PATCHES=( "${FILESDIR}/${P}-gcc6.patch" )
+
 src_configure() {
 	mycmakeargs=(
 		-DWITH_IndicateQt=OFF