- updated to 3.0.3

- gcc6.patch obsolete

diff --git a/gcc6.patch b/gcc6.patch
deleted file mode 100644 (file)
index 4da3bbb..0000000
--- a/gcc6.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-commit 73e9e18ea09ffffcaac50237def0d9728a213c02
-Author: Scott Talbert <swt@techie.net>
-Date:   Sat Feb 20 00:08:14 2016 -0500
-
-    Fix STC compilation with GCC6
-    
-    Use std::abs() from <cmath> instead of abs() from <math.h> to avoid problems
-    with ambiguous overloads.
-    
-    Closes #17147.
-    
-    Closes https://github.com/wxWidgets/wxWidgets/pull/222
-
-diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx
-index cd72953a..2081df28 100644
---- a/src/stc/scintilla/src/Editor.cxx
-+++ b/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;
- }
---- wxWidgets-3.0.2/utils/ifacecheck/src/xmlparser.cpp~        2014-10-06 23:33:44.000000000 +0200
-+++ wxWidgets-3.0.2/utils/ifacecheck/src/xmlparser.cpp 2017-04-16 02:00:59.184716773 +0200
-@@ -570,7 +570,7 @@
-             if (!parent) {
-                 wxLogError("Could not find parent '%s' of class '%s'...",
-                          m_parents[i], GetName());
--                return false;
-+                return NULL;
-             }
- 
-             const wxMethod *parentMethod = parent->RecursiveUpwardFindMethod(m, allclasses);

diff --git a/wxWidgets.spec b/wxWidgets.spec
index dca132b91439b840a7fc1516fd489bf5149e23d2..23425a74634116ddadeae2043cedabdf4c975c31 100644 (file)
--- a/wxWidgets.spec
+++ b/wxWidgets.spec
@@ -13,12 +13,12 @@ Summary:    wxWidgets library
 Summary(pl.UTF-8):     Biblioteka wxWidgets
 Name:          wxWidgets
 %define majver 3.0
-Version:       3.0.2
-Release:       6
+Version:       3.0.3
+Release:       1
 License:       wxWindows Library Licence 3.1 (LGPL v2+ with exception)
 Group:         X11/Libraries
-Source0:       http://downloads.sourceforge.net/wxwindows/%{name}-%{version}.tar.bz2
-# Source0-md5: ba4cd1f3853d0cd49134c5ae028ad080
+Source0:       https://github.com/wxWidgets/wxWidgets/releases/download/v%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5: ba23578300f33eeb26bc75894b9aaf11
 Patch0:                %{name}-samples.patch
 Patch1:                %{name}-ac.patch
 Patch2:                %{name}-link.patch
@@ -26,7 +26,6 @@ Patch3:               export-wxGetRootWindow.patch
 Patch4:                %{name}-c++.patch
 Patch5:                %{name}-gifdelay.patch
 Patch6:                relax-abicheck.patch
-Patch7:                gcc6.patch
 URL:           http://www.wxWidgets.org/
 %{?with_directfb:BuildRequires:        DirectFB-devel >= 0.9.23}
 BuildRequires: OpenGL-GLU-devel
@@ -783,7 +782,6 @@ obsługą UNICODE.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 %{__rm} build/aclocal/bakefile*.m4