net-misc/knutclient: Fix building with GCC-6
authorPeter-Levine <plevine457@gmail.com>
Mon, 8 May 2017 04:25:55 +0000 (00:25 -0400)
committerAndreas Sturmlechner <asturm@gentoo.org>
Mon, 8 May 2017 05:53:07 +0000 (07:53 +0200)
Bug: https://bugs.gentoo.org/show_bug.cgi?id=612936
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4565

net-misc/knutclient/files/knutclient-1.0.5-gcc6.patch [new file with mode: 0644]
net-misc/knutclient/knutclient-1.0.5.ebuild

diff --git a/net-misc/knutclient/files/knutclient-1.0.5-gcc6.patch b/net-misc/knutclient/files/knutclient-1.0.5-gcc6.patch
new file mode 100644 (file)
index 0000000..f52f6b4
--- /dev/null
@@ -0,0 +1,18 @@
+Forwarded: no
+Description: Fix the build with gcc 6
+Author: Adrian Bunk <bunk@stusta.de>
+Bug-Debian: https://bugs.debian.org/811882
+
+--- a/src/knutprefdlg.cpp
++++ b/src/knutprefdlg.cpp
+@@ -957,9 +957,9 @@
+ 
+   QHBoxLayout *setFontLayout = new QHBoxLayout();
+   QStringList fontsList;
+   KFontChooser::getFontList(fontsList, KFontChooser::SmoothScalableFonts);
+-  m_fontWidget = new KFontChooser(mainPageWidget, false, fontsList);
++  m_fontWidget = new KFontChooser(mainPageWidget, KFontChooser::NoDisplayFlags, fontsList);
+   setFontLayout->addWidget (m_fontWidget ,0);
+   topLayout->addLayout(setFontLayout);
+ 
+   topLayout->addStretch( 20 );
index c367772a3bd8b192cbafeb3522c149fe5c004d88..3bdb40011a4b88f24b97c0bc21e887dafd80cdf6 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,11 @@ SLOT="4"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
+PATCHES=(
+       "${FILESDIR}/${P}-desktop.patch"
+       "${FILESDIR}/${P}-gcc6.patch"
+)
+
 DOCS=( ChangeLog )
 
 S=${WORKDIR}/${MY_P}