From owner-svn-ports-all@freebsd.org Sun Jan 21 21:43:08 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C48D4EBD222; Sun, 21 Jan 2018 21:43:08 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9EC777DC26; Sun, 21 Jan 2018 21:43:08 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C47051150E; Sun, 21 Jan 2018 21:43:07 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0LLh7tS057408; Sun, 21 Jan 2018 21:43:07 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0LLh7LU057406; Sun, 21 Jan 2018 21:43:07 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201801212143.w0LLh7LU057406@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Sun, 21 Jan 2018 21:43:07 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: jhale X-SVN-Commit-Paths: in head/misc/krecipes-kde4: . files X-SVN-Commit-Revision: 459629 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jan 2018 21:43:08 -0000 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') 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') 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;