[mingw-wxWidgets] make wxString::ToULongLong work
sailer
sailer at fedoraproject.org
Thu Feb 19 14:42:31 UTC 2015
commit f6eb900f2ea9c92655e0668265e7998660772e9c
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date: Thu Feb 19 15:42:13 2015 +0100
make wxString::ToULongLong work
mingw-wxWidgets.spec | 7 ++++++-
wxWidgets-2.8.12-strtoull.patch | 15 +++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
---
diff --git a/mingw-wxWidgets.spec b/mingw-wxWidgets.spec
index 8f4d8b2..2cf68c9 100644
--- a/mingw-wxWidgets.spec
+++ b/mingw-wxWidgets.spec
@@ -8,13 +8,14 @@
Summary: MinGW port of the wxWidgets GUI library
Name: mingw-%{mingw_pkg_name}
Version: 2.8.12
-Release: 16%{?dist}
+Release: 17%{?dist}
License: wxWidgets
Group: Development/Libraries
URL: http://wxwidgets.org
Source: http://prdownloads.sourceforge.net/wxwindows/wxWidgets-%{version}.tar.gz
Patch0: wxWidgets-2.8.12-mingw64-1.patch
+Patch1: wxWidgets-2.8.12-strtoull.patch
BuildArch: noarch
BuildRequires: mingw32-filesystem >= 68
BuildRequires: mingw64-filesystem >= 68
@@ -83,6 +84,7 @@ mingw64-%{mingw_pkg_name} development.
%prep
%setup -q -n wxWidgets-%{version}
%patch0 -p1 -b .mingw64
+%patch1 -p1 -b .strtoull
#==========================================
%build
@@ -257,6 +259,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/bakefile
%changelog
+* Thu Feb 19 2015 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.8.12-17
+- make wxString::ToULongLong work
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.12-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/wxWidgets-2.8.12-strtoull.patch b/wxWidgets-2.8.12-strtoull.patch
new file mode 100644
index 0000000..9c9cc48
--- /dev/null
+++ b/wxWidgets-2.8.12-strtoull.patch
@@ -0,0 +1,15 @@
+--- wxWidgets-2.8.12/include/wx/wxchar.h.orig 2015-02-19 13:34:06.799313625 +0100
++++ wxWidgets-2.8.12/include/wx/wxchar.h 2015-02-19 13:34:33.317724044 +0100
+@@ -352,12 +352,8 @@
+ #define wxStrtod _tcstod
+ #define wxStrtol _tcstol
+ #define wxStrtoul _tcstoul
+- #ifdef __VISUALC__
+- #if __VISUALC__ >= 1300 && !defined(__WXWINCE__)
+ #define wxStrtoll _tcstoi64
+ #define wxStrtoull _tcstoui64
+- #endif /* VC++ 7+ */
+- #endif
+ #define wxStrxfrm _tcsxfrm
+
+ /* stdio.h functions */
More information about the scm-commits
mailing list