[SCM] krecipes packaging branch, master, updated. debian/2.1.0-1-4-gd593fc5

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/krecipes.git;a=commitdiff;h=d593fc5

The following commit has been merged in the master branch:
commit d593fc5d1d4dfd8ea313f0497ab99e33d68efa98
Author: Pino Toscano <pino at debian.org>
Date:   Sun Feb 14 09:17:21 2016 +0100

    fix build with GCC 6 (#811853)
    
    backport upstream commit f6d4f709ec57835b3fa4a660239a07321c9d02ff
---
 debian/changelog                                   |  3 +++
 debian/patches/series                              |  1 +
 ...pstream_Fix-flags-for-KFontDialog-getFont.patch | 28 ++++++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f21013d..8f09235 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ krecipes (2.1.0-2) UNRELEASED; urgency=medium
   [ Pino Toscano ]
   * Update Vcs-* fields.
   * Bump Standards-Version to 3.9.7, no changes required.
+  * Backport upstream commit f6d4f709ec57835b3fa4a660239a07321c9d02ff to fix
+    build with GCC 6; patch upstream_Fix-flags-for-KFontDialog-getFont.patch.
+    (Closes: #811853)
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 14 Feb 2016 09:02:23 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a6fd53a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_Fix-flags-for-KFontDialog-getFont.patch
diff --git a/debian/patches/upstream_Fix-flags-for-KFontDialog-getFont.patch b/debian/patches/upstream_Fix-flags-for-KFontDialog-getFont.patch
new file mode 100644
index 0000000..0ac00a2
--- /dev/null
+++ b/debian/patches/upstream_Fix-flags-for-KFontDialog-getFont.patch
@@ -0,0 +1,28 @@
+From f6d4f709ec57835b3fa4a660239a07321c9d02ff Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sun, 14 Feb 2016 08:49:09 +0100
+Subject: [PATCH] Fix flags for KFontDialog::getFont()
+
+Pass a proper value for flags, instead of a boolean.
+
+This fixes the build with GCC 6.
+---
+ src/dialogs/setupdisplay.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/dialogs/setupdisplay.cpp b/src/dialogs/setupdisplay.cpp
+index 43635e8..eb05874 100644
+--- a/src/dialogs/setupdisplay.cpp
++++ b/src/dialogs/setupdisplay.cpp
+@@ -562,7 +562,7 @@ void SetupDisplay::setShown( int id )
+ void SetupDisplay::setFont()
+ {
+ 	KreDisplayItem *item = *node_item_map->find( m_currNodeId );
+-	if ( KFontDialog::getFont( item->font, false, view() ) == QDialog::Accepted ) {
++	if ( KFontDialog::getFont( item->font, KFontChooser::NoDisplayFlags, view() ) == QDialog::Accepted ) {
+ 		m_currentItem = item;
+ 		loadFont(m_currNodeId,item->font);
+ 		m_currentItem = 0;
+-- 
+2.7.0
+

-- 
krecipes packaging