[pkgsrc/trunk]: pkgsrc/editors/obby Resolve conflicting type resolution for s...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/84e4e4415cd6
branches:  trunk
changeset: 414468:84e4e4415cd6
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Mar 27 20:58:12 2020 +0000

description:
Resolve conflicting type resolution for std::abs.

diffstat:

 editors/obby/distinfo                     |   3 ++-
 editors/obby/patches/patch-src_colour.cpp |  17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)

diffs (34 lines):

diff -r 33e108ce9dc7 -r 84e4e4415cd6 editors/obby/distinfo
--- a/editors/obby/distinfo     Fri Mar 27 20:57:34 2020 +0000
+++ b/editors/obby/distinfo     Fri Mar 27 20:58:12 2020 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2016/02/10 08:09:37 mef Exp $
+$NetBSD: distinfo,v 1.5 2020/03/27 20:58:12 joerg Exp $
 
 SHA1 (obby-0.4.8.tar.gz) = 49de7813bb56b249d2e6f0b6b014ae3b850d8987
 RMD160 (obby-0.4.8.tar.gz) = 9b45340938cd0a85e379deab553be7396851366b
 SHA512 (obby-0.4.8.tar.gz) = 39cd01e74f8df805bd6f077afab023f70f6da16d421dd0d12abc82972a9ec3e2563cc4ef6bf99c74b59f1c96e18eb3d5065f8b07add8ecb56c26601715f184d0
 Size (obby-0.4.8.tar.gz) = 530525 bytes
 SHA1 (patch-aa) = 044bf10cfa88475b8d2d25d349bf1c01cd853b05
+SHA1 (patch-src_colour.cpp) = 6def696ab0de7ccc8b034972a9738283e9b60fa6
diff -r 33e108ce9dc7 -r 84e4e4415cd6 editors/obby/patches/patch-src_colour.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/obby/patches/patch-src_colour.cpp Fri Mar 27 20:58:12 2020 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_colour.cpp,v 1.1 2020/03/27 20:58:12 joerg Exp $
+
+--- src/colour.cpp.orig        2020-03-27 18:01:51.643167816 +0000
++++ src/colour.cpp
+@@ -47,9 +47,9 @@ unsigned int obby::colour::get_blue() co
+ bool obby::colour::similar_colour(const colour& colour) const
+ {
+       // TODO: Convert to HSV for better checking
+-      return abs(m_red - colour.m_red) +
+-             abs(m_green - colour.m_green) +
+-             abs(m_blue - colour.m_blue) < 32;
++      return abs(int(m_red - colour.m_red)) +
++             abs(int(m_green - colour.m_green)) +
++             abs(int(m_blue - colour.m_blue)) < 32;
+ }
+ 
+ std::string serialise::default_context_to<obby::colour>::