Rebase patches

recipe/meta.yaml

@@ -16,8 +16,6 @@ source:
     #   https://github.com/googleapis/google-cloud-cpp/issues/8145
     #   https://github.com/googleapis/google-cloud-cpp/issues/8785
     - patches/0001-disable-libraries.patch  # [libprotobuf == "3.21"]
-    # backport https://github.com/googleapis/google-cloud-cpp/pull/11782
-    - patches/0002-fix-better-support-for-cross-compilation-11782.patch
 
 build:
   number: 0

recipe/patches/0001-disable-libraries.patch

@@ -1,17 +1,17 @@
-From f014c88e7ea57ec2907edf26752264566ef7fa0a Mon Sep 17 00:00:00 2001
+From 0012bc6ca9f1b3d3d4023ce763afb5f9a8057dd6 Mon Sep 17 00:00:00 2001
 From: Carlos O'Ryan <[email protected]>
 Date: Tue, 7 Feb 2023 01:35:26 +0000
-Subject: [PATCH 1/2] disable libraries
+Subject: [PATCH] disable libraries
 
 ---
  cmake/GoogleCloudCppFeatures.cmake | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/cmake/GoogleCloudCppFeatures.cmake b/cmake/GoogleCloudCppFeatures.cmake
-index c50048d01f..c3bb7c4b22 100644
+index 7f7de7b4b3..c42e3bf4a0 100644
 --- a/cmake/GoogleCloudCppFeatures.cmake
 +++ b/cmake/GoogleCloudCppFeatures.cmake
-@@ -43,7 +43,7 @@ set(GOOGLE_CLOUD_CPP_GA_LIBRARIES
+@@ -44,7 +44,7 @@ set(GOOGLE_CLOUD_CPP_GA_LIBRARIES
      "apigeeconnect"
      "appengine"
      "artifactregistry"
@@ -20,7 +20,7 @@ index c50048d01f..c3bb7c4b22 100644
      "assuredworkloads"
      "automl"
      "baremetalsolution"
-@@ -54,7 +54,7 @@ set(GOOGLE_CLOUD_CPP_GA_LIBRARIES
+@@ -55,7 +55,7 @@ set(GOOGLE_CLOUD_CPP_GA_LIBRARIES
      "billing"
      "binaryauthorization"
      "certificatemanager"
@@ -29,7 +29,7 @@ index c50048d01f..c3bb7c4b22 100644
      "cloudbuild"
      "composer"
      "confidentialcomputing"
-@@ -119,7 +119,7 @@ set(GOOGLE_CLOUD_CPP_GA_LIBRARIES
+@@ -125,7 +125,7 @@ set(GOOGLE_CLOUD_CPP_GA_LIBRARIES
      "speech"
      "storage"
      "storageinsights"