update mingw-w64

3 files changed, 28 insertions, 138 deletions

diff --git a/src/mingw-w64-1.patch b/src/mingw-w64-1.patch
index ff55a57..8a25cef 100644
--- a/src/mingw-w64-1.patch
+++ b/src/mingw-w64-1.patch
@@ -39,136 +39,23 @@ Signed-off-by: Jonathan Yong <10walls@gmail.com>
 
 Taken from: https://sourceforge.net/p/mingw-w64/mailman/message/36166386/
 
-diff --git a/mingw-w64-crt/lib32/dwmapi.def b/mingw-w64-crt/lib32/dwmapi.def
-index 1111111..2222222 100644
---- a/mingw-w64-crt/lib32/dwmapi.def
-+++ b/mingw-w64-crt/lib32/dwmapi.def
-@@ -5,47 +5,29 @@
- ;
- LIBRARY "dwmapi.dll"
- EXPORTS
--;ord_100@32 @100
--;ord_101@24 @101
-+DwmpDxGetWindowSharedSurface@32
-+DwmpDxUpdateWindowSharedSurface@24
- DwmEnableComposition@4
--;ord_103@0 @103
--;ord_104@12 @104
--;ord_105@0 @105
--;ord_106@8 @106
--;ord_107@4 @107
--;ord_108@4 @108
--;ord_109@8 @109
--;ord_110@0 @110
- DwmAttachMilContent@4
--;ord_112@4 @112
--;ord_113@16 @113
--;ord_114@8 @114
--;ord_115@4 @115
- DwmDefWindowProc@20
- DwmDetachMilContent@4
--;ord_118@8 @118
--;ord_119@8 @119
--;ord_120@8 @120
--;ord_121@8 @121
- DwmEnableBlurBehindWindow@8
- DwmEnableMMCSS@4
--;ord_124@20 @124
--;ord_125@12 @125
--;ord_126@8 @126
--;ord_127@4 @127
--;ord_128@4 @128
--;ord_129@4 @129
--;ord_130@0 @130
--;ord_131@8 @131
--;ord_132@8 @132
--;ord_133@36 @133
--;ord_134@8 @134
- DwmExtendFrameIntoClientArea@8
- DwmFlush@0
- DwmGetColorizationColor@8
-+DwmpDxBindSwapChain@12
-+DwmpDxUnbindSwapChain@8
-+DwmpDxgiIsThreadDesktopComposited@4
- DwmGetCompositionTimingInfo@8
- DwmGetGraphicsStreamClient@8
-+DwmpDxUpdateWindowRedirectionBltSurface@36
-+DwmpRenderFlick@12
-+DwmpAllocateSecurityDescriptor@8
-+DwmpFreeSecurityDescriptor@4
-+DwmpEnableDDASupport@0
- DwmGetGraphicsStreamTransformHint@8
-+DwmTetherTextContact@20
- DwmGetTransportAttributes@12
- DwmGetWindowAttribute@16
- DwmInvalidateIconicBitmaps@4
-@@ -53,10 +35,14 @@ DwmIsCompositionEnabled@4
- DwmModifyPreviousDxFrameDuration@12
- DwmQueryThumbnailSourceSize@8
- DwmRegisterThumbnail@12
-+DwmRenderGesture@16
- DwmSetDxFrameDuration@8
- DwmSetIconicLivePreviewBitmap@16
- DwmSetIconicThumbnail@12
- DwmSetPresentParameters@8
- DwmSetWindowAttribute@16
-+DwmShowContact@8
-+DwmTetherContact@16
-+DwmTransitionOwnedWindow@8
- DwmUnregisterThumbnail@4
- DwmUpdateThumbnailProperties@8
-diff --git a/mingw-w64-crt/lib64/dwmapi.def b/mingw-w64-crt/lib64/dwmapi.def
+diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h
 index 1111111..2222222 100644
