From 7d34d0232dd4bd3dc3a98724c9fcdc8bddbd9271 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de>
Date: Sun, 30 Jul 2023 20:20:11 +0200
Subject: [PATCH] gdal: update to 3.7.1

---
 .../002-dont-define-msvcrt-version.patch       | 18 ------------------
 mingw-w64-gdal/PKGBUILD                        | 15 ++++++---------
 2 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 mingw-w64-gdal/002-dont-define-msvcrt-version.patch

diff --git a/mingw-w64-gdal/002-dont-define-msvcrt-version.patch b/mingw-w64-gdal/002-dont-define-msvcrt-version.patch
deleted file mode 100644
index c965efe344..0000000000
--- a/mingw-w64-gdal/002-dont-define-msvcrt-version.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- gdal-3.3.2/port/cpl_port.h.orig	2021-10-18 10:57:01.393925700 -0700
-+++ gdal-3.3.2/port/cpl_port.h	2021-10-18 10:57:27.784506600 -0700
-@@ -113,15 +113,6 @@
- /*      MinGW stuff                                                     */
- /* ==================================================================== */
- 
--/* We need __MSVCRT_VERSION__ >= 0x0700 to have "_aligned_malloc" */
--/* Latest versions of mingw32 define it, but with older ones, */
--/* we need to define it manually */
--#if defined(__MINGW32__)
--#ifndef __MSVCRT_VERSION__
--#define __MSVCRT_VERSION__ 0x0700
--#endif
--#endif
--
- /* Needed for std=c11 on Solaris to have strcasecmp() */
- #if defined(GDAL_COMPILATION) && defined(__sun__) && (__STDC_VERSION__ + 0) >= 201112L && (_XOPEN_SOURCE + 0) < 600
- #ifdef _XOPEN_SOURCE
diff --git a/mingw-w64-gdal/PKGBUILD b/mingw-w64-gdal/PKGBUILD
index ac41d97bea..d09ab4a2c9 100644
--- a/mingw-w64-gdal/PKGBUILD
+++ b/mingw-w64-gdal/PKGBUILD
@@ -8,8 +8,8 @@ _realname=gdal
 pkgbase=mingw-w64-${_realname,,}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=3.7.0
-pkgrel=4
+pkgver=3.7.1
+pkgrel=1
 pkgdesc="A translator library for raster geospatial data formats (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -66,11 +66,9 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-zlib"
          "${MINGW_PACKAGE_PREFIX}-zstd")
 source=(https://github.com/OSGeo/gdal/releases/download/v${pkgver}/gdal-${pkgver}.tar.gz
-        001-fix-bindings-install-path.patch
-        002-dont-define-msvcrt-version.patch)
-sha256sums=('5a806d759f403a15bbbf8a14ecc6947071afc5ab91e5abaef0d11d1d2d16bf94'
-            'bfb0b42c8562bd45ae5cff71d42b042e398dff9a9c1f5bb08d8717a7753d4f3f'
-            '2eb8b8d7321f5a75cc7ff29bf63ae8bda1c900f463b6577bac109503346275f4')
+        001-fix-bindings-install-path.patch)
+sha256sums=('c131a39d0f7c2a76f02dd648f2906179ddb38958673461eee1da4f9c9a166e76'
+            'bfb0b42c8562bd45ae5cff71d42b042e398dff9a9c1f5bb08d8717a7753d4f3f')
 
 apply_patch_with_msg() {
   for _patch in "$@"
@@ -83,8 +81,7 @@ apply_patch_with_msg() {
 prepare() {
   cd ${srcdir}/${_realname}-${pkgver}
   apply_patch_with_msg \
-    001-fix-bindings-install-path.patch \
-    002-dont-define-msvcrt-version.patch
+    001-fix-bindings-install-path.patch
 }
 
 build() {