| 1 |
commit: 5db4188c44153a9072a15f19ac05e91b7ab0aaa8 |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Sat Jun 3 19:57:52 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 3 21:26:25 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5db4188c |
| 7 |
|
| 8 |
kde-apps/kmail: Fix building in C++ 2011 and 2014 mode |
| 9 |
|
| 10 |
kde-apps/kmail/files/kmail-4.4.2017.04-gcc6.patch | 42 +++++++++++++++++++++++ |
| 11 |
kde-apps/kmail/kmail-4.4.2017.04.ebuild | 2 ++ |
| 12 |
2 files changed, 44 insertions(+) |
| 13 |
|
| 14 |
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 |
| 15 |
new file mode 100644 |
| 16 |
index 00000000000..e4a891b8d1c |
| 17 |
--- /dev/null |
| 18 |
+++ b/kde-apps/kmail/files/kmail-4.4.2017.04-gcc6.patch |
| 19 |
@@ -0,0 +1,42 @@ |
| 20 |
+--- a/kmail/folderview.cpp |
| 21 |
++++ b/kmail/folderview.cpp |
| 22 |
+@@ -1907,7 +1907,7 @@ |
| 23 |
+ KGuiItem( i18n( "Go To" ) ), |
| 24 |
+ KGuiItem( i18n( "Do Not Go To" ) ), // defaults |
| 25 |
+ ":kmail_AskNextFolder", |
| 26 |
+- false |
| 27 |
++ 0 |
| 28 |
+ ) == KMessageBox::No |
| 29 |
+ ) |
| 30 |
+ return true; // assume selected (do not continue looping) |
| 31 |
+--- a/kmail/kmmainwidget.cpp |
| 32 |
++++ b/kmail/kmmainwidget.cpp |
| 33 |
+@@ -1588,7 +1588,7 @@ |
| 34 |
+ i18n( "Security Warning" ), |
| 35 |
+ KGuiItem(i18n( "Use HTML" )), |
| 36 |
+ KStandardGuiItem::cancel(), |
| 37 |
+- "OverrideHtmlWarning", false); |
| 38 |
++ "OverrideHtmlWarning", 0); |
| 39 |
+ if( result == KMessageBox::Cancel ) { |
| 40 |
+ mPreferHtmlAction->setChecked( false ); |
| 41 |
+ return; |
| 42 |
+@@ -1617,7 +1617,7 @@ |
| 43 |
+ i18n( "Security Warning" ), |
| 44 |
+ KGuiItem(i18n( "Load External References" )), |
| 45 |
+ KStandardGuiItem::cancel(), |
| 46 |
+- "OverrideHtmlLoadExtWarning", false); |
| 47 |
++ "OverrideHtmlLoadExtWarning", 0); |
| 48 |
+ if( result == KMessageBox::Cancel ) { |
| 49 |
+ mPreferHtmlLoadExtAction->setChecked( false ); |
| 50 |
+ return; |
| 51 |
+--- a/kmail/kmsender.cpp |
| 52 |
++++ b/kmail/kmsender.cpp |
| 53 |
+@@ -575,7 +575,7 @@ |
| 54 |
+ i18n( "Security Warning" ), |
| 55 |
+ KGuiItem( i18n( "Send Unencrypted" ) ), |
| 56 |
+ KStandardGuiItem::cancel(), |
| 57 |
+- "useCustomTransportWithoutAsking", false ); |
| 58 |
++ "useCustomTransportWithoutAsking", 0 ); |
| 59 |
+ |
| 60 |
+ if ( result == KMessageBox::Cancel ) { |
| 61 |
+ mProgressItem->cancel(); |
| 62 |
|
| 63 |
diff --git a/kde-apps/kmail/kmail-4.4.2017.04.ebuild b/kde-apps/kmail/kmail-4.4.2017.04.ebuild |
| 64 |
index 30728aaf34b..00c3717ccfd 100644 |
| 65 |
--- a/kde-apps/kmail/kmail-4.4.2017.04.ebuild |
| 66 |
+++ b/kde-apps/kmail/kmail-4.4.2017.04.ebuild |
| 67 |
@@ -41,6 +41,8 @@ KMEXTRA=" |
| 68 |
" |
| 69 |
KMLOADLIBS="libkdepim" |
| 70 |
|
| 71 |
+PATCHES=( "${FILESDIR}/${P}-gcc6.patch" ) |
| 72 |
+ |
| 73 |
src_configure() { |
| 74 |
mycmakeargs=( |
| 75 |
-DWITH_IndicateQt=OFF |
Archives