Date: Sun, 8 May 2016 12:05:52 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414807 - in head/deskutils/easystroke: . files Message-ID: <201605081205.u48C5qqZ020912@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim (src committer) Date: Sun May 8 12:05:52 2016 New Revision: 414807 URL: https://svnweb.freebsd.org/changeset/ports/414807 Log: During the exp-run in bug 208158, it was found that deskutils/easystroke gives errors with libc++ 3.8.0: handler.cc:536:21: error: static declaration of 'abs' follows non-static declaration static inline float abs(float x) { return x > 0 ? x : -x; } ^ /usr/include/c++/v1/math.h:646:1: note: previous definition is here abs(float __lcpp_x) _NOEXCEPT {return fabsf(__lcpp_x);} ^ This is because easystroke tries to roll its own version of abs(), which is already defined in math.h. Fix this by removing the custom abs(). Approved by: t@tobik.me (maintainer) PR: 209372 MFH: 2016Q2 Added: head/deskutils/easystroke/files/patch-handler.cc (contents, props changed) Modified: head/deskutils/easystroke/Makefile Modified: head/deskutils/easystroke/Makefile ============================================================================== --- head/deskutils/easystroke/Makefile Sun May 8 11:51:23 2016 (r414806) +++ head/deskutils/easystroke/Makefile Sun May 8 12:05:52 2016 (r414807) @@ -3,7 +3,7 @@ PORTNAME= easystroke PORTVERSION= 0.6.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} Added: head/deskutils/easystroke/files/patch-handler.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/easystroke/files/patch-handler.cc Sun May 8 12:05:52 2016 (r414807) @@ -0,0 +1,11 @@ +--- handler.cc.orig 2013-03-27 15:52:38 UTC ++++ handler.cc +@@ -533,8 +533,6 @@ public: + virtual Grabber::State grab_mode() { return parent->grab_mode(); } + }; + +-static inline float abs(float x) { return x > 0 ? x : -x; } +- + class AbstractScrollHandler : public Handler { + bool have_x, have_y; + float last_x, last_y;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605081205.u48C5qqZ020912>