Date: Sun, 28 Oct 2018 11:03:01 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483272 - head/graphics/inkscape/files Message-ID: <201810281103.w9SB31jS086163@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Oct 28 11:03:01 2018 New Revision: 483272 URL: https://svnweb.freebsd.org/changeset/ports/483272 Log: graphics/inkscape: unbreak on 32-bit archs after r474795 src/libavoid/connector.cpp:888:29: error: call to 'abs' is ambiguous COLA_ASSERT(abs((long)i->pathNext->id.objID - i->id.objID) != 2); ^~~ src/libavoid/assertions.h:41:39: note: expanded from macro 'COLA_ASSERT' #define COLA_ASSERT(expr) assert(expr) ^~~~ /usr/include/assert.h:56:21: note: expanded from macro 'assert' #define assert(e) ((e) ? (void)0 : __assert(__func__, __FILE__, \ ^ /usr/include/c++/v1/math.h:733:1: note: candidate function abs(float __lcpp_x) _NOEXCEPT {return ::fabsf(__lcpp_x);} ^ /usr/include/c++/v1/math.h:737:1: note: candidate function abs(double __lcpp_x) _NOEXCEPT {return ::fabs(__lcpp_x);} ^ /usr/include/c++/v1/math.h:741:1: note: candidate function abs(long double __lcpp_x) _NOEXCEPT {return ::fabsl(__lcpp_x);} ^ /usr/include/stdlib.h:87:6: note: candidate function int abs(int) __pure2; ^ /usr/include/c++/v1/stdlib.h:111:44: note: candidate function inline _LIBCPP_INLINE_VISIBILITY long abs( long __x) _NOEXCEPT {return labs(__x);} ^ /usr/include/c++/v1/stdlib.h:113:44: note: candidate function inline _LIBCPP_INLINE_VISIBILITY long long abs(long long __x) _NOEXCEPT {return llabs(__x);} ^ PR: 229844 Reported by: pkg-fallout Added: head/graphics/inkscape/files/patch-src_libavoid_connector.cpp (contents, props changed) Added: head/graphics/inkscape/files/patch-src_libavoid_connector.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/inkscape/files/patch-src_libavoid_connector.cpp Sun Oct 28 11:03:01 2018 (r483272) @@ -0,0 +1,39 @@ +src/libavoid/connector.cpp:888:29: error: call to 'abs' is ambiguous + COLA_ASSERT(abs((long)i->pathNext->id.objID - i->id.objID) != 2); + ^~~ +src/libavoid/assertions.h:41:39: note: expanded from macro 'COLA_ASSERT' + #define COLA_ASSERT(expr) assert(expr) + ^~~~ +/usr/include/assert.h:56:21: note: expanded from macro 'assert' +#define assert(e) ((e) ? (void)0 : __assert(__func__, __FILE__, \ + ^ +/usr/include/c++/v1/math.h:733:1: note: candidate function +abs(float __lcpp_x) _NOEXCEPT {return ::fabsf(__lcpp_x);} +^ +/usr/include/c++/v1/math.h:737:1: note: candidate function +abs(double __lcpp_x) _NOEXCEPT {return ::fabs(__lcpp_x);} +^ +/usr/include/c++/v1/math.h:741:1: note: candidate function +abs(long double __lcpp_x) _NOEXCEPT {return ::fabsl(__lcpp_x);} +^ +/usr/include/stdlib.h:87:6: note: candidate function +int abs(int) __pure2; + ^ +/usr/include/c++/v1/stdlib.h:111:44: note: candidate function +inline _LIBCPP_INLINE_VISIBILITY long abs( long __x) _NOEXCEPT {return labs(__x);} + ^ +/usr/include/c++/v1/stdlib.h:113:44: note: candidate function +inline _LIBCPP_INLINE_VISIBILITY long long abs(long long __x) _NOEXCEPT {return llabs(__x);} + ^ + +--- src/libavoid/connector.cpp.orig 2018-03-11 20:38:09 UTC ++++ src/libavoid/connector.cpp +@@ -885,7 +885,7 @@ bool ConnRef::generatePath(void) + { + // Check for consecutive points on opposite + // corners of two touching shapes. +- COLA_ASSERT(abs((long)i->pathNext->id.objID - i->id.objID) != 2); ++ COLA_ASSERT(abs((long)(i->pathNext->id.objID - i->id.objID)) != 2); + } + } + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810281103.w9SB31jS086163>