diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-05-08 12:05:52 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-05-08 12:05:52 +0000 |
| commit | e195078b9f2d0d5fa35b101c405c1ce91afe34a5 (patch) | |
| tree | ab5d024211f6edeb5ebbea9a1220de44b8fc79c2 /deskutils | |
| parent | Include GNUTLS in the default options since apparently it does help (diff) | |
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
Notes
Notes:
svn path=/head/; revision=414807
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/easystroke/Makefile | 2 | ||||
| -rw-r--r-- | deskutils/easystroke/files/patch-handler.cc | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/deskutils/easystroke/Makefile b/deskutils/easystroke/Makefile index 2fc5db73d07b..8ccb8e9f595f 100644 --- a/deskutils/easystroke/Makefile +++ b/deskutils/easystroke/Makefile @@ -3,7 +3,7 @@ PORTNAME= easystroke PORTVERSION= 0.6.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} diff --git a/deskutils/easystroke/files/patch-handler.cc b/deskutils/easystroke/files/patch-handler.cc new file mode 100644 index 000000000000..d717f6d80b9b --- /dev/null +++ b/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; |