Date: Tue, 20 Mar 2018 13:01:43 +0000 (UTC) From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465086 - head/graphics/dspdfviewer/files Message-ID: <201803201301.w2KD1hmV013824@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adridg Date: Tue Mar 20 13:01:42 2018 New Revision: 465086 URL: https://svnweb.freebsd.org/changeset/ports/465086 Log: Fix graphics/dspdfviewer build with modern Clang. The error message is in the (new) patch. PR: 226524 Approved by: tcberner (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D14652 Added: head/graphics/dspdfviewer/files/patch-hyperlinkarea.cpp (contents, props changed) Added: head/graphics/dspdfviewer/files/patch-hyperlinkarea.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/dspdfviewer/files/patch-hyperlinkarea.cpp Tue Mar 20 13:01:42 2018 (r465086) @@ -0,0 +1,18 @@ +Fix build with modern Clang + +../hyperlinkarea.cpp:35:18: error: zero as null pointer constant [-Werror,-Wzero-as-null-pointer-constant] + if ( pixmap == 0 ) + ^ + nullptr + +--- hyperlinkarea.cpp.orig 2018-03-11 12:58:40 UTC ++++ hyperlinkarea.cpp +@@ -32,7 +32,7 @@ HyperlinkArea::HyperlinkArea(QLabel* ima + throw WrongLinkType(); + QRect mySize; + const QPixmap* pixmap = imageLabel->pixmap(); +- if ( pixmap == 0 ) ++ if ( pixmap == nullptr ) + throw /** FIXME Exception **/ std::runtime_error("Tried to construct a HyperlinkArea from an image label without a pixmap"); + + QRectF sizeWithinImageLabel = link.linkArea();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803201301.w2KD1hmV013824>