From a35b4dca01b118ed484d9afbbca90c905bc6e6b7 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Date: Sat, 3 Jun 2017 21:55:26 +0200
Subject: 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(+)
 create mode 100644 kde-apps/kaddressbook/files/kaddressbook-4.4.2017.04-gcc6.patch

(limited to 'kde-apps')

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 000000000000..5c7b55c5283a
--- /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 822b8b1c29eb..00897c0b3cbf 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
 
-- 
cgit v1.2.3-65-gdbad