rebase patches

Author: h-vetinari

recipe/meta.yaml

@@ -22,8 +22,6 @@ source:
       # upstream problems on with s3 tests on osx, see
       # https://github.com/apache/arrow/issues/35587
       - patches/0002-skip-NonExistentBucket-test-on-osx.patch
-      # backport https://github.com/apache/arrow/pull/45859
-      - patches/0003-MINOR-C-Fix-OTel-1.19-compat-after-silent-breaking-c.patch
 
   # testing-submodules not part of release tarball
   - git_url: https://github.com/apache/arrow-testing.git

recipe/patches/0001-disable-gcsfs_test.patch

@@ -1,7 +1,7 @@
-From 7eeeb3020a6598d5b3ee544517846eab878c4d98 Mon Sep 17 00:00:00 2001
+From 30fba4c46fe8073c9b2fead7e0a46a60a6d80324 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <[email protected]>
 Date: Sat, 2 Nov 2024 15:41:34 +1100
-Subject: [PATCH 1/3] disable gcsfs_test
+Subject: [PATCH 1/2] disable gcsfs_test
 
 it cannot work unless we package https://github.com/googleapis/storage-testbench,
 which however has extremely tight dependencies on protobuf etc., making it very
@@ -11,7 +11,7 @@ hard to fit this into our migration patterns
  1 file changed, 8 deletions(-)
 
 diff --git a/cpp/src/arrow/filesystem/CMakeLists.txt b/cpp/src/arrow/filesystem/CMakeLists.txt
-index 7afdf566f2..b22a48a0c9 100644
+index 5250ed2a88..ba053bd501 100644
 --- a/cpp/src/arrow/filesystem/CMakeLists.txt
 +++ b/cpp/src/arrow/filesystem/CMakeLists.txt
 @@ -42,14 +42,6 @@ if(ARROW_BUILD_BENCHMARKS)

recipe/patches/0002-skip-NonExistentBucket-test-on-osx.patch

@@ -1,17 +1,17 @@
-From deb8b771607671511ce0e2a2586502e0de3bc5c5 Mon Sep 17 00:00:00 2001
+From da2bd6baff0e10b961684a9024e25f9b2d821a3c Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <[email protected]>
 Date: Sun, 24 Nov 2024 20:22:35 +1100
-Subject: [PATCH 2/3] skip NonExistentBucket test on osx
+Subject: [PATCH 2/2] skip NonExistentBucket test on osx
 
 ---
  cpp/src/arrow/filesystem/s3fs_test.cc | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/cpp/src/arrow/filesystem/s3fs_test.cc b/cpp/src/arrow/filesystem/s3fs_test.cc
-index 370f3b2685..45ed73d420 100644
+index f0a5d0e2e4..b5578b4f74 100644
 --- a/cpp/src/arrow/filesystem/s3fs_test.cc
 +++ b/cpp/src/arrow/filesystem/s3fs_test.cc
-@@ -431,6 +431,10 @@ TEST_F(S3RegionResolutionTest, RestrictedBucket) {
+@@ -438,6 +438,10 @@ TEST_F(S3RegionResolutionTest, RestrictedBucket) {
  }
 
  TEST_F(S3RegionResolutionTest, NonExistentBucket) {