From 5d4f1f261cdee885451eaeaf1115db6fefaeaa8c Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Wed, 4 Jun 2025 08:54:48 +0200
Subject: [PATCH] curl: Update to 8.14.1

* remove patches include in the release
* some cleanups
---
 mingw-w64-curl/PKGBUILD | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/mingw-w64-curl/PKGBUILD b/mingw-w64-curl/PKGBUILD
index 508178cece..c64fadcb3d 100644
--- a/mingw-w64-curl/PKGBUILD
+++ b/mingw-w64-curl/PKGBUILD
@@ -6,8 +6,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          $([[ ${CARCH} == i686 ]] || echo \
            "${MINGW_PACKAGE_PREFIX}-${_realname}-gnutls" \
            "${MINGW_PACKAGE_PREFIX}-${_realname}-winssl"))
-pkgver=8.14.0
-pkgrel=4
+pkgver=8.14.1
+pkgrel=1
 pkgdesc="Command line tool and library for transferring data with URLs (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -47,19 +47,15 @@ depends=("${MINGW_PACKAGE_PREFIX}-cc-libs"
          "${MINGW_PACKAGE_PREFIX}-zlib"
          "${MINGW_PACKAGE_PREFIX}-zstd")
 source=("https://github.com/curl/curl/releases/download/${_realname}-${pkgver//./_}/${_realname}-${pkgver}.tar.xz"{,.asc}
-        "https://github.com/curl/curl/pull/17475.patch"
         "pathtools.c"
         "pathtools.h"
         "0001-Make-cURL-relocatable.patch"
-        "https://github.com/curl/curl/commit/4c6b74e1e8dfe3ebe681f5be9a5dd7d684e285c7.patch"
         )
-sha256sums=('b3634cfc538c72c9c6ca794ef4c73d7fdbd171e8dee2db837d83a5e45231002a'
+sha256sums=('f4619a1e2474c4bbfedc88a7c2191209c8334b48fa1f4e53fd584cc12e9120dd'
             'SKIP'
-            '1d571b7ef3033b9b1d4b27701379e1ea176513baf2057920ea675dab3e0667e8'
             'ebf471173f5ee9c4416c10a78760cea8afaf1a4a6e653977321e8547ce7bf3c0'
             '1585ef1b61cf53a2ca27049c11d49e0834683dfda798f03547761375df482a90'
-            'cf3aaec6c2a684edcdcb230f8ee73e45e40a191fb2d76b1df15c7db76d63a25f'
-            'c86551a1788aed2b35e01a7eaf37babfb2466652d226d8739349b5438fd2feeb')
+            'cf3aaec6c2a684edcdcb230f8ee73e45e40a191fb2d76b1df15c7db76d63a25f')
 validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2')  # Daniel Stenberg
 
 apply_patch_with_msg() {
@@ -80,9 +76,7 @@ prepare() {
   cp -fHv "${srcdir}"/pathtools.[ch] lib/
 
   apply_patch_with_msg \
-    17475.patch \
-    0001-Make-cURL-relocatable.patch \
-    4c6b74e1e8dfe3ebe681f5be9a5dd7d684e285c7.patch
+    0001-Make-cURL-relocatable.patch
 }
 
 do_build() {
@@ -132,7 +126,7 @@ do_build() {
   CXXFLAGS+=" -DNGHTTP2_STATICLIB -DNGHTTP3_STATICLIB -DNGTCP2_STATICLIB" \
   LDFLAGS+=" -static" \
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DCURL_CA_BUNDLE=" \
-    "${MINGW_PREFIX}"/bin/cmake.exe \
+    cmake \
       -GNinja \
       -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
       -DCMAKE_UNITY_BUILD=ON \
@@ -148,13 +142,13 @@ do_build() {
       -DCURL_USE_LIBSSH2=ON \
       ../"${_realname}-${pkgver}"
 
-  "${MINGW_PREFIX}"/bin/cmake.exe --build .
+  cmake --build .
 
   msg2 "Building shared library for curl${_variant}"
   mkdir -p "${_destdir}-shared" && cd "${_destdir}-shared"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DCURL_CA_BUNDLE=" \
-    "${MINGW_PREFIX}"/bin/cmake.exe \
+    cmake \
       -GNinja \
       -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
       -DCMAKE_DLL_NAME_WITH_SOVERSION=ON \
@@ -170,7 +164,7 @@ do_build() {
       -DCURL_USE_LIBSSH2=ON \
       ../"${_realname}-${pkgver}"
 
-  "${MINGW_PREFIX}"/bin/cmake.exe --build .
+  cmake --build .
 }
 
 build() {