From owner-svn-ports-branches@freebsd.org Sun Oct 28 11:03:50 2018 Return-Path: Delivered-To: svn-ports-branches@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 75BF3108656A; Sun, 28 Oct 2018 11:03:50 +0000 (UTC) (envelope-from jbeich@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 28CE27C9BB; Sun, 28 Oct 2018 11:03:50 +0000 (UTC) (envelope-from jbeich@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 09C0B1E867; Sun, 28 Oct 2018 11:03:50 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9SB3ncY086328; Sun, 28 Oct 2018 11:03:49 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9SB3nHN086327; Sun, 28 Oct 2018 11:03:49 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201810281103.w9SB3nHN086327@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 28 Oct 2018 11:03:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483273 - branches/2018Q4/graphics/inkscape/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q4/graphics/inkscape/files X-SVN-Commit-Revision: 483273 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2018 11:03:50 -0000 Author: jbeich Date: Sun Oct 28 11:03:49 2018 New Revision: 483273 URL: https://svnweb.freebsd.org/changeset/ports/483273 Log: MFH: r483272 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 Approved by: ports-secteam blanket Added: branches/2018Q4/graphics/inkscape/files/patch-src_libavoid_connector.cpp - copied unchanged from r483272, head/graphics/inkscape/files/patch-src_libavoid_connector.cpp Modified: Directory Properties: branches/2018Q4/ (props changed) Copied: branches/2018Q4/graphics/inkscape/files/patch-src_libavoid_connector.cpp (from r483272, head/graphics/inkscape/files/patch-src_libavoid_connector.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/graphics/inkscape/files/patch-src_libavoid_connector.cpp Sun Oct 28 11:03:49 2018 (r483273, copy of r483272, head/graphics/inkscape/files/patch-src_libavoid_connector.cpp) @@ -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); + } + } + }