diff --git a/desktop/toolkit/wxGTK/files/wxgtk-gcc6.patch b/desktop/toolkit/wxGTK/files/wxgtk-gcc6.patch new file mode 100644 index 0000000000..119175c624 --- /dev/null +++ b/desktop/toolkit/wxGTK/files/wxgtk-gcc6.patch @@ -0,0 +1,39 @@ +From 73e9e18ea09ffffcaac50237def0d9728a213c02 Mon Sep 17 00:00:00 2001 +From: Scott Talbert +Date: Sat, 20 Feb 2016 00:08:14 -0500 +Subject: [PATCH] Fix STC compilation with GCC6 + +Use std::abs() from instead of abs() from to avoid problems +with ambiguous overloads. + +Closes #17147. + +Closes https://github.com/wxWidgets/wxWidgets/pull/222 +--- + src/stc/scintilla/src/Editor.cxx | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx +index cd72953..2081df2 100644 +--- a/src/stc/scintilla/src/Editor.cxx ++++ b/src/stc/scintilla/src/Editor.cxx +@@ -11,6 +11,7 @@ + #include + #include + ++#include + #include + #include + #include +@@ -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; + } diff --git a/desktop/toolkit/wxGTK/pspec.xml b/desktop/toolkit/wxGTK/pspec.xml index fd139cd07f..66bcb00cfd 100644 --- a/desktop/toolkit/wxGTK/pspec.xml +++ b/desktop/toolkit/wxGTK/pspec.xml @@ -26,10 +26,13 @@ mesa-glu-devel webkit-gtk2-devel libjpeg-turbo-devel + gconf-devel gst-plugins-base-devel + gst-plugins-base-next-devel make-abicheck-non-fatal.patch + wxgtk-gcc6.patch @@ -79,7 +82,7 @@ - 2017-04-08 + 2017-04-09 3.0.2 Release Bump Kamil Atlı