From owner-svn-ports-head@freebsd.org Tue Jan 16 13:26:45 2018 Return-Path: Delivered-To: svn-ports-head@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 D7E10E6E4D0; Tue, 16 Jan 2018 13:26:45 +0000 (UTC) (envelope-from rakuco@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 B1C8279570; Tue, 16 Jan 2018 13:26:45 +0000 (UTC) (envelope-from rakuco@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 ECF8220F95; Tue, 16 Jan 2018 13:26:44 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0GDQi5E074366; Tue, 16 Jan 2018 13:26:44 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0GDQidO074365; Tue, 16 Jan 2018 13:26:44 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201801161326.w0GDQidO074365@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Tue, 16 Jan 2018 13:26:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459167 - head/graphics/digikam-kde4/files X-SVN-Group: ports-head X-SVN-Commit-Author: rakuco X-SVN-Commit-Paths: head/graphics/digikam-kde4/files X-SVN-Commit-Revision: 459167 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jan 2018 13:26:45 -0000 Author: rakuco Date: Tue Jan 16 13:26:44 2018 New Revision: 459167 URL: https://svnweb.freebsd.org/changeset/ports/459167 Log: Fix the build with clang 6.0, which defaults to using -std=gnu++14. /wrkdirs/usr/ports/graphics/digikam-kde4/work/digikam-4.14.0/core/libs/dimg/loaders/pgfloader.cpp:301:27: error: use of undeclared identifier 'NULL' NULL, ^ /usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL' #define NULL nullptr ^ /usr/local/include/libpgf/PGFplatform.h:488:20: note: expanded from macro 'nullptr' #define nullptr NULL ^ /wrkdirs/usr/ports/graphics/digikam-kde4/work/digikam-4.14.0/core/libs/dimg/loaders/pgfloader.cpp:461:26: error: use of undeclared identifier 'NULL' NULL, ^ /usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL' #define NULL nullptr ^ /usr/local/include/libpgf/PGFplatform.h:488:20: note: expanded from macro 'nullptr' #define nullptr NULL ^ PR: 224945 Added: head/graphics/digikam-kde4/files/patch-libs_dimg_loaders_pgfloader.cpp (contents, props changed) Added: head/graphics/digikam-kde4/files/patch-libs_dimg_loaders_pgfloader.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/digikam-kde4/files/patch-libs_dimg_loaders_pgfloader.cpp Tue Jan 16 13:26:44 2018 (r459167) @@ -0,0 +1,40 @@ +Fixes the build with clang 6.0, which defaults to -std=gnu++14: + + /wrkdirs/usr/ports/graphics/digikam-kde4/work/digikam-4.14.0/core/libs/dimg/loaders/pgfloader.cpp:301:27: error: use of undeclared identifier 'NULL' + NULL, + ^ + /usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL' + #define NULL nullptr + ^ + /usr/local/include/libpgf/PGFplatform.h:488:20: note: expanded from macro 'nullptr' + #define nullptr NULL + ^ + /wrkdirs/usr/ports/graphics/digikam-kde4/work/digikam-4.14.0/core/libs/dimg/loaders/pgfloader.cpp:461:26: error: use of undeclared identifier 'NULL' + NULL, + ^ + /usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL' + #define NULL nullptr + ^ + /usr/local/include/libpgf/PGFplatform.h:488:20: note: expanded from macro 'nullptr' + #define nullptr NULL + ^ +--- libs/dimg/loaders/pgfloader.cpp.orig 2018-01-16 12:23:12 UTC ++++ libs/dimg/loaders/pgfloader.cpp +@@ -298,7 +298,7 @@ bool PGFLoader::load(const QString& filePath, DImgLoad + pgf.GetBitmap(m_sixteenBit ? width * 8 : width * 4, + (UINT8*)data, + m_sixteenBit ? 64 : 32, +- NULL, ++ nullptr, + CallbackForLibPGF, this); + + if (observer) +@@ -458,7 +458,7 @@ bool PGFLoader::save(const QString& filePath, DImgLoad + pgf.ImportBitmap(4 * imageWidth() * (imageSixteenBit() ? 2 : 1), + (UINT8*)imageData(), + imageBitsDepth() * 4, +- NULL, ++ nullptr, + CallbackForLibPGF, this); + + UINT32 nWrittenBytes = 0;