From owner-svn-ports-all@freebsd.org  Tue Mar 20 13:01:43 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7B961F4B8B6;
 Tue, 20 Mar 2018 13:01:43 +0000 (UTC)
 (envelope-from adridg@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 3111A71BCF;
 Tue, 20 Mar 2018 13:01:43 +0000 (UTC)
 (envelope-from adridg@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 2BEE51D273;
 Tue, 20 Mar 2018 13:01:43 +0000 (UTC)
 (envelope-from adridg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2KD1hEm013825;
 Tue, 20 Mar 2018 13:01:43 GMT (envelope-from adridg@FreeBSD.org)
Received: (from adridg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2KD1hmV013824;
 Tue, 20 Mar 2018 13:01:43 GMT (envelope-from adridg@FreeBSD.org)
Message-Id: <201803201301.w2KD1hmV013824@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adridg set sender to
 adridg@FreeBSD.org using -f
From: Adriaan de Groot <adridg@FreeBSD.org>
Date: Tue, 20 Mar 2018 13:01:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r465086 - head/graphics/dspdfviewer/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: adridg
X-SVN-Commit-Paths: head/graphics/dspdfviewer/files
X-SVN-Commit-Revision: 465086
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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Mar 2018 13:01:43 -0000

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();