Attachment 244399 Details for Bug 273389 – patch

[patch] patch

arrow.patch (text/plain), 37.75 KB, created by Yuri Victorovich on 2023-08-27 20:49:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2023-08-27 20:49:54 UTC

Size: 37.75 KB

patch

obsolete

>diff --git a/databases/arrow/Makefile b/databases/arrow/Makefile
>index 04be13b4be14..cf6c52e7d44a 100644
>--- a/databases/arrow/Makefile
>+++ b/databases/arrow/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	arrow
>-DISTVERSION=	8.0.0
>-PORTREVISION=	13
>+DISTVERSION=	13.0.0
> CATEGORIES=	databases
> MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION} \
> 		https://github.com/apache/orc/archive/rel/:orc
>@@ -17,19 +16,30 @@ LICENSE_FILE=	${WRKSRC}/../LICENSE.txt
> 
> LIB_DEPENDS=	libboost_system.so:devel/boost-libs
> 
>-USES=		cmake compiler:c++14-lang localbase pkgconfig python:build
>+USES=		cmake compiler:c++17-lang localbase pkgconfig python:build
> USE_LDCONFIG=	yes
> 
> WRKSRC_SUBDIR=	cpp
> 
>-CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=14 -DARROW_SIMD_LEVEL=NONE -DARROW_RUNTIME_SIMD_LEVEL=NONE
>+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
> 
> OPTIONS_GROUP=			COMPRESSION COMPONENTS # components are listed in cpp/cmake_modules/DefineOptions.cmake
> OPTIONS_GROUP_COMPRESSION=	BROTLI BZ2 LZ4 SNAPPY ZLIB ZSTD
>-OPTIONS_GROUP_COMPONENTS=	COMPUTE CSV DATASET FILESYSTEM FLIGHT GANDIVA HDFS HIVESERVER2 IPC JSON MIMALLOC PARQUET ORC PLASMA PYTHON S3 SKYHOOK SUBSTRAIT BUILD_UTILITIES TESTING
>+OPTIONS_GROUP_COMPONENTS=	ACERO COMPUTE CSV DATASET FILESYSTEM FLIGHT GANDIVA HDFS IPC JSON MIMALLOC PARQUET ORC S3 SKYHOOK SUBSTRAIT BUILD_UTILITIES TENSORFLOW TESTING
>+OPTIONS_DEFINE=			UTF8PROC
>+OPTIONS_DEFAULT=		UTF8PROC
> OPTIONS_SUB=			yes
> 
>+## Miscellaneous options
>+
>+UTF8PROC_DESC=			Build with support for Unicode properties using the utf8proc library
>+UTF8PROC_CMAKE_BOOL=		ARROW_WITH_UTF8PROC
>+UTF8PROC_LIB_DEPENDS=		libutf8proc.so:textproc/utf8proc
>+
>+## DESCs
>+
> COMPRESSION_DESC=		Compression support:
> COMPONENTS_DESC=		Build components:
> 
>@@ -55,17 +65,20 @@ ZSTD_LIB_DEPENDS=		libzstd.so:archivers/zstd
> 
> ## Component options
> 
>+ACERO_DESC=			Arrow Acero Engine Module
>+ACERO_CMAKE_BOOL=		ARROW_ACERO
>+ACERO_IMPLIES=			COMPUTE IPC
>+
> COMPUTE_DESC=			Arrow Compute Modules
> COMPUTE_CMAKE_BOOL=		ARROW_COMPUTE
>-COMPUTE_LIB_DEPENDS=		libre2.so:devel/re2 \
>-				libutf8proc.so:textproc/utf8proc
>+COMPUTE_LIB_DEPENDS=		libre2.so:devel/re2
> 
> CSV_DESC=			Arrow CSV Parser Module
> CSV_CMAKE_BOOL=			ARROW_CSV
> 
> DATASET_DESC=			Arrow Dataset Modules
> DATASET_CMAKE_BOOL=		ARROW_DATASET
>-DATASET_IMPLIES=		COMPUTE FILESYSTEM
>+DATASET_IMPLIES=		ACERO FILESYSTEM
> 
> FILESYSTEM_DESC=		Arrow Filesystem Layer
> FILESYSTEM_CMAKE_BOOL=		ARROW_FILESYSTEM
>@@ -88,19 +101,12 @@ GANDIVA_CMAKE_BOOL=		ARROW_GANDIVA
> GANDIVA_BUILD_DEPENDS=		${LOCALBASE}/bin/clang12:devel/llvm12 # explicitly requires llvm-12
> GANDIVA_LIB_DEPENDS=		libgrpc.so:devel/grpc \
> 				libprotobuf.so:devel/protobuf \
>-				libre2.so:devel/re2 \
>-				libutf8proc.so:textproc/utf8proc
>+				libre2.so:devel/re2
>+GANDIVA_IMPLIES=		UTF8PROC
> 
> HDFS_DESC=			Arrow HDFS bridge
> HDFS_CMAKE_BOOL=		ARROW_HDFS
> 
>-HIVESERVER2_DESC=		HiveServer2 client and Arrow adapter
>-HIVESERVER2_USES=		python:build
>-HIVESERVER2_VARS=		BINARY_ALIAS=python=${PYTHON_CMD}
>-HIVESERVER2_BUILD_DEPENDS=	thrift:devel/thrift
>-HIVESERVER2_CMAKE_BOOL=		ARROW_HIVESERVER2
>-HIVESERVER2_BROKEN=		Pending conflict fix in thrift ports in bug#255538
>-
> IPC_DESC=			Arrow IPC extensions
> IPC_CMAKE_BOOL=			ARROW_IPC
> 
>@@ -117,7 +123,7 @@ PARQUET_DESC=			Parquet libraries
> PARQUET_CMAKE_BOOL=		ARROW_PARQUET PARQUET_REQUIRE_ENCRYPTION
> PARQUET_USES=			ssl
> PARQUET_LIB_DEPENDS=		libthrift.so:devel/thrift-cpp
>-PARQUET_IMPLIES=		COMPUTE
>+PARQUET_IMPLIES=		IPC
> 
> ORC_DESC=			Arrow ORC adapter
> ORC_CMAKE_BOOL=			ARROW_ORC
>@@ -126,95 +132,70 @@ ORC_CONFIGURE_ENV=		ARROW_ORC_URL=file://${DISTDIR}/${DIST_SUBDIR}/release-1.6.6
> ORC_IMPLIES=			LZ4 SNAPPY ZLIB ZSTD # cpp/CMakeLists.txt
> ORC_BROKEN=			fatal error: 'orc/OrcFile.hh' file not found: https://issues.apache.org/jira/browse/ARROW-12624
> 
>-PLASMA_DESC=			Plasma object store
>-PLASMA_CMAKE_BOOL=		ARROW_PLASMA
>-PLASMA_LIB_DEPENDS=		libaws-c-auth.so:security/aws-c-auth \
>-				libaws-c-compression.so:devel/aws-c-compression \
>-				libaws-c-http.so:devel/aws-c-http \
>-				libaws-c-mqtt.so:devel/aws-c-mqtt \
>-				libaws-c-s3.so:devel/aws-c-s3 \
>-				libaws-c-sdkutils.so:devel/aws-c-sdkutils \
>-				libaws-crt-cpp.so:devel/aws-crt-cpp \
>-				libgflags.so:devel/gflags
>-
> BUILD_UTILITIES_DESC=		build Arrow commandline utilities
> BUILD_UTILITIES_CMAKE_BOOL=	ARROW_BUILD_UTILITIES
> 
>-PYTHON_DESC=			Build python extension support
>-PYTHON_CMAKE_BOOL=		ARROW_PYTHON
>-PYTHON_USES=			python
>-PYTHON_BUILD_DEPENDS=		${PYNUMPY} # see https://issues.apache.org/jira/browse/ARROW-16820
>-PYTHON_CMAKE_ON=		-DPython3_EXECUTABLE=${PYTHON_CMD}
>-PYTHON_LIB_DEPENDS=		libutf8proc.so:textproc/utf8proc
>-PYTHON_RUN_DEPENDS=		${PYNUMPY}
>-PYTHON_IMPLIES=			COMPUTE CSV DATASET FILESYSTEM HDFS JSON
>-PYTHON_VARS=			PLIST_SUB+=PYTHON_SUFFIX=${PYTHON_SUFFIX}
>+#PYTHON_DESC=			Build python extension support
>+#PYTHON_CMAKE_BOOL=		ARROW_PYTHON
>+#PYTHON_USES=			python
>+#PYTHON_BUILD_DEPENDS=		${PYNUMPY} # see https://issues.apache.org/jira/browse/ARROW-16820
>+#PYTHON_CMAKE_ON=		-DPython3_EXECUTABLE=${PYTHON_CMD}
>+#PYTHON_RUN_DEPENDS=		${PYNUMPY}
>+#PYTHON_IMPLIES=			COMPUTE CSV DATASET FILESYSTEM HDFS JSON
>+#PYTHON_VARS=			PLIST_SUB+=PYTHON_SUFFIX=${PYTHON_SUFFIX}
> 
> S3_DESC=			S3 support
> S3_CMAKE_BOOL=			ARROW_S3
> S3_USES=			ssl
> S3_LIB_DEPENDS=			\
>+				libaws-c-auth.so:security/aws-c-auth \
> 				libaws-c-cal.so:security/aws-c-cal \
> 				libaws-c-common.so:devel/aws-c-common \
>+				libaws-c-compression.so:devel/aws-c-compression \
> 				libaws-c-event-stream.so:devel/aws-c-event-stream \
>+				libaws-c-http.so:devel/aws-c-http \
> 				libaws-c-io.so:devel/aws-c-io \
>+				libaws-c-mqtt.so:devel/aws-c-mqtt \
>+				libaws-c-s3.so:devel/aws-c-s3 \
>+				libaws-c-sdkutils.so:devel/aws-c-sdkutils \
> 				libaws-checksums.so:devel/aws-checksums \
>+				libaws-crt-cpp.so:devel/aws-crt-cpp \
> 				libaws-cpp-sdk-s3.so:devel/aws-sdk-cpp \
> 				libs2n.so:security/s2n-tls
>-S3_IMPLIES=			ZLIB
> 
> SKYHOOK_DESC=			Build the Skyhook libraries
> SKYHOOK_CMAKE_BOOL=		ARROW_SKYHOOK
>+SKYHOOK_IMPLIES=		DATASET PARQUET
> SKYHOOK_BROKEN=			could NOT find librados
> 
> SUBSTRAIT_DESC=			Build the Arrow Substrait Consumer Module
> SUBSTRAIT_CMAKE_BOOL=		ARROW_SUBSTRAIT
>+SUBSTRAIT_IMPLIES=		DATASET IPC PARQUET
> SUBSTRAIT_BROKEN=		needs investigation
> 
>+TENSORFLOW_DESC=		TensorFlow support
>+TENSORFLOW_CMAKE_BOOL=		ARROW_TENSORFLOW
>+TENSORFLOW_BROKEN=		needs testing
>+
> TESTING_DESC=			Arrow testing libraries
> TESTING_CMAKE_BOOL=		ARROW_TESTING
> TESTING_LIB_DEPENDS=		libgtest.so:devel/googletest
> 
>-.for opt in ${OPTIONS_GROUP_COMPRESSION} ${OPTIONS_GROUP_COMPONENTS}
>+.for opt in ${OPTIONS_GROUP_COMPONENTS}
> .  if "${${opt}_BROKEN}" == ""
> OPTIONS_DEFAULT+=	${opt}
> .  endif
> .endfor
> 
>-.include <bsd.port.pre.mk>
>-
>-pre-configure-PYTHON-on:
>-	@${REINPLACE_CMD} -e ' \
>-		s|arrow_python|arrow_python${PYTHON_SUFFIX}|g; \
>-		s|arrow-python|arrow-python${PYTHON_SUFFIX}|g \
>-		' \
>-		${WRKSRC}/../ci/appveyor-cpp-build.bat \
>-		${WRKSRC}/../cpp/cmake_modules/FindArrowPython.cmake \
>-		${WRKSRC}/../cpp/cmake_modules/FindArrowPythonFlight.cmake \
>-		${WRKSRC}/../cpp/src/arrow/python/arrow-python-flight.pc.in \
>-		${WRKSRC}/../cpp/src/arrow/python/arrow-python.pc.in \
>-		${WRKSRC}/../cpp/src/arrow/python/ArrowPythonConfig.cmake.in \
>-		${WRKSRC}/../cpp/src/arrow/python/ArrowPythonFlightConfig.cmake.in \
>-		${WRKSRC}/../cpp/src/arrow/python/CMakeLists.txt \
>-		${WRKSRC}/../dev/release/rat_exclude_files.txt \
>-		${WRKSRC}/../dev/release/verify-apt.sh \
>-		${WRKSRC}/../dev/release/verify-yum.sh \
>-		${WRKSRC}/../dev/tasks/conda-recipes/arrow-cpp/meta.yaml \
>-		${WRKSRC}/../dev/tasks/tasks.yml \
>-		${WRKSRC}/../docs/source/developers/python.rst \
>-		${WRKSRC}/../python/cmake_modules/FindArrowPython.cmake \
>-		${WRKSRC}/../python/cmake_modules/FindArrowPythonFlight.cmake \
>-		${WRKSRC}/../python/CMakeLists.txt \
>-		${WRKSRC}/../python/pyarrow/__init__.py \
>-		${WRKSRC}/../python/pyarrow/plasma.py \
>-		${WRKSRC}/../python/setup.py
>-	@${MV} ${WRKSRC}/src/arrow/python/arrow-python.pc.in ${WRKSRC}/src/arrow/python/arrow-python${PYTHON_SUFFIX}.pc.in
>-	@${MV} ${WRKSRC}/src/arrow/python/arrow-python-flight.pc.in ${WRKSRC}/src/arrow/python/arrow-python${PYTHON_SUFFIX}-flight.pc.in
>-
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MCOMPUTE} || ${PORT_OPTIONS:MFLIGHT} || ${PORT_OPTIONS:MGANDIVA}
>-PLIST_FILES+=	lib/cmake/arrow/Findre2Alt.cmake
>+PLIST_FILES+=	lib/cmake/Arrow/Findre2Alt.cmake
>+.endif
>+
>+.if ${PORT_OPTIONS:MIPC} && ${PORT_OPTIONS:MBUILD_UTILITIES}
>+PLIST_FILES+=	bin/arrow-file-to-stream \
>+		bin/arrow-stream-to-file
> .endif
> 
> .if ${PORT_OPTIONS:MPYTHON} == "PYTHON" && ${PORT_OPTIONS:MFLIGHT} == "FLIGHT"
>@@ -235,4 +216,4 @@ do-test: # tests fail to compile: https://issues.apache.org/jira/browse/ARROW-12
> 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
> 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/databases/arrow/distinfo b/databases/arrow/distinfo
>index ced82e21e969..9b947da86232 100644
>--- a/databases/arrow/distinfo
>+++ b/databases/arrow/distinfo
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1655057054
>-SHA256 (apache-arrow-8.0.0.tar.gz) = ad9a05705117c989c116bae9ac70492fe015050e1b80fb0e38fde4b5d863aaa3
>-SIZE (apache-arrow-8.0.0.tar.gz) = 17962146
>+TIMESTAMP = 1693121787
>+SHA256 (apache-arrow-13.0.0.tar.gz) = 35dfda191262a756be934eef8afee8d09762cad25021daa626eb249e251ac9e6
>+SIZE (apache-arrow-13.0.0.tar.gz) = 20542669
> SHA256 (release-1.6.6.tar.gz) = 9a92b3eaad1d8b88a18cee41058feb34eb43d919df363e0b74a0b857724e4ba0
> SIZE (release-1.6.6.tar.gz) = 13939853
>diff --git a/databases/arrow/pkg-plist b/databases/arrow/pkg-plist
>index aa0ea34ded4f..995c2e22a40f 100644
>--- a/databases/arrow/pkg-plist
>+++ b/databases/arrow/pkg-plist
>@@ -1,4 +1,26 @@
>-%%PLASMA%%bin/plasma-store-server
>+%%ACERO%%include/arrow/acero/accumulation_queue.h
>+%%ACERO%%include/arrow/acero/aggregate_node.h
>+%%ACERO%%include/arrow/acero/api.h
>+%%ACERO%%include/arrow/acero/asof_join_node.h
>+%%ACERO%%include/arrow/acero/benchmark_util.h
>+%%ACERO%%include/arrow/acero/bloom_filter.h
>+%%ACERO%%include/arrow/acero/exec_plan.h
>+%%ACERO%%include/arrow/acero/hash_join.h
>+%%ACERO%%include/arrow/acero/hash_join_dict.h
>+%%ACERO%%include/arrow/acero/hash_join_node.h
>+%%ACERO%%include/arrow/acero/map_node.h
>+%%ACERO%%include/arrow/acero/options.h
>+%%ACERO%%include/arrow/acero/order_by_impl.h
>+%%ACERO%%include/arrow/acero/partition_util.h
>+%%ACERO%%include/arrow/acero/pch.h
>+%%ACERO%%include/arrow/acero/query_context.h
>+%%ACERO%%include/arrow/acero/schema_util.h
>+%%ACERO%%include/arrow/acero/task_util.h
>+%%ACERO%%include/arrow/acero/test_nodes.h
>+%%ACERO%%include/arrow/acero/tpch_node.h
>+%%ACERO%%include/arrow/acero/type_fwd.h
>+%%ACERO%%include/arrow/acero/util.h
>+%%ACERO%%include/arrow/acero/visibility.h
> include/arrow/api.h
> include/arrow/array.h
> include/arrow/array/array_base.h
>@@ -7,6 +29,7 @@ include/arrow/array/array_decimal.h
> include/arrow/array/array_dict.h
> include/arrow/array/array_nested.h
> include/arrow/array/array_primitive.h
>+include/arrow/array/array_run_end.h
> include/arrow/array/builder_adaptive.h
> include/arrow/array/builder_base.h
> include/arrow/array/builder_binary.h
>@@ -14,6 +37,7 @@ include/arrow/array/builder_decimal.h
> include/arrow/array/builder_dict.h
> include/arrow/array/builder_nested.h
> include/arrow/array/builder_primitive.h
>+include/arrow/array/builder_run_end.h
> include/arrow/array/builder_time.h
> include/arrow/array/builder_union.h
> include/arrow/array/concatenate.h
>@@ -36,29 +60,17 @@ include/arrow/compare.h
> %%COMPUTE%%include/arrow/compute/api_vector.h
> %%COMPUTE%%include/arrow/compute/cast.h
> %%COMPUTE%%include/arrow/compute/exec.h
>-%%COMPUTE%%include/arrow/compute/exec/bloom_filter.h
>-%%COMPUTE%%include/arrow/compute/exec/exec_plan.h
>-%%COMPUTE%%include/arrow/compute/exec/expression.h
>-%%COMPUTE%%include/arrow/compute/exec/hash_join.h
>-%%COMPUTE%%include/arrow/compute/exec/hash_join_dict.h
>-%%COMPUTE%%include/arrow/compute/exec/ir_consumer.h
>-%%COMPUTE%%include/arrow/compute/exec/key_compare.h
>-%%COMPUTE%%include/arrow/compute/exec/key_encode.h
>-%%COMPUTE%%include/arrow/compute/exec/key_hash.h
>-%%COMPUTE%%include/arrow/compute/exec/key_map.h
>-%%COMPUTE%%include/arrow/compute/exec/options.h
>-%%COMPUTE%%include/arrow/compute/exec/order_by_impl.h
>-%%COMPUTE%%include/arrow/compute/exec/partition_util.h
>-%%COMPUTE%%include/arrow/compute/exec/schema_util.h
>-%%COMPUTE%%include/arrow/compute/exec/task_util.h
>-%%COMPUTE%%include/arrow/compute/exec/test_util.h
>-%%COMPUTE%%include/arrow/compute/exec/tpch_node.h
>-%%COMPUTE%%include/arrow/compute/exec/util.h
>+%%COMPUTE%%include/arrow/compute/expression.h
> %%COMPUTE%%include/arrow/compute/function.h
> %%COMPUTE%%include/arrow/compute/kernel.h
>+%%COMPUTE%%include/arrow/compute/key_hash.h
>+%%COMPUTE%%include/arrow/compute/key_map.h
> %%COMPUTE%%include/arrow/compute/light_array.h
>+%%COMPUTE%%include/arrow/compute/ordering.h
> %%COMPUTE%%include/arrow/compute/registry.h
>+%%COMPUTE%%include/arrow/compute/row/grouper.h
> %%COMPUTE%%include/arrow/compute/type_fwd.h
>+%%COMPUTE%%include/arrow/compute/util.h
> include/arrow/config.h
> %%CSV%%include/arrow/csv/api.h
> %%CSV%%include/arrow/csv/chunker.h
>@@ -79,6 +91,7 @@ include/arrow/config.h
> %%DATASET%%include/arrow/dataset/file_base.h
> %%DATASET%%include/arrow/dataset/file_csv.h
> %%DATASET%%include/arrow/dataset/file_ipc.h
>+%%DATASET%%include/arrow/dataset/file_json.h
> %%DATASET%%include/arrow/dataset/file_orc.h
> %%DATASET%%include/arrow/dataset/file_parquet.h
> %%DATASET%%include/arrow/dataset/partition.h
>@@ -86,11 +99,11 @@ include/arrow/config.h
> %%DATASET%%include/arrow/dataset/plan.h
> %%DATASET%%include/arrow/dataset/projector.h
> %%DATASET%%include/arrow/dataset/scanner.h
>-%%DATASET%%include/arrow/dataset/test_util.h
> %%DATASET%%include/arrow/dataset/type_fwd.h
> %%DATASET%%include/arrow/dataset/visibility.h
> include/arrow/datum.h
> include/arrow/device.h
>+%%JSON%%include/arrow/extension/fixed_shape_tensor.h
> include/arrow/extension_type.h
> %%FILESYSTEM%%include/arrow/filesystem/api.h
> %%FILESYSTEM%%include/arrow/filesystem/filesystem.h
>@@ -103,21 +116,6 @@ include/arrow/extension_type.h
> %%FILESYSTEM%%include/arrow/filesystem/s3fs.h
> %%FILESYSTEM%%include/arrow/filesystem/test_util.h
> %%FILESYSTEM%%include/arrow/filesystem/type_fwd.h
>-%%FLIGHT%%include/arrow/flight/api.h
>-%%FLIGHT%%include/arrow/flight/client.h
>-%%FLIGHT%%include/arrow/flight/client_auth.h
>-%%FLIGHT%%include/arrow/flight/client_middleware.h
>-%%FLIGHT%%include/arrow/flight/customize_protobuf.h
>-%%FLIGHT%%include/arrow/flight/middleware.h
>-%%FLIGHT%%include/arrow/flight/pch.h
>-%%FLIGHT%%include/arrow/flight/platform.h
>-%%FLIGHT%%include/arrow/flight/server.h
>-%%FLIGHT%%include/arrow/flight/server_auth.h
>-%%FLIGHT%%include/arrow/flight/server_middleware.h
>-%%FLIGHT%%include/arrow/flight/test_integration.h
>-%%FLIGHT%%include/arrow/flight/test_util.h
>-%%FLIGHT%%include/arrow/flight/types.h
>-%%FLIGHT%%include/arrow/flight/visibility.h
> include/arrow/io/api.h
> include/arrow/io/buffered.h
> include/arrow/io/caching.h
>@@ -160,37 +158,6 @@ include/arrow/memory_pool.h
> include/arrow/memory_pool_test.h
> include/arrow/pch.h
> include/arrow/pretty_print.h
>-%%PYTHON%%include/arrow/python/api.h
>-%%PYTHON%%include/arrow/python/arrow_to_pandas.h
>-%%PYTHON%%include/arrow/python/benchmark.h
>-%%PYTHON%%include/arrow/python/common.h
>-%%PYTHON%%include/arrow/python/csv.h
>-%%PYTHON%%include/arrow/python/datetime.h
>-%%PYTHON%%include/arrow/python/decimal.h
>-%%PYTHON%%include/arrow/python/deserialize.h
>-%%PYTHON%%include/arrow/python/extension_type.h
>-%%PYTHON%%include/arrow/python/filesystem.h
>-%%PYTHON%%include/arrow/python/flight.h
>-%%PYTHON%%include/arrow/python/gdb.h
>-%%PYTHON%%include/arrow/python/helpers.h
>-%%PYTHON%%include/arrow/python/inference.h
>-%%PYTHON%%include/arrow/python/init.h
>-%%PYTHON%%include/arrow/python/io.h
>-%%PYTHON%%include/arrow/python/ipc.h
>-%%PYTHON%%include/arrow/python/iterators.h
>-%%PYTHON%%include/arrow/python/numpy_convert.h
>-%%PYTHON%%include/arrow/python/numpy_interop.h
>-%%PYTHON%%include/arrow/python/numpy_to_arrow.h
>-%%PYTHON%%include/arrow/python/parquet_encryption.h
>-%%PYTHON%%include/arrow/python/pch.h
>-%%PYTHON%%include/arrow/python/platform.h
>-%%PYTHON%%include/arrow/python/pyarrow.h
>-%%PYTHON%%include/arrow/python/pyarrow_api.h
>-%%PYTHON%%include/arrow/python/pyarrow_lib.h
>-%%PYTHON%%include/arrow/python/python_to_arrow.h
>-%%PYTHON%%include/arrow/python/serialize.h
>-%%PYTHON%%include/arrow/python/type_traits.h
>-%%PYTHON%%include/arrow/python/visibility.h
> include/arrow/record_batch.h
> include/arrow/result.h
> include/arrow/scalar.h
>@@ -225,8 +192,8 @@ include/arrow/util/algorithm.h
> include/arrow/util/align_util.h
> include/arrow/util/aligned_storage.h
> include/arrow/util/async_generator.h
>+include/arrow/util/async_generator_fwd.h
> include/arrow/util/async_util.h
>-include/arrow/util/atomic_shared_ptr.h
> include/arrow/util/base64.h
> include/arrow/util/basic_decimal.h
> include/arrow/util/benchmark_util.h
>@@ -253,6 +220,7 @@ include/arrow/util/bpacking_simd256_generated.h
> include/arrow/util/bpacking_simd512_generated.h
> include/arrow/util/byte_size.h
> include/arrow/util/byte_stream_split.h
>+include/arrow/util/bytes_view.h
> include/arrow/util/cancel.h
> include/arrow/util/checked_cast.h
> include/arrow/util/compare.h
>@@ -262,6 +230,7 @@ include/arrow/util/config.h
> include/arrow/util/converter.h
> include/arrow/util/counting_semaphore.h
> include/arrow/util/cpu_info.h
>+include/arrow/util/crc32.h
> include/arrow/util/debug.h
> include/arrow/util/decimal.h
> include/arrow/util/delimiting.h
>@@ -271,28 +240,29 @@ include/arrow/util/endian.h
> include/arrow/util/formatting.h
> include/arrow/util/functional.h
> include/arrow/util/future.h
>-include/arrow/util/future_iterator.h
> include/arrow/util/hash_util.h
> include/arrow/util/hashing.h
> include/arrow/util/int_util.h
>+include/arrow/util/int_util_overflow.h
> include/arrow/util/io_util.h
> include/arrow/util/iterator.h
> include/arrow/util/key_value_metadata.h
> include/arrow/util/launder.h
> include/arrow/util/logging.h
> include/arrow/util/macros.h
>-include/arrow/util/make_unique.h
> include/arrow/util/map.h
> include/arrow/util/math_constants.h
> include/arrow/util/memory.h
> include/arrow/util/mutex.h
>-include/arrow/util/optional.h
> include/arrow/util/parallel.h
> include/arrow/util/pcg_random.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
> include/arrow/util/sort.h
>@@ -300,7 +270,6 @@ include/arrow/util/spaced.h
> include/arrow/util/stopwatch.h
> include/arrow/util/string.h
> include/arrow/util/string_builder.h
>-include/arrow/util/string_view.h
> include/arrow/util/task_group.h
> include/arrow/util/tdigest.h
> include/arrow/util/test_common.h
>@@ -311,11 +280,11 @@ include/arrow/util/trie.h
> include/arrow/util/type_fwd.h
> include/arrow/util/type_traits.h
> include/arrow/util/ubsan.h
>+include/arrow/util/union_util.h
> include/arrow/util/unreachable.h
> include/arrow/util/uri.h
> include/arrow/util/utf8.h
> include/arrow/util/value_parsing.h
>-include/arrow/util/variant.h
> include/arrow/util/vector.h
> include/arrow/util/visibility.h
> include/arrow/util/windows_compatibility.h
>@@ -332,18 +301,21 @@ include/arrow/vendored/double-conversion/bignum.h
> include/arrow/vendored/double-conversion/cached-powers.h
> include/arrow/vendored/double-conversion/diy-fp.h
> include/arrow/vendored/double-conversion/double-conversion.h
>+include/arrow/vendored/double-conversion/double-to-string.h
> include/arrow/vendored/double-conversion/fast-dtoa.h
> include/arrow/vendored/double-conversion/fixed-dtoa.h
> include/arrow/vendored/double-conversion/ieee.h
>+include/arrow/vendored/double-conversion/string-to-double.h
> include/arrow/vendored/double-conversion/strtod.h
> include/arrow/vendored/double-conversion/utils.h
>-include/arrow/vendored/optional.hpp
> include/arrow/vendored/pcg/pcg_extras.hpp
> include/arrow/vendored/pcg/pcg_random.hpp
> include/arrow/vendored/pcg/pcg_uint128.hpp
>-include/arrow/vendored/string_view.hpp
>+include/arrow/vendored/portable-snippets/debug-trap.h
>+include/arrow/vendored/portable-snippets/safe-math.h
> include/arrow/vendored/strptime.h
> include/arrow/vendored/xxhash.h
>+include/arrow/vendored/xxhash/xxhash.h
> include/arrow/visit_array_inline.h
> include/arrow/visit_data_inline.h
> include/arrow/visit_scalar_inline.h
>@@ -398,7 +370,6 @@ include/arrow/visitor_generate.h
> %%GANDIVA%%include/gandiva/hash_utils.h
> %%GANDIVA%%include/gandiva/in_holder.h
> %%GANDIVA%%include/gandiva/interval_holder.h
>-%%GANDIVA%%include/gandiva/like_holder.h
> %%GANDIVA%%include/gandiva/literal_holder.h
> %%GANDIVA%%include/gandiva/llvm_generator.h
> %%GANDIVA%%include/gandiva/llvm_includes.h
>@@ -412,8 +383,8 @@ include/arrow/visitor_generate.h
> %%GANDIVA%%include/gandiva/pch.h
> %%GANDIVA%%include/gandiva/projector.h
> %%GANDIVA%%include/gandiva/random_generator_holder.h
>+%%GANDIVA%%include/gandiva/regex_functions_holder.h
> %%GANDIVA%%include/gandiva/regex_util.h
>-%%GANDIVA%%include/gandiva/replace_holder.h
> %%GANDIVA%%include/gandiva/selection_vector.h
> %%GANDIVA%%include/gandiva/selection_vector_impl.h
> %%GANDIVA%%include/gandiva/simple_arena.h
>@@ -430,6 +401,7 @@ include/arrow/visitor_generate.h
> %%PARQUET%%include/parquet/arrow/test_util.h
> %%PARQUET%%include/parquet/arrow/writer.h
> %%PARQUET%%include/parquet/bloom_filter.h
>+%%PARQUET%%include/parquet/bloom_filter_reader.h
> %%PARQUET%%include/parquet/column_page.h
> %%PARQUET%%include/parquet/column_reader.h
> %%PARQUET%%include/parquet/column_scanner.h
>@@ -440,6 +412,7 @@ include/arrow/visitor_generate.h
> %%PARQUET%%include/parquet/encryption/file_key_material_store.h
> %%PARQUET%%include/parquet/encryption/file_key_unwrapper.h
> %%PARQUET%%include/parquet/encryption/file_key_wrapper.h
>+%%PARQUET%%include/parquet/encryption/file_system_key_material_store.h
> %%PARQUET%%include/parquet/encryption/key_encryption_key.h
> %%PARQUET%%include/parquet/encryption/key_material.h
> %%PARQUET%%include/parquet/encryption/key_metadata.h
>@@ -459,7 +432,7 @@ include/arrow/visitor_generate.h
> %%PARQUET%%include/parquet/level_conversion.h
> %%PARQUET%%include/parquet/level_conversion_inc.h
> %%PARQUET%%include/parquet/metadata.h
>-%%PARQUET%%include/parquet/murmur3.h
>+%%PARQUET%%include/parquet/page_index.h
> %%PARQUET%%include/parquet/parquet_version.h
> %%PARQUET%%include/parquet/pch.h
> %%PARQUET%%include/parquet/platform.h
>@@ -474,94 +447,78 @@ include/arrow/visitor_generate.h
> %%PARQUET%%include/parquet/types.h
> %%PARQUET%%include/parquet/windows_compatibility.h
> %%PARQUET%%include/parquet/windows_fixup.h
>-%%PLASMA%%include/plasma/client.h
>-%%PLASMA%%include/plasma/common.h
>-%%PLASMA%%include/plasma/compat.h
>-%%PLASMA%%include/plasma/events.h
>-%%PLASMA%%include/plasma/test_util.h
>-lib/cmake/arrow/ArrowConfig.cmake
>-lib/cmake/arrow/ArrowConfigVersion.cmake
>-%%DATASET%%lib/cmake/arrow/ArrowDatasetConfig.cmake
>-%%DATASET%%lib/cmake/arrow/ArrowDatasetConfigVersion.cmake
>-%%DATASET%%lib/cmake/arrow/ArrowDatasetTargets-%%CMAKE_BUILD_TYPE%%.cmake
>-%%DATASET%%lib/cmake/arrow/ArrowDatasetTargets.cmake
>-%%FLIGHT%%lib/cmake/arrow/ArrowFlightConfig.cmake
>-%%FLIGHT%%lib/cmake/arrow/ArrowFlightConfigVersion.cmake
>-%%FLIGHT%%lib/cmake/arrow/ArrowFlightTargets-%%CMAKE_BUILD_TYPE%%.cmake
>-%%FLIGHT%%lib/cmake/arrow/ArrowFlightTargets.cmake
>+%%PARQUET%%include/parquet/xxhasher.h
>+lib/cmake/Arrow/ArrowConfig.cmake
>+lib/cmake/Arrow/ArrowConfigVersion.cmake
>+lib/cmake/Arrow/ArrowOptions.cmake
>+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
>+%%PARQUET%%lib/cmake/Arrow/FindThriftAlt.cmake
>+%%UTF8PROC%%lib/cmake/Arrow/Findutf8proc.cmake
>+lib/cmake/Arrow/arrow-config.cmake
>+%%FLIGHT%%lib/cmake/Arrow/ArrowFlightConfig.cmake
>+%%FLIGHT%%lib/cmake/Arrow/ArrowFlightConfigVersion.cmake
>+%%FLIGHT%%lib/cmake/Arrow/ArrowFlightTargets-%%CMAKE_BUILD_TYPE%%.cmake
>+%%FLIGHT%%lib/cmake/Arrow/ArrowFlightTargets.cmake
> %%TESTINGFLIGHT%%lib/cmake/arrow/ArrowFlightTestingConfig.cmake
> %%TESTINGFLIGHT%%lib/cmake/arrow/ArrowFlightTestingConfigVersion.cmake
> %%TESTINGFLIGHT%%lib/cmake/arrow/ArrowFlightTestingTargets-%%CMAKE_BUILD_TYPE%%.cmake
> %%TESTINGFLIGHT%%lib/cmake/arrow/ArrowFlightTestingTargets.cmake
>-lib/cmake/arrow/ArrowOptions.cmake
>-%%PYTHON%%lib/cmake/arrow/ArrowPythonConfig.cmake
>-%%PYTHON%%lib/cmake/arrow/ArrowPythonConfigVersion.cmake
> %%PYTHONFLIGHT%%lib/cmake/arrow/ArrowPythonFlightConfig.cmake
> %%PYTHONFLIGHT%%lib/cmake/arrow/ArrowPythonFlightConfigVersion.cmake
> %%PYTHONFLIGHT%%lib/cmake/arrow/ArrowPythonFlightTargets-%%CMAKE_BUILD_TYPE%%.cmake
> %%PYTHONFLIGHT%%lib/cmake/arrow/ArrowPythonFlightTargets.cmake
>-%%PYTHON%%lib/cmake/arrow/ArrowPythonTargets-%%CMAKE_BUILD_TYPE%%.cmake
>-%%PYTHON%%lib/cmake/arrow/ArrowPythonTargets.cmake
>-lib/cmake/arrow/ArrowTargets-%%CMAKE_BUILD_TYPE%%.cmake
>-lib/cmake/arrow/ArrowTargets.cmake
>-%%TESTING%%lib/cmake/arrow/ArrowTestingConfig.cmake
>-%%TESTING%%lib/cmake/arrow/ArrowTestingConfigVersion.cmake
>-%%TESTING%%lib/cmake/arrow/ArrowTestingTargets-%%CMAKE_BUILD_TYPE%%.cmake
>-%%TESTING%%lib/cmake/arrow/ArrowTestingTargets.cmake
>-lib/cmake/arrow/FindArrow.cmake
>-%%DATASET%%lib/cmake/arrow/FindArrowDataset.cmake
>-%%FLIGHT%%lib/cmake/arrow/FindArrowFlight.cmake
>-%%PYTHON%%lib/cmake/arrow/FindArrowPython.cmake
>+%%ACERO%%lib/cmake/ArrowAcero/ArrowAceroConfig.cmake
>+%%ACERO%%lib/cmake/ArrowAcero/ArrowAceroConfigVersion.cmake
>+%%ACERO%%lib/cmake/ArrowAcero/ArrowAceroTargets-%%CMAKE_BUILD_TYPE%%.cmake
>+%%ACERO%%lib/cmake/ArrowAcero/ArrowAceroTargets.cmake
>+%%DATASET%%lib/cmake/ArrowDataset/ArrowDatasetConfig.cmake
>+%%DATASET%%lib/cmake/ArrowDataset/ArrowDatasetConfigVersion.cmake
>+%%DATASET%%lib/cmake/ArrowDataset/ArrowDatasetTargets-%%CMAKE_BUILD_TYPE%%.cmake
>+%%DATASET%%lib/cmake/ArrowDataset/ArrowDatasetTargets.cmake
>+%%FLIGHT%%lib/cmake/Arrow/FindArrowFlight.cmake
> %%PYTHONFLIGHT%%lib/cmake/arrow/FindArrowPythonFlight.cmake
>-%%TESTING%%lib/cmake/arrow/FindArrowTesting.cmake
>-%%BROTLI%%lib/cmake/arrow/FindBrotli.cmake
>-%%GANDIVA%%lib/cmake/arrow/FindGandiva.cmake
>+%%TESTING%%lib/cmake/ArrowTesting/ArrowTestingConfig.cmake
>+%%TESTING%%lib/cmake/ArrowTesting/ArrowTestingConfigVersion.cmake
>+%%TESTING%%lib/cmake/ArrowTesting/ArrowTestingTargets-%%CMAKE_BUILD_TYPE%%.cmake
>+%%TESTING%%lib/cmake/ArrowTesting/ArrowTestingTargets.cmake
>+%%BROTLI%%lib/cmake/Arrow/FindBrotli.cmake
> %%LZ4%%lib/cmake/arrow/FindLz4.cmake
>-%%PARQUET%%lib/cmake/arrow/FindParquet.cmake
>-%%PLASMA%%lib/cmake/arrow/FindPlasma.cmake
> %%SNAPPY%%lib/cmake/arrow/FindSnappy.cmake
>-%%PYTHON%%lib/cmake/arrow/Findutf8proc.cmake
>-%%ZSTD%%lib/cmake/arrow/Findzstd.cmake
>-%%GANDIVA%%lib/cmake/arrow/GandivaConfig.cmake
>-%%GANDIVA%%lib/cmake/arrow/GandivaConfigVersion.cmake
>-%%GANDIVA%%lib/cmake/arrow/GandivaTargets-%%CMAKE_BUILD_TYPE%%.cmake
>-%%GANDIVA%%lib/cmake/arrow/GandivaTargets.cmake
>-%%PARQUET%%lib/cmake/arrow/ParquetConfig.cmake
>-%%PARQUET%%lib/cmake/arrow/ParquetConfigVersion.cmake
>-%%PARQUET%%lib/cmake/arrow/ParquetTargets-%%CMAKE_BUILD_TYPE%%.cmake
>-%%PARQUET%%lib/cmake/arrow/ParquetTargets.cmake
>-%%PLASMA%%lib/cmake/arrow/PlasmaConfig.cmake
>-%%PLASMA%%lib/cmake/arrow/PlasmaConfigVersion.cmake
>-%%PLASMA%%lib/cmake/arrow/PlasmaTargets-%%CMAKE_BUILD_TYPE%%.cmake
>-%%PLASMA%%lib/cmake/arrow/PlasmaTargets.cmake
>-lib/cmake/arrow/arrow-config.cmake
>+%%ZSTD%%lib/cmake/Gandiva/FindzstdAlt.cmake
>+%%GANDIVA%%lib/cmake/Gandiva/FindLLVMAlt.cmake
>+%%GANDIVA%%lib/cmake/Gandiva/GandivaConfig.cmake
>+%%GANDIVA%%lib/cmake/Gandiva/GandivaConfigVersion.cmake
>+%%GANDIVA%%lib/cmake/Gandiva/GandivaTargets-%%CMAKE_BUILD_TYPE%%.cmake
>+%%GANDIVA%%lib/cmake/Gandiva/GandivaTargets.cmake
>+%%PARQUET%%lib/cmake/Parquet/ParquetConfig.cmake
>+%%PARQUET%%lib/cmake/Parquet/ParquetConfigVersion.cmake
>+%%PARQUET%%lib/cmake/Parquet/ParquetTargets-%%CMAKE_BUILD_TYPE%%.cmake
>+%%PARQUET%%lib/cmake/Parquet/ParquetTargets.cmake
> lib/libarrow.so
>-lib/libarrow.so.800
>-lib/libarrow.so.800.0.0
>+lib/libarrow.so.1300
>+lib/libarrow.so.1300.0.0
>+%%ACERO%%lib/libarrow_acero.so
>+%%ACERO%%lib/libarrow_acero.so.1300
>+%%ACERO%%lib/libarrow_acero.so.1300.0.0
> %%DATASET%%lib/libarrow_dataset.so
>-%%DATASET%%lib/libarrow_dataset.so.800
>-%%DATASET%%lib/libarrow_dataset.so.800.0.0
>+%%DATASET%%lib/libarrow_dataset.so.1300
>+%%DATASET%%lib/libarrow_dataset.so.1300.0.0
> %%FLIGHT%%lib/libarrow_flight.so
>-%%FLIGHT%%lib/libarrow_flight.so.800
>-%%FLIGHT%%lib/libarrow_flight.so.800.8.0
>-%%PYTHON%%lib/libarrow_python%%PYTHON_SUFFIX%%.so
>-%%PYTHON%%lib/libarrow_python%%PYTHON_SUFFIX%%.so.800
>-%%PYTHON%%lib/libarrow_python%%PYTHON_SUFFIX%%.so.800.0.0
>-%%PYTHONFLIGHT%%lib/libarrow_python%%PYTHON_SUFFIX%%_flight.so
>-%%PYTHONFLIGHT%%lib/libarrow_python%%PYTHON_SUFFIX%%_flight.so.800
>-%%PYTHONFLIGHT%%lib/libarrow_python%%PYTHON_SUFFIX%%_flight.so.800.0.0
>+%%FLIGHT%%lib/libarrow_flight.so.1300
>+%%FLIGHT%%lib/libarrow_flight.so.1300.0.0
> %%TESTING%%lib/libarrow_testing.so
>-%%TESTING%%lib/libarrow_testing.so.800
>-%%TESTING%%lib/libarrow_testing.so.800.0.0
>+%%TESTING%%lib/libarrow_testing.so.1300
>+%%TESTING%%lib/libarrow_testing.so.1300.0.0
> %%GANDIVA%%lib/libgandiva.so
>-%%GANDIVA%%lib/libgandiva.so.800
>-%%GANDIVA%%lib/libgandiva.so.800.0.0
>+%%GANDIVA%%lib/libgandiva.so.1300
>+%%GANDIVA%%lib/libgandiva.so.1300.0.0
> %%PARQUET%%lib/libparquet.so
>-%%PARQUET%%lib/libparquet.so.800
>-%%PARQUET%%lib/libparquet.so.800.0.0
>-%%PLASMA%%lib/libplasma.so
>-%%PLASMA%%lib/libplasma.so.800
>-%%PLASMA%%lib/libplasma.so.800.0.0
>+%%PARQUET%%lib/libparquet.so.1300
>+%%PARQUET%%lib/libparquet.so.1300.0.0
>+%%ACERO%%libdata/pkgconfig/arrow-acero.pc
> %%COMPUTE%%libdata/pkgconfig/arrow-compute.pc
> %%CSV%%libdata/pkgconfig/arrow-csv.pc
> %%DATASET%%libdata/pkgconfig/arrow-dataset.pc
>@@ -569,9 +526,9 @@ lib/libarrow.so.800.0.0
> %%FLIGHT%%libdata/pkgconfig/arrow-flight.pc
> %%JSON%%libdata/pkgconfig/arrow-json.pc
> %%PYTHONFLIGHT%%libdata/pkgconfig/arrow-python%%PYTHON_SUFFIX%%-flight.pc
>-%%PYTHON%%libdata/pkgconfig/arrow-python%%PYTHON_SUFFIX%%.pc
> %%TESTING%%libdata/pkgconfig/arrow-testing.pc
> libdata/pkgconfig/arrow.pc
> %%GANDIVA%%libdata/pkgconfig/gandiva.pc
> %%PARQUET%%libdata/pkgconfig/parquet.pc
>-%%PLASMA%%libdata/pkgconfig/plasma.pc
>+%%DATADIR%%/gdb/gdb_arrow.py
>+share/gdb/auto-load/usr/local/lib/libarrow.so.1300.0.0-gdb.py
>diff --git a/databases/arrow/files/patch-CMakeLists.txt b/databases/arrow/files/patch-CMakeLists.txt
>index 42e63905630f..f9cc88da2671 100644
>--- a/databases/arrow/files/patch-CMakeLists.txt
>+++ b/databases/arrow/files/patch-CMakeLists.txt
>@@ -1,4 +1,4 @@
>---- CMakeLists.txt.orig	2021-11-10 02:07:56 UTC
>+--- CMakeLists.txt.orig	2023-08-17 08:05:04 UTC
> +++ CMakeLists.txt
> @@ -100,7 +100,7 @@ set(ARROW_BINARY_DIR ${PROJECT_BINARY_DIR})
>  
>@@ -9,7 +9,7 @@
>  include(FindPackageHandleStandardArgs)
>  
>  include(GNUInstallDirs)
>-@@ -943,9 +943,9 @@ if(ARROW_BUILD_EXAMPLES)
>+@@ -968,9 +968,9 @@ if(ARROW_BUILD_EXAMPLES)
>    add_subdirectory(examples/arrow)
>  endif()
>  
>@@ -20,5 +20,5 @@
> +#              ${CMAKE_CURRENT_SOURCE_DIR}/../NOTICE.txt
> +#              ${CMAKE_CURRENT_SOURCE_DIR}/README.md DESTINATION "${ARROW_DOC_DIR}")
>  
>- #
>- # Validate and print out Arrow configuration options
>+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/gdb_arrow.py DESTINATION "${ARROW_GDB_DIR}")
>+ 
>diff --git a/databases/arrow/files/patch-cmake__modules_SetupCxxFlags.cmake b/databases/arrow/files/patch-cmake__modules_SetupCxxFlags.cmake
>index 224c1ecbf360..bd10749c566a 100644
>--- a/databases/arrow/files/patch-cmake__modules_SetupCxxFlags.cmake
>+++ b/databases/arrow/files/patch-cmake__modules_SetupCxxFlags.cmake
>@@ -1,9 +1,9 @@
>---- cmake_modules/SetupCxxFlags.cmake.orig	2021-11-10 02:07:56 UTC
>+--- cmake_modules/SetupCxxFlags.cmake.orig	2023-08-17 08:05:04 UTC
> +++ cmake_modules/SetupCxxFlags.cmake
>-@@ -28,7 +28,7 @@ if(NOT DEFINED ARROW_CPU_FLAG)
>-     set(ARROW_CPU_FLAG "armv8")
>-   elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "armv7")
>-     set(ARROW_CPU_FLAG "armv7")
>+@@ -30,7 +30,7 @@ if(NOT DEFINED ARROW_CPU_FLAG)
>+     set(ARROW_CPU_FLAG "aarch64")
>+   elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm$|armv[4-7]")
>+     set(ARROW_CPU_FLAG "aarch32")
> -  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc|ppc")
> +  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc|powerpc64|ppc")
>      set(ARROW_CPU_FLAG "ppc")
>diff --git a/databases/arrow/files/patch-cmake__modules_ThirdpartyToolchain.cmake b/databases/arrow/files/patch-cmake__modules_ThirdpartyToolchain.cmake
>index e2d8e7fbe58e..bba08265633a 100644
>--- a/databases/arrow/files/patch-cmake__modules_ThirdpartyToolchain.cmake
>+++ b/databases/arrow/files/patch-cmake__modules_ThirdpartyToolchain.cmake
>@@ -1,4 +1,4 @@
>---- cmake_modules/ThirdpartyToolchain.cmake.orig	2021-04-21 16:14:36 UTC
>+--- cmake_modules/ThirdpartyToolchain.cmake.orig	2023-08-17 08:05:04 UTC
> +++ cmake_modules/ThirdpartyToolchain.cmake
> @@ -16,6 +16,7 @@
>  # under the License.
>@@ -8,7 +8,80 @@
>  processorcount(NPROC)
>  
>  add_custom_target(rapidjson)
>-@@ -2320,10 +2321,10 @@ macro(build_cares)
>+@@ -2046,7 +2047,7 @@ macro(build_gtest)
>+     string(APPEND GTEST_CMAKE_CXX_FLAGS " -DGTEST_CREATE_SHARED_LIBRARY=1")
>+   endif()
>+ 
>+-  set(GTEST_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/googletest_ep-prefix")
>++  set(GTEST_PREFIX ${CMAKE_INSTALL_PREFIX})
>+   set(GTEST_INCLUDE_DIR "${GTEST_PREFIX}/include")
>+ 
>+   set(_GTEST_LIBRARY_DIR "${GTEST_PREFIX}/lib")
>+@@ -2087,13 +2088,14 @@ macro(build_gtest)
>+     list(APPEND GTEST_CMAKE_ARGS -Dgtest_force_shared_crt=ON)
>+   endif()
>+ 
>+-  externalproject_add(googletest_ep
>+-                      ${EP_COMMON_OPTIONS}
>+-                      URL ${GTEST_SOURCE_URL}
>+-                      URL_HASH "SHA256=${ARROW_GTEST_BUILD_SHA256_CHECKSUM}"
>+-                      BUILD_BYPRODUCTS ${GTEST_SHARED_LIB} ${GTEST_MAIN_SHARED_LIB}
>+-                                       ${GMOCK_SHARED_LIB}
>+-                      CMAKE_ARGS ${GTEST_CMAKE_ARGS})
>++  #externalproject_add(googletest_ep
>++  #                    ${EP_COMMON_OPTIONS}
>++  #                    URL ${GTEST_SOURCE_URL}
>++  #                    URL_HASH "SHA256=${ARROW_GTEST_BUILD_SHA256_CHECKSUM}"
>++  #                    BUILD_BYPRODUCTS ${GTEST_SHARED_LIB} ${GTEST_MAIN_SHARED_LIB}
>++  #                                     ${GMOCK_SHARED_LIB}
>++  #                    CMAKE_ARGS ${GTEST_CMAKE_ARGS})
>++  find_package(GTest REQUIRED)
>+   if(WIN32)
>+     # Copy the built shared libraries to the same directory as our
>+     # test programs because Windows doesn't provided rpath (run-time
>+@@ -2119,16 +2121,16 @@ macro(build_gtest)
>+     else()
>+       set(_GTEST_RUNTIME_OUTPUT_DIR ${BUILD_OUTPUT_ROOT_DIRECTORY})
>+     endif()
>+-    externalproject_add_step(googletest_ep copy
>+-                             COMMAND ${CMAKE_COMMAND} -E make_directory
>+-                                     ${_GTEST_RUNTIME_OUTPUT_DIR}
>+-                             COMMAND ${CMAKE_COMMAND} -E copy ${_GTEST_RUNTIME_LIB}
>+-                                     ${_GTEST_RUNTIME_OUTPUT_DIR}
>+-                             COMMAND ${CMAKE_COMMAND} -E copy ${_GMOCK_RUNTIME_LIB}
>+-                                     ${_GTEST_RUNTIME_OUTPUT_DIR}
>+-                             COMMAND ${CMAKE_COMMAND} -E copy ${_GTEST_MAIN_RUNTIME_LIB}
>+-                                     ${_GTEST_RUNTIME_OUTPUT_DIR}
>+-                             DEPENDEES install)
>++    #externalproject_add_step(googletest_ep copy
>++    #                         COMMAND ${CMAKE_COMMAND} -E make_directory
>++    #                                 ${_GTEST_RUNTIME_OUTPUT_DIR}
>++    #                         COMMAND ${CMAKE_COMMAND} -E copy ${_GTEST_RUNTIME_LIB}
>++    #                                 ${_GTEST_RUNTIME_OUTPUT_DIR}
>++    #                         COMMAND ${CMAKE_COMMAND} -E copy ${_GMOCK_RUNTIME_LIB}
>++    #                                 ${_GTEST_RUNTIME_OUTPUT_DIR}
>++    #                         COMMAND ${CMAKE_COMMAND} -E copy ${_GTEST_MAIN_RUNTIME_LIB}
>++    #                                 ${_GTEST_RUNTIME_OUTPUT_DIR}
>++    #                         DEPENDEES install)
>+   endif()
>+ 
>+   # The include directory must exist before it is referenced by a target.
>+@@ -2152,10 +2154,10 @@ macro(build_gtest)
>+                                    INTERFACE_COMPILE_DEFINITIONS
>+                                    "GMOCK_LINKED_AS_SHARED_LIBRARY=1"
>+                                    INTERFACE_INCLUDE_DIRECTORIES "${GTEST_INCLUDE_DIR}")
>+-  add_dependencies(toolchain-tests googletest_ep)
>+-  add_dependencies(arrow::GTest::gtest googletest_ep)
>+-  add_dependencies(arrow::GTest::gtest_main googletest_ep)
>+-  add_dependencies(arrow::GTest::gmock googletest_ep)
>++  add_dependencies(toolchain-tests GTest::GTest)
>++  add_dependencies(arrow::GTest::gtest GTest::GTest)
>++  add_dependencies(arrow::GTest::gtest_main GTest::GTest)
>++  add_dependencies(arrow::GTest::gmock GTest::GTest)
>+ endmacro()
>+ 
>+ if(ARROW_TESTING)
>+@@ -2703,10 +2705,10 @@ macro(build_cares)
>    file(MAKE_DIRECTORY ${CARES_INCLUDE_DIR})
>  
>    add_dependencies(toolchain cares_ep)
>@@ -23,11 +96,12 @@
>    add_dependencies(c-ares::cares cares_ep)
>  
>    if(APPLE)
>-@@ -2904,6 +2905,7 @@ if(ARROW_S3)
>-     set(BUILD_SHARED_LIBS "ON")
>-   endif()
>+@@ -5132,6 +5134,8 @@ if(ARROW_WITH_UCX)
>+ endif()
>+ 
>+ message(STATUS "All bundled static libraries: ${ARROW_BUNDLED_STATIC_LIBS}")
>++
>++set(BUILD_SHARED_LIBS ON)
>+ 
>+ # Write out the package configurations.
>  
>-+  set(BUILD_SHARED_LIBS ON)
>-   # Need to customize the find_package() call, so cannot call resolve_dependency()
>-   if(AWSSDK_SOURCE STREQUAL "AUTO")
>-     find_package(AWSSDK
>diff --git a/databases/arrow/files/patch-thirdparty_download__dependencies.sh b/databases/arrow/files/patch-thirdparty_download__dependencies.sh
>index d74e1c74338e..be9540a6a6e0 100644
>--- a/databases/arrow/files/patch-thirdparty_download__dependencies.sh
>+++ b/databases/arrow/files/patch-thirdparty_download__dependencies.sh
>@@ -1,6 +1,6 @@
>---- thirdparty/download_dependencies.sh.orig	2019-02-16 22:21:34 UTC
>+--- thirdparty/download_dependencies.sh.orig	2023-08-17 08:05:04 UTC
> +++ thirdparty/download_dependencies.sh
>-@@ -61,4 +61,6 @@ main() {
>+@@ -62,4 +62,6 @@ main() {
>    done
>  }
>

Actions: View | Diff

Attachments on bug 273389: 244399