# HG changeset patch
# User John D
# Date 1471899072 14400
# Node ID 0c9264cfa05376954df5d339f365cf8c7db1e80e
# Parent  094981f6f787e3e08d43faaef1a45e9b61297f4b
mingw-w64: update to 4.0.6

* dist-files.mk: removed mingw-w64-2-netioapi-winxp.patch, mingw-w64-3-fix-g-format.patch

* src/mingw-w64-2-netioapi-winxp.patch: removed

* src/mingw-w64-3-fix-g-format.patch: removed

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

diff -r 094981f6f787 -r 0c9264cfa053 dist-files.mk
--- a/dist-files.mk	Mon Aug 22 14:19:58 2016 -0400
+++ b/dist-files.mk	Mon Aug 22 16:51:12 2016 -0400
@@ -327,8 +327,6 @@
   mingw-units-1-fixes.patch \
   mingw-utils-1-portability-fix.patch \
   mingw-w64-1-float-h.patch \
-  mingw-w64-2-netioapi-winxp.patch \
-  mingw-w64-3-fix-g-format.patch \
   mingw-w64.mk \
   mingwrt.mk \
   mman-win32-1-include_name_change.patch \
diff -r 094981f6f787 -r 0c9264cfa053 src/mingw-w64-2-netioapi-winxp.patch
--- a/src/mingw-w64-2-netioapi-winxp.patch	Mon Aug 22 14:19:58 2016 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-Some functions in netioapi.h were only added in Windows Vista. This patch removes
-function definitions for if_nametoindex and if_indextoname on older API
-versions, so they don't conflict with replacement implementations in libraries
-(e.g. glib).
-
-This is fixed on the 4.x branch of mingw-w64.
-
-diff -Naur mingw-w64-v3.3.0.orig/mingw-w64-headers/include/netioapi.h mingw-w64-v3.3.0/mingw-w64-headers/include/netioapi.h
---- mingw-w64-v3.3.0.orig/mingw-w64-headers/include/netioapi.h	2015-01-17 00:07:51.030935703 +0100
-+++ mingw-w64-v3.3.0/mingw-w64-headers/include/netioapi.h	2015-01-17 01:09:47.546591536 +0100
-@@ -311,6 +311,7 @@
-   PNET_LUID InterfaceLuid
- );
- 
-+#if (_WIN32_WINNT >= 0x0600)
- PCHAR WINAPI if_indextoname(
-   NET_IFINDEX InterfaceIndex,
-   PCHAR InterfaceName
-@@ -319,6 +320,7 @@
- NET_IFINDEX WINAPI if_nametoindex(
-   PCSTR InterfaceName
- );
-+#endif
- 
- NETIO_STATUS WINAPI ConvertInterfaceGuidToLuid(
-   const GUID *InterfaceGuid,
diff -r 094981f6f787 -r 0c9264cfa053 src/mingw-w64-3-fix-g-format.patch
--- a/src/mingw-w64-3-fix-g-format.patch	Mon Aug 22 14:19:58 2016 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-From: John Donoghue <john.david.donoghue@gmail.com>
-Date: Mon, 6 Apr 2015 09:29:43 -0400
-Subject: [PATCH] Fix printf("%g") width format out by one in some instances
- (Bug 362)
-
-* mingw-w64-crt\stdio\mingw_pformat.c
-  (__pformat_emit_float): change width > len => width >= len
-
-diff -ur mingw-w64-v3.3.0.orig/mingw-w64-crt/stdio/mingw_pformat.c mingw-w64-v3.3.0/mingw-w64-crt/stdio/mingw_pformat.c
---- mingw-w64-v3.3.0.orig/mingw-w64-crt/stdio/mingw_pformat.c	2015-04-06 10:12:45.486721000 -0400
-+++ mingw-w64-v3.3.0/mingw-w64-crt/stdio/mingw_pformat.c	2015-04-06 10:14:26.200702676 -0400
-@@ -1055,7 +1055,7 @@
-      * reserve space in the output field, for the required number of
-      * decimal digits to be placed before the decimal point...
-      */
--    if( stream->width > len )
-+    if( stream->width >= len )
-       /*
-        * adjusting as appropriate, when width is sufficient...
-        */
diff -r 094981f6f787 -r 0c9264cfa053 src/mingw-w64.mk
--- a/src/mingw-w64.mk	Mon Aug 22 14:19:58 2016 -0400
+++ b/src/mingw-w64.mk	Mon Aug 22 16:51:12 2016 -0400
@@ -3,8 +3,8 @@
 
 PKG             := mingw-w64
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.3.0
-$(PKG)_CHECKSUM := d31eac960d42e791970697eae5724e529c81dcd6
+$(PKG)_VERSION  := 4.0.6
+$(PKG)_CHECKSUM := cc9ef3be9bb31ee3fdc4731d214034be5483270d
 $(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)