diff mbox series

[meta-mingw] mingw-w64: Upgrade to 11.0.0 release

Message ID 20240516034023.3614113-1-raj.khem@gmail.com
State New
Headers show
Series [meta-mingw] mingw-w64: Upgrade to 11.0.0 release | expand

Commit Message

Khem Raj May 16, 2024, 3:40 a.m. UTC 
Drop GCC-14 related backport, its not needed anymore

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...in-the-ucrt-__imp_vfscanf-assignment.patch | 30 -------------------
 recipes-devtools/mingw-w64/mingw-w64.inc      |  2 +-
 ... => nativesdk-mingw-w64-headers_11.0.0.bb} |  0
 ... => nativesdk-mingw-w64-runtime_11.0.0.bb} |  2 +-
 ...nativesdk-mingw-w64-winpthreads_11.0.0.bb} |  0
 5 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 recipes-devtools/mingw-w64/files/0001-crt-Fix-a-typo-in-the-ucrt-__imp_vfscanf-assignment.patch
 rename recipes-devtools/mingw-w64/{nativesdk-mingw-w64-headers_9.0.0.bb => nativesdk-mingw-w64-headers_11.0.0.bb} (100%)
 rename recipes-devtools/mingw-w64/{nativesdk-mingw-w64-runtime_9.0.0.bb => nativesdk-mingw-w64-runtime_11.0.0.bb} (86%)
 rename recipes-devtools/mingw-w64/{nativesdk-mingw-w64-winpthreads_9.0.0.bb => nativesdk-mingw-w64-winpthreads_11.0.0.bb} (100%)
diff mbox series

Patch

diff --git a/recipes-devtools/mingw-w64/files/0001-crt-Fix-a-typo-in-the-ucrt-__imp_vfscanf-assignment.patch b/recipes-devtools/mingw-w64/files/0001-crt-Fix-a-typo-in-the-ucrt-__imp_vfscanf-assignment.patch
deleted file mode 100644
index bc41482..0000000
--- a/recipes-devtools/mingw-w64/files/0001-crt-Fix-a-typo-in-the-ucrt-__imp_vfscanf-assignment.patch
+++ /dev/null
@@ -1,30 +0,0 @@ 
-From b0dcc496228373417e4f6134beb2f13ca3ed807e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
-Date: Thu, 5 Aug 2021 11:08:39 +0300
-Subject: [PATCH] crt: Fix a typo in the ucrt __imp_vfscanf assignment
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The wrong function was assigned; this was a bug present since
-0dd9563a3ad71ad75cab1699ba5cfef2dd0bf9d8 (April 2021).
-
-Upstream-Status: Backport [https://sourceforge.net/p/mingw-w64/mingw-w64/ci/b0dcc496228373417e4f6134beb2f13ca3ed807e]
-Signed-off-by: Martin Storsjö <martin@martin.st>
----
- mingw-w64-crt/stdio/ucrt_vfscanf.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mingw-w64-crt/stdio/ucrt_vfscanf.c b/mingw-w64-crt/stdio/ucrt_vfscanf.c
-index fe44cdf71..8d1a76a8b 100644
---- a/mingw-w64-crt/stdio/ucrt_vfscanf.c
-+++ b/mingw-w64-crt/stdio/ucrt_vfscanf.c
-@@ -11,4 +11,4 @@
- int __cdecl vfscanf (FILE *__stream,  const char *__format, __builtin_va_list __local_argv) {
-   return __stdio_common_vfscanf(0, __stream, __format, NULL, __local_argv);
- }
--int __cdecl (*__MINGW_IMP_SYMBOL(vfscanf))(FILE *, const char *, __builtin_va_list) = vsscanf;
-+int __cdecl (*__MINGW_IMP_SYMBOL(vfscanf))(FILE *, const char *, __builtin_va_list) = vfscanf;
--- 
-2.43.0
-
diff --git a/recipes-devtools/mingw-w64/mingw-w64.inc b/recipes-devtools/mingw-w64/mingw-w64.inc
index ce5d0db..f5fa730 100644
--- a/recipes-devtools/mingw-w64/mingw-w64.inc
+++ b/recipes-devtools/mingw-w64/mingw-w64.inc
@@ -5,7 +5,7 @@  COMPATIBLE_HOST = ".*-mingw.*"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
 
-SRC_URI[sha256sum] = "1929b94b402f5ff4d7d37a9fe88daa9cc55515a6134805c104d1794ae22a4181"
+SRC_URI[sha256sum] = "bd0ea1633bd830204cc23a696889335e9d4a32b8619439ee17f22188695fcc5f"
 
 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/"
 UPSTREAM_CHECK_REGEX = "mingw-w64-v(?P<pver>(\d+[\.\-_]*)+)\.tar"
diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_9.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_11.0.0.bb
similarity index 100%
rename from recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_9.0.0.bb
rename to recipes-devtools/mingw-w64/nativesdk-mingw-w64-headers_11.0.0.bb
diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_9.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_11.0.0.bb
similarity index 86%
rename from recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_9.0.0.bb
rename to recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_11.0.0.bb
index 1aa470e..6d01d35 100644
--- a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_9.0.0.bb
+++ b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-runtime_11.0.0.bb
@@ -2,7 +2,7 @@  DESCRIPTION = "Runtime libraries from MinGW-w64 project"
 
 require mingw-w64.inc
 
-SRC_URI += "file://0001-crt-Fix-a-typo-in-the-ucrt-__imp_vfscanf-assignment.patch;striplevel=2"
+#SRC_URI += "file://0001-crt-Fix-a-typo-in-the-ucrt-__imp_vfscanf-assignment.patch;striplevel=2"
 
 S = "${WORKDIR}/mingw-w64-v${PV}/mingw-w64-crt"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_9.0.0.bb b/recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_11.0.0.bb
similarity index 100%
rename from recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_9.0.0.bb
rename to recipes-devtools/mingw-w64/nativesdk-mingw-w64-winpthreads_11.0.0.bb