diff options
| author | Jason E. Hale <jhale@FreeBSD.org> | 2018-01-22 05:43:07 +0800 |
|---|---|---|
| committer | Jason E. Hale <jhale@FreeBSD.org> | 2018-01-22 05:43:07 +0800 |
| commit | eeff194e321c47d09f67b40c0a26b142fe7ae0e5 (patch) | |
| tree | 42f20419e80fd24fa5d064cfba2a27d8f98f801b /misc | |
| parent | 26195c1ed9075e82cc89c24d08205fb0a0d17fe3 (diff) | |
| download | freebsd-ports-gnome-eeff194e321c47d09f67b40c0a26b142fe7ae0e5.tar.gz freebsd-ports-gnome-eeff194e321c47d09f67b40c0a26b142fe7ae0e5.tar.zst freebsd-ports-gnome-eeff194e321c47d09f67b40c0a26b142fe7ae0e5.zip | |
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
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/krecipes-kde4/Makefile | 2 | ||||
| -rw-r--r-- | misc/krecipes-kde4/files/patch-src_dialogs_setupdisplay.cpp | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/misc/krecipes-kde4/Makefile b/misc/krecipes-kde4/Makefile index 45f85fca4e99..c7b13da88556 100644 --- a/misc/krecipes-kde4/Makefile +++ b/misc/krecipes-kde4/Makefile @@ -2,7 +2,7 @@ PORTNAME= krecipes DISTVERSION= 2.0-beta2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= misc kde MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} diff --git a/misc/krecipes-kde4/files/patch-src_dialogs_setupdisplay.cpp b/misc/krecipes-kde4/files/patch-src_dialogs_setupdisplay.cpp new file mode 100644 index 000000000000..2235452eb43c --- /dev/null +++ b/misc/krecipes-kde4/files/patch-src_dialogs_setupdisplay.cpp @@ -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; |