From 4353b6e33f60c6af25549bd01a0c84740ff21c02 Mon Sep 17 00:00:00 2001 From: Bryce Mecum Date: Mon, 2 Dec 2024 16:29:01 -0800 Subject: [PATCH] [arrow] Update to 18.1.0 (#42357) Co-authored-by: Kai Pastor --- ...name.patch => 0001-msvc-static-name.patch} | 0 .../arrow/{thrift.patch => 0002-thrift.patch} | 0 .../{utf8proc.patch => 0003-utf8proc.patch} | 0 ...{android.patch => 0004-android-musl.patch} | 6 ++-- ports/arrow/0005-android-datetime.patch | 29 +++++++++++++++++++ ports/arrow/portfile.cmake | 11 +++---- ports/arrow/vcpkg.json | 2 +- versions/a-/arrow.json | 5 ++++ versions/baseline.json | 2 +- 9 files changed, 45 insertions(+), 10 deletions(-) rename ports/arrow/{msvc-static-name.patch => 0001-msvc-static-name.patch} (100%) rename ports/arrow/{thrift.patch => 0002-thrift.patch} (100%) rename ports/arrow/{utf8proc.patch => 0003-utf8proc.patch} (100%) rename ports/arrow/{android.patch => 0004-android-musl.patch} (99%) create mode 100644 ports/arrow/0005-android-datetime.patch diff --git a/ports/arrow/msvc-static-name.patch b/ports/arrow/0001-msvc-static-name.patch similarity index 100% rename from ports/arrow/msvc-static-name.patch rename to ports/arrow/0001-msvc-static-name.patch diff --git a/ports/arrow/thrift.patch b/ports/arrow/0002-thrift.patch similarity index 100% rename from ports/arrow/thrift.patch rename to ports/arrow/0002-thrift.patch diff --git a/ports/arrow/utf8proc.patch b/ports/arrow/0003-utf8proc.patch similarity index 100% rename from ports/arrow/utf8proc.patch rename to ports/arrow/0003-utf8proc.patch diff --git a/ports/arrow/android.patch b/ports/arrow/0004-android-musl.patch similarity index 99% rename from ports/arrow/android.patch rename to ports/arrow/0004-android-musl.patch index b228d8885f..4eb412d1a5 100644 --- a/ports/arrow/android.patch +++ b/ports/arrow/0004-android-musl.patch @@ -5,7 +5,7 @@ index 6dc8358..2b91efa 100644 @@ -166,7 +166,7 @@ if(WIN32) list(APPEND ARROW_SYSTEM_LINK_LIBS "ws2_32") endif() - + -if(NOT WIN32 AND NOT APPLE) +if(NOT WIN32 AND NOT APPLE AND NOT ANDROID) # Pass -lrt on Linux only @@ -17,11 +17,11 @@ index 41912fd..0ea36e9 100644 +++ b/cpp/src/arrow/vendored/musl/strptime.c @@ -18,7 +18,9 @@ #undef HAVE_LANGINFO - + #ifndef _WIN32 +# if !(defined(__ANDROID__) && __ANDROID_API__ < 26) #define HAVE_LANGINFO 1 +# endif #endif - + #ifdef HAVE_LANGINFO diff --git a/ports/arrow/0005-android-datetime.patch b/ports/arrow/0005-android-datetime.patch new file mode 100644 index 0000000000..ae8b7562de --- /dev/null +++ b/ports/arrow/0005-android-datetime.patch @@ -0,0 +1,29 @@ +diff --git a/cpp/src/arrow/vendored/datetime/tz.h b/cpp/src/arrow/vendored/datetime/tz.h +index 61ab3df106..d456d6765f 100644 +--- a/cpp/src/arrow/vendored/datetime/tz.h ++++ b/cpp/src/arrow/vendored/datetime/tz.h +@@ -858,7 +858,9 @@ private: + load_data(std::istream& inf, std::int32_t tzh_leapcnt, std::int32_t tzh_timecnt, + std::int32_t tzh_typecnt, std::int32_t tzh_charcnt); + # if defined(ANDROID) || defined(__ANDROID__) ++public: + void parse_from_android_tzdata(std::ifstream& inf, const std::size_t off); ++private: + # endif // defined(ANDROID) || defined(__ANDROID__) + #else // !USE_OS_TZDB + DATE_API sys_info get_info_impl(sys_seconds tp, int tz_int) const; +diff --git a/cpp/src/arrow/vendored/datetime/visibility.h b/cpp/src/arrow/vendored/datetime/visibility.h +index 780c00d70b..a9514edba7 100644 +--- a/cpp/src/arrow/vendored/datetime/visibility.h ++++ b/cpp/src/arrow/vendored/datetime/visibility.h +@@ -21,6 +21,10 @@ + # define USE_OS_TZDB 1 + #endif + ++#if defined(ANDROID) || defined(__ANDROID__) ++# define BUILD_TZ_LIB ++#endif ++ + #if defined(ARROW_STATIC) + // intentially empty + #elif defined(ARROW_EXPORTING) diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index e2462494cb..478b57efdb 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -2,16 +2,17 @@ vcpkg_download_distfile( ARCHIVE_PATH URLS "https://archive.apache.org/dist/arrow/arrow-${VERSION}/apache-arrow-${VERSION}.tar.gz" FILENAME apache-arrow-${VERSION}.tar.gz - SHA512 4df30ab5561da695eaa864422626b9898555d86ca56835c3b8a8ca93a1dbaf081582bb36e2440d1daf7e1dd48c76941f1152a4f25ce0dbcc1c2abe244a00c05e + SHA512 7249c03a6097bc64fb0092143e4d4aaef3227565147e6254f026ddd504177c8dd565a184a0df39743dc989070dc3785e5b66f738c8e310ed9c982b61c2ec4914 ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE ${ARCHIVE_PATH} PATCHES - android.patch - msvc-static-name.patch - utf8proc.patch - thrift.patch + 0001-msvc-static-name.patch + 0002-thrift.patch + 0003-utf8proc.patch + 0004-android-musl.patch + 0005-android-datetime.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index cdcff51138..2dc6f8ec8f 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,6 +1,6 @@ { "name": "arrow", - "version": "18.0.0", + "version": "18.1.0", "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "license": "Apache-2.0", diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index 54c79632fe..f8d09524cd 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cff712c97f67ce2ef9061d823c751f5e209e5838", + "version": "18.1.0", + "port-version": 0 + }, { "git-tree": "f62b9ba3d5fcf264637a1acc6edc72557b0f1461", "version": "18.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index db696dd2c4..d29b27c79c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -245,7 +245,7 @@ "port-version": 7 }, "arrow": { - "baseline": "18.0.0", + "baseline": "18.1.0", "port-version": 0 }, "arsenalgear": {