wxWidgets-3.0: upstream patch for abs()

This upstream patch fixes a build failure with some newer compilers. Closes: https://trac.macports.org/ticket/53516 See: wxWidgets/wxWidgets#222
macports · Feb 9, 2017 · dabbaa7 · dabbaa7
1 parent aa6a8cc
commit dabbaa7
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/graphics/wxWidgets-3.0/Portfile b/graphics/wxWidgets-3.0/Portfile
@@ -87,6 +87,7 @@ depends_run         port:wxWidgets-common \
 
 patchfiles-append   patch-configure.diff \
                     patch-upstream-src-osx-carbon-fontdlgosx.mm.diff \
+                    patch-upstream-src-stc-scintilla-src-Editor.cxx.diff \
                     patch-upstream-webkit-proper-types.diff
 
 if {${subport} eq "wxWidgets-3.0-libcxx"} {

diff --git a/graphics/wxWidgets-3.0/files/patch-upstream-src-stc-scintilla-src-Editor.cxx.diff b/graphics/wxWidgets-3.0/files/patch-upstream-src-stc-scintilla-src-Editor.cxx.diff
@@ -0,0 +1,27 @@
+# An upstream patch for abs()
+#
+# - https://github.com/wxWidgets/wxWidgets/commit/73e9e18ea09ffffcaac50237def0d9728a213c02
+# - https://trac.macports.org/ticket/53516
+# - https://github.com/wxWidgets/wxWidgets/pull/222
+--- src/stc/scintilla/src/Editor.cxx.orig
++++ src/stc/scintilla/src/Editor.cxx
+@@ -11,6 +11,7 @@
+ #include <ctype.h>
+ #include <assert.h>
+
++#include <cmath>
+ #include <string>
+ #include <vector>
+ #include <map>
+@@ -5841,9 +5842,9 @@ void Editor::GoToLine(int lineNo) {
+ }
+
+ static bool Close(Point pt1, Point pt2) {
+-	if (abs(pt1.x - pt2.x) > 3)
++	if (std::abs(pt1.x - pt2.x) > 3)
+ 		return false;
+-	if (abs(pt1.y - pt2.y) > 3)
++	if (std::abs(pt1.y - pt2.y) > 3)
+ 		return false;
+ 	return true;
+ }