view src/netcdf-1-fixes.patch @ 6113:24e29dcb2e64

Qt5: Update to version 5.15.3. * src/qtbase.mk: Update version and checksum. * src/qtbase-2-gcc11.patch: Remove hunks from patch that have been applied upstream. * src/qtimageformats.mk, src/qtsvg.mk, src/qttools.mk, src/qttranslationse.mk: Update checksum.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 05 Mar 2022 10:59:53 +0100
parents 1b10dc73d928
children
line wrap: on
line source

From 9a8a2eb2694581f6caf103aee593ca9607be17bd Mon Sep 17 00:00:00 2001
From: Milton Woods <miltonjwoods@gmail.com>
Date: Mon, 23 Aug 2021 14:22:57 +1000
Subject: [PATCH] Fix path conversions for mingw-w64

---
 libdispatch/dpathmgr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libdispatch/dpathmgr.c b/libdispatch/dpathmgr.c
index eb450534e..6a5890423 100644
--- a/libdispatch/dpathmgr.c
+++ b/libdispatch/dpathmgr.c
@@ -861,7 +861,7 @@ getlocalpathkind(void)
 	kind = NCPD_CYGWIN;
 #elif __MSYS__
 	kind = NCPD_MSYS;
-#elif _MSC_VER /* not _WIN32 */
+#elif defined(_MSC_VER) || defined(__MINGW32__) /* not _WIN32 */
 	kind = NCPD_WIN;
 #else
 	kind = NCPD_NIX;