From 49540ed0c79f26c9637730de81713918a7ad061e Mon Sep 17 00:00:00 2001
From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com>
Date: Fri, 18 Oct 2024 13:46:42 +0800
Subject: [PATCH] [reproc] update to 14.2.5 (#41630)

---
 ports/reproc/fix-gcc13-build-error.patch | 28 ------------------------
 ports/reproc/portfile.cmake              |  4 +---
 ports/reproc/vcpkg.json                  |  3 +--
 versions/baseline.json                   |  4 ++--
 versions/r-/reproc.json                  |  5 +++++
 5 files changed, 9 insertions(+), 35 deletions(-)
 delete mode 100644 ports/reproc/fix-gcc13-build-error.patch

diff --git a/ports/reproc/fix-gcc13-build-error.patch b/ports/reproc/fix-gcc13-build-error.patch
deleted file mode 100644
index cf464b531b..0000000000
--- a/ports/reproc/fix-gcc13-build-error.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/reproc++/include/reproc++/reproc.hpp b/reproc++/include/reproc++/reproc.hpp
-index ab6f139..d4b370f 100644
---- a/reproc++/include/reproc++/reproc.hpp
-+++ b/reproc++/include/reproc++/reproc.hpp
-@@ -88,18 +88,18 @@ struct redirect {
- 
- struct options {
-   struct {
--    env::type behavior;
-+    reproc::env::type behavior;
-     /*! Implicitly converts from any STL container of string pairs to the
-     environment format expected by `reproc_start`. */
--    class env extra;
-+    reproc::env extra;
-   } env = {};
- 
-   const char *working_directory = nullptr;
- 
-   struct {
--    redirect in;
--    redirect out;
--    redirect err;
-+    struct redirect in;
-+    struct redirect out;
-+    struct redirect err;
-     bool parent;
-     bool discard;
-     FILE *file;
diff --git a/ports/reproc/portfile.cmake b/ports/reproc/portfile.cmake
index c8c9f38457..ff6d6fded9 100644
--- a/ports/reproc/portfile.cmake
+++ b/ports/reproc/portfile.cmake
@@ -2,10 +2,8 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO DaanDeMeyer/reproc
     REF "v${VERSION}"
-    SHA512 c592521960f1950d626261738091d25efdf764ee1a0c72a58c28c66eaebf6073b2c978f1dc2c8dbe89b0be7ec1629a3a45cb1fafa0ebe21b5df8d4d27c992675
+    SHA512 d6c8abfc4fbef894310f4ad6250ddf269279bce13954ba6bc0147e0bf7e08f5a5e924ba079205881d6bf1dfe865e5f4389517d6d3bbafdede24ed328c549a991
     HEAD_REF main
-    PATCHES
-        fix-gcc13-build-error.patch #Please remove it in the next release version
 )
 
 vcpkg_cmake_configure(
diff --git a/ports/reproc/vcpkg.json b/ports/reproc/vcpkg.json
index 4326597ed8..347effc2b5 100644
--- a/ports/reproc/vcpkg.json
+++ b/ports/reproc/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "reproc",
-  "version": "14.2.4",
-  "port-version": 2,
+  "version": "14.2.5",
   "description": "Cross-platform (C99/C++11) process library",
   "homepage": "https://github.com/DaanDeMeyer/reproc",
   "supports": "!uwp",
diff --git a/versions/baseline.json b/versions/baseline.json
index 6092fca1d4..0723d2a2ba 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7865,8 +7865,8 @@
       "port-version": 1
     },
     "reproc": {
-      "baseline": "14.2.4",
-      "port-version": 2
+      "baseline": "14.2.5",
+      "port-version": 0
     },
     "rest-rpc": {
       "baseline": "0.12",
diff --git a/versions/r-/reproc.json b/versions/r-/reproc.json
index f733405338..a20bb3176d 100644
--- a/versions/r-/reproc.json
+++ b/versions/r-/reproc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b844bd7e62dcad31cd5a38a38416f1d03a017e08",
+      "version": "14.2.5",
+      "port-version": 0
+    },
     {
       "git-tree": "6fc63b3c029742441d22a288db9f37f5e016abbe",
       "version": "14.2.4",