Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 21 Jan 2018 21:43:07 +0000 (UTC)
From:      "Jason E. Hale" <jhale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r459629 - in head/misc/krecipes-kde4: . files
Message-ID:  <201801212143.w0LLh7LU057406@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jhale
Date: Sun Jan 21 21:43:07 2018
New Revision: 459629
URL: https://svnweb.freebsd.org/changeset/ports/459629

Log:
  Fix build with clang 6 and bump PORTREVISION since the code was wrong in any
  case
  
  src/dialogs/setupdisplay.cpp:567:41: error: reference to type 'const KFontChooser::DisplayFlags' (aka 'const QFlags<KFontChooser::DisplayFlag>') could not bind to an rvalue of type 'bool'
          if ( KFontDialog::getFont( item->font, false, view() ) == QDialog::Accepted ) {
                                                 ^~~~~
  /usr/local/include/kde4/kfontdialog.h:134:57: note: passing argument to parameter 'flags' here
                        const KFontChooser::DisplayFlags& flags =
                                                          ^
  
  Reported by:	pkg-fallout

Added:
  head/misc/krecipes-kde4/files/patch-src_dialogs_setupdisplay.cpp   (contents, props changed)
Modified:
  head/misc/krecipes-kde4/Makefile

Modified: head/misc/krecipes-kde4/Makefile
==============================================================================
--- head/misc/krecipes-kde4/Makefile	Sun Jan 21 21:17:11 2018	(r459628)
+++ head/misc/krecipes-kde4/Makefile	Sun Jan 21 21:43:07 2018	(r459629)
@@ -2,7 +2,7 @@
 
 PORTNAME=	krecipes
 DISTVERSION=	2.0-beta2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	misc kde
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
 

Added: head/misc/krecipes-kde4/files/patch-src_dialogs_setupdisplay.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/krecipes-kde4/files/patch-src_dialogs_setupdisplay.cpp	Sun Jan 21 21:43:07 2018	(r459629)
@@ -0,0 +1,20 @@
+Fix build with clang 6
+
+src/dialogs/setupdisplay.cpp:567:41: error: reference to type 'const KFontChooser::DisplayFlags' (aka 'const QFlags<KFontChooser::DisplayFlag>') could not bind to an rvalue of type 'bool'
+        if ( KFontDialog::getFont( item->font, false, view() ) == QDialog::Accepted ) {
+                                               ^~~~~
+/usr/local/include/kde4/kfontdialog.h:134:57: note: passing argument to parameter 'flags' here
+                      const KFontChooser::DisplayFlags& flags =
+                                                        ^
+
+--- src/dialogs/setupdisplay.cpp.orig	2018-01-21 21:28:58 UTC
++++ src/dialogs/setupdisplay.cpp
+@@ -564,7 +564,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;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801212143.w0LLh7LU057406>