Date: Mon, 6 Apr 2020 15:42:21 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r530885 - head/graphics/hdr_tools/files Message-ID: <202004061542.036FgLQv029675@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Mon Apr 6 15:42:20 2020 New Revision: 530885 URL: https://svnweb.freebsd.org/changeset/ports/530885 Log: Unbreak the build: as of recently, <assert.h> header file must be included before <Magick++.h> because of the following conflict: [...]: error: use of undeclared identifier '__assert'; did you mean 'MagickCore::__assert'? assert( file.colorSpace() == Magick::sRGBColorspace ); ^ /usr/include/assert.h:56:36: note: expanded from macro 'assert' #define assert(e) ((e) ? (void)0 : __assert(__func__, __FILE__, \ /usr/include/assert.h:77:6: note: 'MagickCore::__assert' declared here void __assert(const char *, const char *, int, const char *) __dead2; Reported by: pkg-fallout Added: head/graphics/hdr_tools/files/patch-headers.hh (contents, props changed) Added: head/graphics/hdr_tools/files/patch-headers.hh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/hdr_tools/files/patch-headers.hh Mon Apr 6 15:42:20 2020 (r530885) @@ -0,0 +1,18 @@ +--- headers.hh.orig 2010-11-23 21:22:52 UTC ++++ headers.hh +@@ -30,6 +30,7 @@ + + + ++#include <assert.h> + #include <popt.h> + #include <tiff.h> + #include <tiffio.h> +@@ -61,7 +62,6 @@ + #include <cmath> + + +-#include <assert.h> + #include <stdlib.h> + #include <math.h> + #include <stdint.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004061542.036FgLQv029675>