# HG changeset patch
# User John Donoghue
# Date 1415822745 18000
# Node ID b90033378759a51957dc6deb5972e9e920adcbb4
# Parent  eba1c6e9cbb8f537c4fd324338de3428204f1816
mingw-w64: update version to 3.3.0

* src/mingw-w64-1-float-h.patch: renamed src/mingw-w64-2-float-h.patch

* src/mingw-w64-1-math-h.patch: removed.

* dist-files.mk: renamed mingw-w64-1-float-h.patch, removed mingw-w64-1-math-h.patch

* src/mingw-w64.mk: update version, checksum

diff -r eba1c6e9cbb8 -r b90033378759 dist-files.mk
--- a/dist-files.mk	Wed Nov 12 15:10:03 2014 -0500
+++ b/dist-files.mk	Wed Nov 12 15:05:45 2014 -0500
@@ -320,8 +320,7 @@
   mingw-transfig-1-fixes.patch \
   mingw-units-1-fixes.patch \
   mingw-utils-1-portability-fix.patch \
-  mingw-w64-1-math-h.patch \
-  mingw-w64-2-float-h.patch \
+  mingw-w64-1-float-h.patch \
   mingw-w64.mk \
   mingwrt.mk \
   mpc.mk \
diff -r eba1c6e9cbb8 -r b90033378759 src/mingw-w64-1-float-h.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mingw-w64-1-float-h.patch	Wed Nov 12 15:05:45 2014 -0500
@@ -0,0 +1,25 @@
+This file is part of MXE.
+See index.html for further information.
+
+workaround for -isystem flag messing up include order
+https://bugzilla.redhat.com/show_bug.cgi?id=843436
+
+diff -ur a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h
+--- a/mingw-w64-headers/crt/float.h	2014-01-11 21:38:50.640418500 +1100
++++ b/mingw-w64-headers/crt/float.h	2014-01-11 21:44:08.528393903 +1100
+@@ -105,6 +105,15 @@
+ 	#define DBL_MAX_10_EXP	__DBL_MAX_10_EXP__
+ 	#define LDBL_MAX_10_EXP	__LDBL_MAX_10_EXP__
+ 
++    /* The difference between 1 and the least value greater than 1 that is
++    representable in the given floating point type, b**1-p.  */
++    #undef FLT_EPSILON
++    #undef DBL_EPSILON
++    #undef LDBL_EPSILON
++    #define FLT_EPSILON __FLT_EPSILON__
++    #define DBL_EPSILON __DBL_EPSILON__
++    #define LDBL_EPSILON    __LDBL_EPSILON__
++
+ 	/* Addition rounds to 0: zero, 1: nearest, 2: +inf, 3: -inf, -1: unknown.  */
+ 	/* ??? This is supposed to change with calls to fesetround in <fenv.h>.  */
+ 	#undef FLT_ROUNDS
diff -r eba1c6e9cbb8 -r b90033378759 src/mingw-w64-1-math-h.patch
--- a/src/mingw-w64-1-math-h.patch	Wed Nov 12 15:10:03 2014 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-This patch was taken from:
-https://sourceforge.net/p/mingw-w64/code/6479/
-
---- a/mingw-w64-headers/crt/math.h
-+++ b/mingw-w64-headers/crt/math.h
-@@ -36,7 +36,7 @@
- #endif
- #endif
- 
--#ifndef __STRICT_ANSI__
-+#if !defined(__STRICT_ANSI__) || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) 
- #define M_E		2.7182818284590452354
- #define M_LOG2E		1.4426950408889634074
- #define M_LOG10E	0.43429448190325182765
-
diff -r eba1c6e9cbb8 -r b90033378759 src/mingw-w64-2-float-h.patch
--- a/src/mingw-w64-2-float-h.patch	Wed Nov 12 15:10:03 2014 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-workaround for -isystem flag messing up include order
-https://bugzilla.redhat.com/show_bug.cgi?id=843436
-
-diff -ur a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h
---- a/mingw-w64-headers/crt/float.h	2014-01-11 21:38:50.640418500 +1100
-+++ b/mingw-w64-headers/crt/float.h	2014-01-11 21:44:08.528393903 +1100
-@@ -105,6 +105,15 @@
- 	#define DBL_MAX_10_EXP	__DBL_MAX_10_EXP__
- 	#define LDBL_MAX_10_EXP	__LDBL_MAX_10_EXP__
- 
-+    /* The difference between 1 and the least value greater than 1 that is
-+    representable in the given floating point type, b**1-p.  */
-+    #undef FLT_EPSILON
-+    #undef DBL_EPSILON
-+    #undef LDBL_EPSILON
-+    #define FLT_EPSILON __FLT_EPSILON__
-+    #define DBL_EPSILON __DBL_EPSILON__
-+    #define LDBL_EPSILON    __LDBL_EPSILON__
-+
- 	/* Addition rounds to 0: zero, 1: nearest, 2: +inf, 3: -inf, -1: unknown.  */
- 	/* ??? This is supposed to change with calls to fesetround in <fenv.h>.  */
- 	#undef FLT_ROUNDS
diff -r eba1c6e9cbb8 -r b90033378759 src/mingw-w64.mk
--- a/src/mingw-w64.mk	Wed Nov 12 15:10:03 2014 -0500
+++ b/src/mingw-w64.mk	Wed Nov 12 15:05:45 2014 -0500
@@ -3,8 +3,8 @@
 
 PKG             := mingw-w64
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.1.0
-$(PKG)_CHECKSUM := c167b1dc114a13c465fe6adcce9dc65c509baf75
+$(PKG)_VERSION  := 3.3.0
+$(PKG)_CHECKSUM := d31eac960d42e791970697eae5724e529c81dcd6
 $(PKG)_SUBDIR   := $(PKG)-v$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-v$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-release/$($(PKG)_FILE)