---- a/mingw-w64-crt/lib64/dwmapi.def
-+++ b/mingw-w64-crt/lib64/dwmapi.def
-@@ -1,8 +1,13 @@
- ;
--; Exports of file dwmapi.dll
-+; Definition file of dwmapi.dll
-+; Automatic generated by gendef
-+; written by Kai Tietz 2008
- ;
--LIBRARY dwmapi.dll
-+LIBRARY "dwmapi.dll"
- EXPORTS
-+DwmpDxGetWindowSharedSurface
-+DwmpDxUpdateWindowSharedSurface
-+DwmEnableComposition
- DwmAttachMilContent
- DwmDefWindowProc
- DwmDetachMilContent
-@@ -12,18 +17,33 @@ DwmEnableMMCSS
- DwmExtendFrameIntoClientArea
- DwmFlush
- DwmGetColorizationColor
-+DwmpDxBindSwapChain
-+DwmpDxUnbindSwapChain
-+DwmpDxgiIsThreadDesktopComposited
- DwmGetCompositionTimingInfo
- DwmGetGraphicsStreamClient
-+DwmpDxUpdateWindowRedirectionBltSurface
-+DwmpRenderFlick
-+DwmpAllocateSecurityDescriptor
-+DwmpFreeSecurityDescriptor
-+DwmpEnableDDASupport
- DwmGetGraphicsStreamTransformHint
-+DwmTetherTextContact
- DwmGetTransportAttributes
- DwmGetWindowAttribute
-+DwmInvalidateIconicBitmaps
- DwmIsCompositionEnabled
- DwmModifyPreviousDxFrameDuration
- DwmQueryThumbnailSourceSize
- DwmRegisterThumbnail
-+DwmRenderGesture
- DwmSetDxFrameDuration
-+DwmSetIconicLivePreviewBitmap
-+DwmSetIconicThumbnail
- DwmSetPresentParameters
- DwmSetWindowAttribute
-+DwmShowContact
-+DwmTetherContact
-+DwmTransitionOwnedWindow
- DwmUnregisterThumbnail
- DwmUpdateThumbnailProperties
--
+--- a/mingw-w64-headers/crt/float.h
++++ b/mingw-w64-headers/crt/float.h
+@@ -114,6 +114,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__
++
+     /* 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
diff --git a/src/mingw-w64.mk b/src/mingw-w64.mk
index ebb933e..3fc5205 100644
--- a/src/mingw-w64.mk
+++ b/src/mingw-w64.mk
@@ -4,8 +4,8 @@ PKG             := mingw-w64
 $(PKG)_WEBSITE  := https://mingw-w64.sourceforge.io/
 $(PKG)_DESCR    := MinGW-w64 Runtime
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.0.4
-$(PKG)_CHECKSUM := 5527e1f6496841e2bb72f97a184fc79affdcd37972eaa9ebf7a5fd05c31ff803
+$(PKG)_VERSION  := 6.0.0
+$(PKG)_CHECKSUM := 805e11101e26d7897fce7d49cbb140d7bac15f3e085a91e0001e80b2adaf48f0
 $(PKG)_SUBDIR   := $(PKG)-v$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-v$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-release/$($(PKG)_FILE)
diff --git a/src/widl-1-fixes.patch b/src/widl-1-fixes.patch
index 1ed2e6b..97724f6 100644
--- a/src/widl-1-fixes.patch
+++ b/src/widl-1-fixes.patch
@@ -9,15 +9,18 @@ Subject: [PATCH 1/1] fixes
 
 
 diff --git a/mingw-w64-tools/widl/include/windef.h b/mingw-w64-tools/widl/include/windef.h
-index 1111111..2222222 100644
+index 8e8a08a..3d50e13 100644
 --- a/mingw-w64-tools/widl/include/windef.h
 +++ b/mingw-w64-tools/widl/include/windef.h
-@@ -85,7 +85,7 @@ extern "C" {
+@@ -101,7 +101,7 @@ extern "C" {
  #endif /* __cdecl */
  
  #ifndef __ms_va_list
--# if defined(__x86_64__) && defined (__GNUC__)
-+# if defined(__x86_64__) && defined (__GNUC__) && defined(__builtin_ms_va_list)
+-# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__)
++# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) && defined(__builtin_ms_va_list)
  #  define __ms_va_list __builtin_ms_va_list
  #  define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg)
  #  define __ms_va_end(list) __builtin_ms_va_end(list)
+-- 
+2.17.1
+