Attachment 255298 Details for Bug 282859 – [UPDATE] databases/arrow: update to 18.0.0 release

[patch] [UPDATE] databases/arrow: update to 18.0.0 release

databases_arrow-18_0_0.diff (text/plain), 8.38 KB, created by Dima Panov on 2024-11-19 10:11:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dima Panov

Created: 2024-11-19 10:11:28 UTC

Size: 8.38 KB

patch

obsolete

>diff --git a/databases/arrow/Makefile b/databases/arrow/Makefile
>index b5b373a28c49..0b20d1d94c23 100644
>--- a/databases/arrow/Makefile
>+++ b/databases/arrow/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	arrow
>-DISTVERSION=	17.0.0
>-PORTREVISION=	11
>+DISTVERSION=	18.0.0
> CATEGORIES=	databases
> MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION} \
> 		https://github.com/apache/orc/archive/rel/:orc
>@@ -25,6 +24,8 @@ GH_ACCOUNT=	apache
> 
> WRKSRC_SUBDIR=	cpp
> 
>+PLIST_SUB+=	LIBVERSION=${DISTVERSION:S/.//g}
>+
> CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17 -DARROW_SIMD_LEVEL=NONE -DARROW_RUNTIME_SIMD_LEVEL=NONE \
> 		-DPython3_EXECUTABLE=${PYTHON_CMD}
> CMAKE_OFF=	ARROW_BUILD_STATIC ARROW_WITH_BACKTRACE ARROW_BUILD_TESTS ARROW_BUILD_BENCHMARKS
>@@ -191,6 +192,10 @@ OPTIONS_DEFAULT+=	${opt}
> PLIST_FILES+=	lib/cmake/Arrow/Findre2Alt.cmake
> .endif
> 
>+.if ${PORT_OPTIONS:MZSTD} || ${PORT_OPTIONS:MGANDIVA}
>+PLIST_FILES+=	lib/cmake/Gandiva/FindzstdAlt.cmake
>+.endif
>+
> .if ${PORT_OPTIONS:MIPC} && ${PORT_OPTIONS:MBUILD_UTILITIES}
> PLIST_FILES+=	bin/arrow-file-to-stream \
> 		bin/arrow-stream-to-file
>diff --git a/databases/arrow/distinfo b/databases/arrow/distinfo
>index c0ab48d01872..2155ee2495c1 100644
>--- a/databases/arrow/distinfo
>+++ b/databases/arrow/distinfo
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1721587793
>-SHA256 (apache-arrow-17.0.0.tar.gz) = 9d280d8042e7cf526f8c28d170d93bfab65e50f94569f6a790982a878d8d898d
>-SIZE (apache-arrow-17.0.0.tar.gz) = 21822331
>+TIMESTAMP = 1731955692
>+SHA256 (apache-arrow-18.0.0.tar.gz) = abcf1934cd0cdddd33664e9f2d9a251d6c55239d1122ad0ed223b13a583c82a9
>+SIZE (apache-arrow-18.0.0.tar.gz) = 19113236
> SHA256 (release-1.6.6.tar.gz) = 9a92b3eaad1d8b88a18cee41058feb34eb43d919df363e0b74a0b857724e4ba0
> SIZE (release-1.6.6.tar.gz) = 13939853
>diff --git a/databases/arrow/files/patch-CMakeLists.txt b/databases/arrow/files/patch-CMakeLists.txt
>index 97bc4e65ef81..78322c85ebfc 100644
>--- a/databases/arrow/files/patch-CMakeLists.txt
>+++ b/databases/arrow/files/patch-CMakeLists.txt
>@@ -1,6 +1,6 @@
>---- CMakeLists.txt.orig	2024-03-13 13:37:59 UTC
>+--- CMakeLists.txt.orig	2024-10-16 09:22:21 UTC
> +++ CMakeLists.txt
>-@@ -124,7 +124,7 @@ include(CMakeParseArguments)
>+@@ -132,7 +132,7 @@ include(CMakeParseArguments)
>  
>  include(CMakePackageConfigHelpers)
>  include(CMakeParseArguments)
>@@ -9,7 +9,7 @@
>  include(FindPackageHandleStandardArgs)
>  
>  include(GNUInstallDirs)
>-@@ -1010,9 +1010,9 @@ endif()
>+@@ -745,9 +745,9 @@ endif()
>    add_subdirectory(examples/arrow)
>  endif()
>  
>diff --git a/databases/arrow/pkg-plist b/databases/arrow/pkg-plist
>index 8649a0874b89..b55f33749995 100644
>--- a/databases/arrow/pkg-plist
>+++ b/databases/arrow/pkg-plist
>@@ -21,7 +21,6 @@
> %%ACERO%%include/arrow/acero/time_series_util.h
> %%ACERO%%include/arrow/acero/tpch_node.h
> %%ACERO%%include/arrow/acero/type_fwd.h
>-%%ACERO%%include/arrow/acero/unmaterialized_table.h
> %%ACERO%%include/arrow/acero/util.h
> %%ACERO%%include/arrow/acero/visibility.h
> include/arrow/api.h
>@@ -46,6 +45,7 @@ include/arrow/array/builder_union.h
> include/arrow/array/concatenate.h
> include/arrow/array/data.h
> include/arrow/array/diff.h
>+include/arrow/array/statistics.h
> include/arrow/array/util.h
> include/arrow/array/validate.h
> include/arrow/buffer.h
>@@ -107,7 +107,12 @@ include/arrow/config.h
> %%DATASET%%include/arrow/dataset/visibility.h
> include/arrow/datum.h
> include/arrow/device.h
>+include/arrow/device_allocation_type_set.h
> %%JSON%%include/arrow/extension/fixed_shape_tensor.h
>+%%JSON%%include/arrow/extension/bool8.h
>+%%JSON%%include/arrow/extension/json.h
>+%%JSON%%include/arrow/extension/opaque.h
>+%%JSON%%include/arrow/extension/uuid.h
> include/arrow/extension_type.h
> %%FILESYSTEM%%include/arrow/filesystem/api.h
> %%FILESYSTEM%%include/arrow/filesystem/azurefs.h
>@@ -136,7 +141,9 @@ include/arrow/extension_type.h
> %%FLIGHT%%include/arrow/flight/server_auth.h
> %%FLIGHT%%include/arrow/flight/server_middleware.h
> %%FLIGHT%%include/arrow/flight/server_tracing_middleware.h
>+%%FLIGHT%%include/arrow/flight/test_auth_handlers.h
> %%FLIGHT%%include/arrow/flight/test_definitions.h
>+%%FLIGHT%%include/arrow/flight/test_flight_server.h
> %%FLIGHT%%include/arrow/flight/test_util.h
> %%FLIGHT%%include/arrow/flight/transport.h
> %%FLIGHT%%include/arrow/flight/transport_server.h
>@@ -209,6 +216,7 @@ include/arrow/testing/gtest_compat.h
> include/arrow/testing/gtest_util.h
> include/arrow/testing/matchers.h
> include/arrow/testing/pch.h
>+include/arrow/testing/process.h
> include/arrow/testing/random.h
> include/arrow/testing/uniform_real.h
> include/arrow/testing/util.h
>@@ -228,7 +236,6 @@ include/arrow/util/benchmark_util.h
> include/arrow/util/binary_view_util.h
> include/arrow/util/bit_block_counter.h
> include/arrow/util/bit_run_reader.h
>-include/arrow/util/bit_stream_utils.h
> include/arrow/util/bit_util.h
> include/arrow/util/bitmap.h
> include/arrow/util/bitmap_builders.h
>@@ -284,12 +291,12 @@ include/arrow/util/memory.h
> include/arrow/util/mutex.h
> include/arrow/util/parallel.h
> include/arrow/util/pcg_random.h
>+include/arrow/util/prefetch.h
> include/arrow/util/print.h
> include/arrow/util/queue.h
> include/arrow/util/range.h
> include/arrow/util/ree_util.h
> include/arrow/util/regex.h
>-include/arrow/util/rle_encoding.h
> include/arrow/util/rows_to_batches.h
> include/arrow/util/simd.h
> include/arrow/util/small_vector.h
>@@ -486,6 +493,10 @@ lib/cmake/Arrow/ArrowTargets-%%CMAKE_BUILD_TYPE%%.cmake
> lib/cmake/Arrow/ArrowTargets.cmake
> %%S3%%lib/cmake/Arrow/FindAWSSDKAlt.cmake
> %%S3%%lib/cmake/Arrow/FindOpenSSLAlt.cmake
>+%%BROTLI%%lib/cmake/Arrow/FindBrotliAlt.cmake
>+%%SNAPPY%%lib/cmake/Arrow/FindSnappyAlt.cmake
>+%%LZ4%%lib/cmake/Arrow/Findlz4Alt.cmake
>+%%ZSTD%%lib/cmake/Arrow/FindzstdAlt.cmake
> lib/cmake/Arrow/arrow-config.cmake
> %%FLIGHT%%lib/cmake/ArrowFlight/ArrowFlightConfig.cmake
> %%FLIGHT%%lib/cmake/ArrowFlight/ArrowFlightConfigVersion.cmake
>@@ -498,8 +509,8 @@ lib/cmake/Arrow/arrow-config.cmake
> %%TESTINGFLIGHT%%lib/cmake/ArrowFlightTesting/ArrowFlightTestingTargets-%%CMAKE_BUILD_TYPE%%.cmake
> %%TESTINGFLIGHT%%lib/cmake/ArrowFlightTesting/ArrowFlightTestingTargets.cmake
> %%TESTINGFLIGHT%%lib/libarrow_flight_testing.so
>-%%TESTINGFLIGHT%%lib/libarrow_flight_testing.so.1700
>-%%TESTINGFLIGHT%%lib/libarrow_flight_testing.so.1700.0.0
>+%%TESTINGFLIGHT%%lib/libarrow_flight_testing.so.%%LIBVERSION%%
>+%%TESTINGFLIGHT%%lib/libarrow_flight_testing.so.%%LIBVERSION%%.0.0
> %%TESTINGFLIGHT%%libdata/pkgconfig/arrow-flight-testing.pc
> %%PYTHONFLIGHT%%lib/cmake/arrow/ArrowPythonFlightConfig.cmake
> %%PYTHONFLIGHT%%lib/cmake/arrow/ArrowPythonFlightConfigVersion.cmake
>@@ -531,26 +542,26 @@ lib/cmake/Arrow/arrow-config.cmake
> %%PARQUET%%lib/cmake/Parquet/ParquetTargets-%%CMAKE_BUILD_TYPE%%.cmake
> %%PARQUET%%lib/cmake/Parquet/ParquetTargets.cmake
> lib/libarrow.so
>-lib/libarrow.so.1700
>-lib/libarrow.so.1700.0.0
>+lib/libarrow.so.%%LIBVERSION%%
>+lib/libarrow.so.%%LIBVERSION%%.0.0
> %%ACERO%%lib/libarrow_acero.so
>-%%ACERO%%lib/libarrow_acero.so.1700
>-%%ACERO%%lib/libarrow_acero.so.1700.0.0
>+%%ACERO%%lib/libarrow_acero.so.%%LIBVERSION%%
>+%%ACERO%%lib/libarrow_acero.so.%%LIBVERSION%%.0.0
> %%DATASET%%lib/libarrow_dataset.so
>-%%DATASET%%lib/libarrow_dataset.so.1700
>-%%DATASET%%lib/libarrow_dataset.so.1700.0.0
>+%%DATASET%%lib/libarrow_dataset.so.%%LIBVERSION%%
>+%%DATASET%%lib/libarrow_dataset.so.%%LIBVERSION%%.0.0
> %%FLIGHT%%lib/libarrow_flight.so
>-%%FLIGHT%%lib/libarrow_flight.so.1700
>-%%FLIGHT%%lib/libarrow_flight.so.1700.0.0
>+%%FLIGHT%%lib/libarrow_flight.so.%%LIBVERSION%%
>+%%FLIGHT%%lib/libarrow_flight.so.%%LIBVERSION%%.0.0
> %%TESTING%%lib/libarrow_testing.so
>-%%TESTING%%lib/libarrow_testing.so.1700
>-%%TESTING%%lib/libarrow_testing.so.1700.0.0
>+%%TESTING%%lib/libarrow_testing.so.%%LIBVERSION%%
>+%%TESTING%%lib/libarrow_testing.so.%%LIBVERSION%%.0.0
> %%GANDIVA%%lib/libgandiva.so
>-%%GANDIVA%%lib/libgandiva.so.1700
>-%%GANDIVA%%lib/libgandiva.so.1700.0.0
>+%%GANDIVA%%lib/libgandiva.so.%%LIBVERSION%%
>+%%GANDIVA%%lib/libgandiva.so.%%LIBVERSION%%.0.0
> %%PARQUET%%lib/libparquet.so
>-%%PARQUET%%lib/libparquet.so.1700
>-%%PARQUET%%lib/libparquet.so.1700.0.0
>+%%PARQUET%%lib/libparquet.so.%%LIBVERSION%%
>+%%PARQUET%%lib/libparquet.so.%%LIBVERSION%%.0.0
> %%ACERO%%libdata/pkgconfig/arrow-acero.pc
> %%COMPUTE%%libdata/pkgconfig/arrow-compute.pc
> %%CSV%%libdata/pkgconfig/arrow-csv.pc
>@@ -564,4 +575,4 @@ libdata/pkgconfig/arrow.pc
> %%GANDIVA%%libdata/pkgconfig/gandiva.pc
> %%PARQUET%%libdata/pkgconfig/parquet.pc
> %%DATADIR%%/gdb/gdb_arrow.py
>-share/gdb/auto-load/usr/local/lib/libarrow.so.1700.0.0-gdb.py
>+share/gdb/auto-load/usr/local/lib/libarrow.so.%%LIBVERSION%%.0.0-gdb.py

Actions: View | Diff

Attachments on bug 282859: 255298