From 588be6cc4a707dfc287dcc39e5ff8f9f1e30cf4e Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Fri, 5 Jan 2024 12:53:06 +0100
Subject: [PATCH] c-ares: Update to 1.25.0

Various things moved around upstream, adjust patches
to get the same .pc file and file names as before.
---
 ...-cares-pkgconfig-fix-paths-and-flags.patch | 20 +++++++++----------
 mingw-w64-c-ares/0003-fix-cmake-targets.patch | 11 ----------
 mingw-w64-c-ares/PKGBUILD                     | 13 +++++-------
 3 files changed, 14 insertions(+), 30 deletions(-)
 delete mode 100644 mingw-w64-c-ares/0003-fix-cmake-targets.patch

diff --git a/mingw-w64-c-ares/0002-cares-pkgconfig-fix-paths-and-flags.patch b/mingw-w64-c-ares/0002-cares-pkgconfig-fix-paths-and-flags.patch
index 99c79b1c7d..a482c41366 100644
--- a/mingw-w64-c-ares/0002-cares-pkgconfig-fix-paths-and-flags.patch
+++ b/mingw-w64-c-ares/0002-cares-pkgconfig-fix-paths-and-flags.patch
@@ -1,20 +1,20 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -724,12 +724,10 @@
+--- c-ares-1.25.0/CMakeLists.txt.orig	2024-01-03 09:44:48.000000000 +0100
++++ c-ares-1.25.0/CMakeLists.txt	2024-01-05 13:22:20.955977500 +0100
+@@ -721,11 +721,10 @@
  	INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake" COMPONENT Devel DESTINATION ${CMAKECONFIG_INSTALL_DIR})
  
  	# pkgconfig support
 -	IF (NOT CARES_SHARED)
- 		SET (CPPFLAG_CARES_STATICLIB "-DCARES_STATICLIB")
  		FOREACH (LIB ${CARES_DEPENDENT_LIBS})
  			SET (CARES_PRIVATE_LIBS "${CARES_PRIVATE_LIBS} -l${LIB}")
  		ENDFOREACH ()
 -	ENDIF ()
++
  	CONFIGURE_FILE("libcares.pc.cmake" "libcares.pc" @ONLY)
  	INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" COMPONENT Devel DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
  ENDIF ()
---- a/libcares.pc.cmake
-+++ b/libcares.pc.cmake
+--- c-ares-1.25.0/libcares.pc.cmake.orig	2024-01-03 09:41:43.000000000 +0100
++++ c-ares-1.25.0/libcares.pc.cmake	2024-01-05 13:14:57.807581600 +0100
 @@ -7,9 +7,9 @@
  # Copyright (C) The c-ares project and its contributors
  # SPDX-License-Identifier: MIT
@@ -28,12 +28,10 @@
  
  Name: c-ares
  URL: https://c-ares.org/
-@@ -17,6 +17,7 @@
- Version: @CARES_VERSION@
+@@ -18,5 +18,6 @@
  Requires: 
  Requires.private: 
--Cflags: -I${includedir} @CPPFLAG_CARES_STATICLIB@
-+Cflags: -I${includedir}
-+Cflags.private: @CPPFLAG_CARES_STATICLIB@
+ Cflags: -I${includedir}
++Cflags.private: -DCARES_STATICLIB
  Libs: -L${libdir} -lcares
  Libs.private: @CARES_PRIVATE_LIBS@
diff --git a/mingw-w64-c-ares/0003-fix-cmake-targets.patch b/mingw-w64-c-ares/0003-fix-cmake-targets.patch
deleted file mode 100644
index 8be37f90da..0000000000
--- a/mingw-w64-c-ares/0003-fix-cmake-targets.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/lib/CMakeLists.txt
-+++ b/src/lib/CMakeLists.txt
-@@ -86,7 +86,7 @@
- 
- 	SET_TARGET_PROPERTIES (${LIBNAME} PROPERTIES
- 		EXPORT_NAME                  cares${STATIC_SUFFIX}
--		OUTPUT_NAME                  cares${STATIC_SUFFIX}
-+		OUTPUT_NAME                  cares
- 		COMPILE_PDB_NAME             cares${STATIC_SUFFIX}
- 		COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
- 		C_STANDARD                   90
diff --git a/mingw-w64-c-ares/PKGBUILD b/mingw-w64-c-ares/PKGBUILD
index 35e1593e91..8000773884 100644
--- a/mingw-w64-c-ares/PKGBUILD
+++ b/mingw-w64-c-ares/PKGBUILD
@@ -4,7 +4,7 @@
 _realname=c-ares
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.24.0
+pkgver=1.25.0
 pkgrel=1
 pkgdesc="C library that performs DNS requests and name resolves asynchronously (mingw-w64)"
 arch=('any')
@@ -23,14 +23,12 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-ninja")
 source=(#"https://c-ares.org/download/${_realname}-${pkgver}.tar.gz"{,.asc}
         "https://github.com/${_realname}/${_realname}/releases/download/${_realname//-}-${pkgver//./_}/${_realname}-${pkgver}.tar.gz"{,.asc}
-        0002-cares-pkgconfig-fix-paths-and-flags.patch
-        0003-fix-cmake-targets.patch)
+        0002-cares-pkgconfig-fix-paths-and-flags.patch)
 validpgpkeys=('914C533DF9B2ADA2204F586D78E11C6B279D5C91'
               '27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg <daniel@haxx.se>
-sha256sums=('c517de6d5ac9cd55a9b72c1541c3e25b84588421817b5f092850ac09a8df5103'
+sha256sums=('71832b93a48f5ff579c505f4869120c14e57b783275367207f1a98314aa724e5'
             'SKIP'
-            '23d9bb9d51db9e7017cc9e2aeb046f31d4d5b0f379eef655ab6d0115325a9203'
-            '0493ec03a751013bb065dc3348ef51c84e2c85ca5161238b59802ac9728e26c0')
+            '86e83d0677c8b53ced256eab53aa63e6bc665f1b935b849df7352109e89a3c0e')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -55,8 +53,7 @@ prepare() {
   cd "${_realname}-${pkgver}"
 
   apply_patch_with_msg \
-    0002-cares-pkgconfig-fix-paths-and-flags.patch \
-    0003-fix-cmake-targets.patch
+    0002-cares-pkgconfig-fix-paths-and-flags.patch
 }
 
 build() {