[abseil] Update to 20240116.1 (#37461)

Fixes #37439
microsoft · Mar 18, 2024 · 2639f60 · 2639f60
1 parent 109d286
commit 2639f60
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 5 deletions.
diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake
@@ -6,7 +6,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO abseil/abseil-cpp
     REF "${VERSION}"
-    SHA512 14390380655c41483a98487e3b012110dd8d1743fdd68d8cde7e0d7c2730312d564b15726d8c9d2fff237d2fce3983bbbb5213f59612c7c6feaeb402dff9609f
+    SHA512 41504899ac4fd4a6eaa0a5fdf27a7765ec81962fb99b6a07982ceed32c5289e9eb12206c83a70fd44c5c3e1b96c2bfa160eb12f1dbbb45f1109d632c7690de90
     HEAD_REF master
 )
 

diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "abseil",
-  "version": "20230802.1",
+  "version": "20240116.1",
   "description": [
     "an open-source collection designed to augment the C++ standard library.",
     "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.",

diff --git a/ports/grpc/00016_add_header.patch b/ports/grpc/00016_add_header.patch
@@ -0,0 +1,12 @@
+diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc
+index 72e1b66..8dc1fd1 100644
+--- a/src/core/lib/iomgr/tcp_posix.cc
++++ b/src/core/lib/iomgr/tcp_posix.cc
+@@ -47,6 +47,7 @@
+ #include <grpc/support/string_util.h>
+ #include <grpc/support/sync.h>
+ #include <grpc/support/time.h>
++#include <absl/strings/str_cat.h>
+
+ #include "src/core/lib/address_utils/sockaddr_utils.h"
+ #include "src/core/lib/debug/event_log.h"
diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake
@@ -19,6 +19,7 @@ vcpkg_from_github(
         00012-fix-use-cxx17.patch
         00014-pkgconfig-upbdefs.patch
         00015-disable-download-archive.patch
+        00016_add_header.patch
 )
 
 if(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET)

diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "grpc",
   "version-semver": "1.51.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "An RPC library and framework",
   "homepage": "https://github.com/grpc/grpc",
   "license": "Apache-2.0",

diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a8b26862556884ff981430b54b130d4b1ef6eef7",
+      "version": "20240116.1",
+      "port-version": 0
+    },
     {
       "git-tree": "49a35a30915907a4e46b57bb33b8aa1f2185e757",
       "version": "20230802.1",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -17,7 +17,7 @@
       "port-version": 0
     },
     "abseil": {
-      "baseline": "20230802.1",
+      "baseline": "20240116.1",
       "port-version": 0
     },
     "absent": {
@@ -3174,7 +3174,7 @@
     },
     "grpc": {
       "baseline": "1.51.1",
-      "port-version": 1
+      "port-version": 2
     },
     "grppi": {
       "baseline": "0.4.0",

diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d904c97eca4bce7c1a9a0293b9101b831d0bb03f",
+      "version-semver": "1.51.1",
+      "port-version": 2
+    },
     {
       "git-tree": "cb74de57b43021aafda930876608035b03eb80a8",
       "version-semver": "1.51.1",