Hello community, here is the log from the commit of package wxWidgets-3_0 for openSUSE:Factory checked in at 2016-06-19 10:50:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wxWidgets-3_0 (Old) and /work/SRC/openSUSE:Factory/.wxWidgets-3_0.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wxWidgets-3_0" Changes: -------- --- /work/SRC/openSUSE:Factory/wxWidgets-3_0/wxWidgets-3_0.changes 2016-03-07 13:24:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wxWidgets-3_0.new/wxWidgets-3_0.changes 2016-06-19 10:50:20.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 17 07:19:49 UTC 2016 - [email protected] + +- Add abs.diff to reenable successful gcc6 build + +------------------------------------------------------------------- New: ---- abs.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxGTK3-3_0.spec ++++++ --- /var/tmp/diff_new_pack.vBxZ11/_old 2016-06-19 10:50:22.000000000 +0200 +++ /var/tmp/diff_new_pack.vBxZ11/_new 2016-06-19 10:50:22.000000000 +0200 @@ -54,6 +54,7 @@ Patch12: 0003-Don-t-use-frame-extents-when-not-using-X11-in-wxGTK.patch Patch13: 0004-Don-t-crash-when-switching-to-full-screen-in-non-X11.patch Patch14: 0005-Don-t-use-X11-only-functions-when-not-using-X11-in-w.patch +Patch15: abs.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel BuildRequires: autoconf @@ -225,7 +226,7 @@ echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}" %setup -q -n %tarball_name-%version %patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -P 8 -P 9 -p1 -%patch -P 10 -P 11 -P 12 -P 13 -P 14 -p1 +%patch -P 10 -P 11 -P 12 -P 13 -P 14 -P 15 -p1 cp %{S:2} . %build wxWidgets-3_0.spec: same change ++++++ abs.diff ++++++ From: Jan Engelhardt <[email protected]> Date: 2016-06-17 08:08:34.610326109 +0200 Pick one of the abses and move on. ./src/stc/scintilla/src/Editor.cxx:5844:23: error: call of overloaded 'abs(XYPOSITION)' is ambiguous if (abs(pt1.x - pt2.x) > 3) ./src/stc/scintilla/src/Editor.cxx:5846:23: error: call of overloaded 'abs(XYPOSITION)' is ambiguous if (abs(pt1.y - pt2.y) > 3) --- src/stc/scintilla/src/Editor.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: wxWidgets-3.0.2/src/stc/scintilla/src/Editor.cxx =================================================================== --- wxWidgets-3.0.2.orig/src/stc/scintilla/src/Editor.cxx +++ wxWidgets-3.0.2/src/stc/scintilla/src/Editor.cxx @@ -981,7 +981,7 @@ void Editor::ScrollTo(int line, bool mov // Try to optimise small scrolls #ifndef UNDER_CE int linesToMove = topLine - topLineNew; - bool performBlit = (abs(linesToMove) <= 10) && (paintState == notPainting); + bool performBlit = (abs(static_cast<int>(linesToMove)) <= 10) && (paintState == notPainting); willRedrawAll = !performBlit; #endif SetTopLine(topLineNew); @@ -5841,9 +5841,9 @@ void Editor::GoToLine(int lineNo) { } static bool Close(Point pt1, Point pt2) { - if (abs(pt1.x - pt2.x) > 3) + if (abs(static_cast<int>(pt1.x - pt2.x)) > 3) return false; - if (abs(pt1.y - pt2.y) > 3) + if (abs(static_cast<int>(pt1.y - pt2.y)) > 3) return false; return true; }
