svn commit: r414882 - in branches/2016Q2/deskutils/easystroke: . files
Dimitry Andric
dim at FreeBSD.org
Mon May 9 19:02:09 UTC 2016
Author: dim (src committer)
Date: Mon May 9 19:02:08 2016
New Revision: 414882
URL: https://svnweb.freebsd.org/changeset/ports/414882
Log:
MFH: r414807
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: portmgr (feld)
PR: 209372
Added:
branches/2016Q2/deskutils/easystroke/files/patch-handler.cc
- copied unchanged from r414807, head/deskutils/easystroke/files/patch-handler.cc
Modified:
branches/2016Q2/deskutils/easystroke/Makefile
Directory Properties:
branches/2016Q2/ (props changed)
Modified: branches/2016Q2/deskutils/easystroke/Makefile
==============================================================================
--- branches/2016Q2/deskutils/easystroke/Makefile Mon May 9 18:44:48 2016 (r414881)
+++ branches/2016Q2/deskutils/easystroke/Makefile Mon May 9 19:02:08 2016 (r414882)
@@ -3,7 +3,7 @@
PORTNAME= easystroke
PORTVERSION= 0.6.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
Copied: branches/2016Q2/deskutils/easystroke/files/patch-handler.cc (from r414807, head/deskutils/easystroke/files/patch-handler.cc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2016Q2/deskutils/easystroke/files/patch-handler.cc Mon May 9 19:02:08 2016 (r414882, copy of r414807, head/deskutils/easystroke/files/patch-handler.cc)
@@ -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;
More information about the svn-ports-all
mailing list