Date: Tue, 16 Jan 2018 13:26:44 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459167 - head/graphics/digikam-kde4/files Message-ID: <201801161326.w0GDQidO074365@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801161326.w0GDQidO074365>