From 3bb0736998ef0c8d303ee512d611e286e707bef2 Mon Sep 17 00:00:00 2001 From: Jacob Wujciak-Jens Date: Sun, 27 Apr 2025 19:59:52 +0200 Subject: [PATCH] arrow python-pyarrow: Update to 20.0.0 --- mingw-w64-arrow/PKGBUILD | 17 ++++++----------- mingw-w64-gdal/PKGBUILD | 2 +- .../002-llama_cpp-add-stdint.patch | 11 +++++++++++ mingw-w64-groonga/PKGBUILD | 16 +++++++++++++--- mingw-w64-python-pyarrow/PKGBUILD | 4 ++-- 5 files changed, 33 insertions(+), 17 deletions(-) create mode 100644 mingw-w64-groonga/002-llama_cpp-add-stdint.patch diff --git a/mingw-w64-arrow/PKGBUILD b/mingw-w64-arrow/PKGBUILD index d596ffedf1..0889222bf4 100644 --- a/mingw-w64-arrow/PKGBUILD +++ b/mingw-w64-arrow/PKGBUILD @@ -3,8 +3,8 @@ _realname=arrow pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=19.0.1 -pkgrel=6 +pkgver=20.0.0 +pkgrel=1 pkgdesc="Apache Arrow is a cross-language development platform for in-memory data (mingw-w64)" arch=(any) mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -48,13 +48,10 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-xsimd") source=("https://www.apache.org/dyn/closer.lua?action=download&filename=arrow/arrow-${pkgver}/apache-arrow-${pkgver}.tar.gz" - "https://www.apache.org/dyn/closer.lua?action=download&filename=arrow/arrow-${pkgver}/apache-arrow-${pkgver}.tar.gz.asc" - "001-accept-llvm-20.1.patch" - "002-fix-configure-with-cmake-4.patch::https://github.com/apache/arrow/commit/48c0bbbd.patch") -sha256sums=('acb76266e8b0c2fbb7eb15d542fbb462a73b3fd1e32b80fad6c2fafd95a51160' - 'SKIP' - '932274355d34b6406dbad9e911ac5adf59dfdfcd05d001bf81e7925822fc8165' - '995efbea32fa7eceba4069d09d89a2d2c2d95166abbf7dd2dcd5e7e7390c9fd7') + "https://www.apache.org/dyn/closer.lua?action=download&filename=arrow/arrow-${pkgver}/apache-arrow-${pkgver}.tar.gz.asc") +sha256sums=('89efbbf852f5a1f79e9c99ab4c217e2eb7f991837c005cba2d4a2fbd35fad212' + 'SKIP') + # See generate-valid-keys.sh validpgpkeys=('35CF82A165DDBBA29B307B7497D7E8647AE7E47B' '87C072B8B6405B5780D66A3D02DABFDF1679D194' @@ -75,8 +72,6 @@ validpgpkeys=('35CF82A165DDBBA29B307B7497D7E8647AE7E47B' prepare() { cd apache-${_realname}-${pkgver} - patch -p1 -i "${srcdir}"/001-accept-llvm-20.1.patch - patch -p1 -i "${srcdir}"/002-fix-configure-with-cmake-4.patch } build() { diff --git a/mingw-w64-gdal/PKGBUILD b/mingw-w64-gdal/PKGBUILD index 85d2f7beb1..87ecec1654 100644 --- a/mingw-w64-gdal/PKGBUILD +++ b/mingw-w64-gdal/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=mingw-w64-${_realname,,} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-python-${_realname}") pkgver=3.10.2 -pkgrel=4 +pkgrel=5 pkgdesc="A translator library for raster geospatial data formats (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') diff --git a/mingw-w64-groonga/002-llama_cpp-add-stdint.patch b/mingw-w64-groonga/002-llama_cpp-add-stdint.patch new file mode 100644 index 0000000000..f2340d54c3 --- /dev/null +++ b/mingw-w64-groonga/002-llama_cpp-add-stdint.patch @@ -0,0 +1,11 @@ +--- a/src/llama-mmap.h ++++ b/src/llama-mmap.h +@@ -3,6 +3,8 @@ + #include + #include + ++#include ++ + struct llama_file; + struct llama_mmap; + struct llama_mlock; diff --git a/mingw-w64-groonga/PKGBUILD b/mingw-w64-groonga/PKGBUILD index d2f6ef2651..29d9eaaa97 100644 --- a/mingw-w64-groonga/PKGBUILD +++ b/mingw-w64-groonga/PKGBUILD @@ -11,7 +11,8 @@ mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://groonga.org/" license=('spdx:LGPL-2.1-or-later') source=(https://packages.groonga.org/source/${_realname}/${_realname}-${pkgver}.tar.gz{,.asc} - 001-aarch64.patch) + 001-aarch64.patch + 002-llama_cpp-add-stdint.patch) depends=("${MINGW_PACKAGE_PREFIX}-arrow" "${MINGW_PACKAGE_PREFIX}-blosc2" "${MINGW_PACKAGE_PREFIX}-lz4" @@ -31,7 +32,8 @@ makedepends=("git" "${MINGW_PACKAGE_PREFIX}-xsimd") sha256sums=('1123d4101a55ea183c290792ce39253e07f84740e561da70c69f4ce9875357f4' 'SKIP' - '5fbb336487a6522e2f7bff01ea3cdd714d4c27de3cc65d5a6ecb2eedeb6fc2c4') + '5fbb336487a6522e2f7bff01ea3cdd714d4c27de3cc65d5a6ecb2eedeb6fc2c4' + '823f83e2043fc4b98c5971a12a65c1c4cb472b49b0e812052746aa591b7cdf44') validpgpkeys=('2701F317CFCCCB975CADE9C2624CF77434839225') # Groonga Key apply_patch_with_msg() { @@ -43,7 +45,7 @@ apply_patch_with_msg() { } prepare() { - cd "${srcdir}/${_realname}-${pkgver}" + cd "${_realname}-${pkgver}" apply_patch_with_msg \ 001-aarch64.patch @@ -70,6 +72,14 @@ build() { -DGRN_WITH_MRUBY=ON \ ../${_realname}-${pkgver} + ${MINGW_PREFIX}/bin/cmake --build . || true + + # workaround: gcc-15 compiler error + ( + cd _deps/llama_cpp-src + patch -p1 -i "${srcdir}"/002-llama_cpp-add-stdint.patch + ) + ${MINGW_PREFIX}/bin/cmake --build . } diff --git a/mingw-w64-python-pyarrow/PKGBUILD b/mingw-w64-python-pyarrow/PKGBUILD index 09c77785d1..a5f8acd56a 100644 --- a/mingw-w64-python-pyarrow/PKGBUILD +++ b/mingw-w64-python-pyarrow/PKGBUILD @@ -3,7 +3,7 @@ _realname=pyarrow pkgbase=mingw-w64-python-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") -pkgver=19.0.1 +pkgver=20.0.0 pkgrel=1 pkgdesc="Columnar in-memory analytics layer for big data — Python module (mingw-w64)" arch=('any') @@ -34,7 +34,7 @@ makedepends=( ) options=('!strip') source=("https://www.apache.org/dyn/closer.lua?action=download&filename=arrow/arrow-${pkgver}/apache-arrow-${pkgver}.tar.gz"{,.asc}) -sha256sums=('acb76266e8b0c2fbb7eb15d542fbb462a73b3fd1e32b80fad6c2fafd95a51160' +sha256sums=('89efbbf852f5a1f79e9c99ab4c217e2eb7f991837c005cba2d4a2fbd35fad212' 'SKIP') validpgpkeys=( 'AF6AADA4C9835B75973FF5DA275C532289DD0F4A' # Raúl Cumplido Domínguez (CODE SIGNING KEY)