commit: a35b4dca01b118ed484d9afbbca90c905bc6e6b7
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat Jun 3 19:55:26 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=a35b4dca
kde-apps/kaddressbook: Fix building in C++ 2011 and 2014 mode
.../files/kaddressbook-4.4.2017.04-gcc6.patch | 27 ++++++++++++++++++++++
.../kaddressbook/kaddressbook-4.4.2017.04.ebuild | 2 ++
2 files changed, 29 insertions(+)
diff --git a/kde-apps/kaddressbook/files/kaddressbook-4.4.2017.04-gcc6.patch
b/kde-apps/kaddressbook/files/kaddressbook-4.4.2017.04-gcc6.patch
new file mode 100644
index 00000000000..5c7b55c5283
--- /dev/null
+++ b/kde-apps/kaddressbook/files/kaddressbook-4.4.2017.04-gcc6.patch
@@ -0,0 +1,27 @@
+--- a/kaddressbook/views/configurecardviewdialog.cpp
++++ b/kaddressbook/views/configurecardviewdialog.cpp
+@@ -34,6 +34,7 @@
+ #include <kcolorscheme.h>
+ #include <kconfig.h>
+ #include <kdebug.h>
++#include <kfontchooser.h>
+ #include <kfontdialog.h>
+ #include <kglobal.h>
+ #include <kiconloader.h>
+@@ -165,14 +166,14 @@
+ void CardViewLookNFeelPage::setTextFont()
+ {
+ QFont f( lTextFont->font() );
+- if ( KFontDialog::getFont( f, false, this ) == QDialog::Accepted )
++ if ( KFontDialog::getFont( f, KFontChooser::NoDisplayFlags, this ) ==
QDialog::Accepted )
+ updateFontLabel( f, lTextFont );
+ }
+
+ void CardViewLookNFeelPage::setHeaderFont()
+ {
+ QFont f( lHeaderFont->font() );
+- if ( KFontDialog::getFont( f,false, this ) == QDialog::Accepted )
++ if ( KFontDialog::getFont( f, KFontChooser::NoDisplayFlags, this ) ==
QDialog::Accepted )
+ updateFontLabel( f, lHeaderFont );
+ }
+
diff --git a/kde-apps/kaddressbook/kaddressbook-4.4.2017.04.ebuild
b/kde-apps/kaddressbook/kaddressbook-4.4.2017.04.ebuild
index 822b8b1c29e..00897c0b3cb 100644
--- a/kde-apps/kaddressbook/kaddressbook-4.4.2017.04.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-4.4.2017.04.ebuild
@@ -32,6 +32,8 @@ KMEXTRACTONLY="
KMLOADLIBS="libkdepim"
+PATCHES=( "${FILESDIR}/${P}-gcc6.patch" )
+
src_install() {
kde4-meta_src_install
