From 98032ee25b193e73c19f77a904e13e5ca0f62e72 Mon Sep 17 00:00:00 2001
From: Sutou Kouhei <kou@clear-code.com>
Date: Tue, 29 Oct 2024 06:01:15 +0900
Subject: [PATCH] python-pyarrow: Update to 18.0.0

---
 ...0001-arrow-setup-fix-cmake-generator.patch | 11 -----------
 mingw-w64-python-pyarrow/PKGBUILD             | 19 +++++++------------
 2 files changed, 7 insertions(+), 23 deletions(-)
 delete mode 100644 mingw-w64-python-pyarrow/0001-arrow-setup-fix-cmake-generator.patch

diff --git a/mingw-w64-python-pyarrow/0001-arrow-setup-fix-cmake-generator.patch b/mingw-w64-python-pyarrow/0001-arrow-setup-fix-cmake-generator.patch
deleted file mode 100644
index b836647aa4..0000000000
--- a/mingw-w64-python-pyarrow/0001-arrow-setup-fix-cmake-generator.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/python/setup.py
-+++ b/python/setup.py
-@@ -146,7 +146,7 @@
-     def initialize_options(self):
-         _build_ext.initialize_options(self)
-         self.cmake_generator = os.environ.get('PYARROW_CMAKE_GENERATOR')
--        if not self.cmake_generator and sys.platform == 'win32':
-+        if not self.cmake_generator and sys.platform == 'win32' and 'MSC' in sys.version:
-             self.cmake_generator = 'Visual Studio 15 2017 Win64'
-         self.extra_cmake_args = os.environ.get('PYARROW_CMAKE_OPTIONS', '')
-         self.build_type = os.environ.get('PYARROW_BUILD_TYPE',
diff --git a/mingw-w64-python-pyarrow/PKGBUILD b/mingw-w64-python-pyarrow/PKGBUILD
index 941d12a935..69a1a0f2c5 100644
--- a/mingw-w64-python-pyarrow/PKGBUILD
+++ b/mingw-w64-python-pyarrow/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=pyarrow
 pkgbase=mingw-w64-python-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=17.0.0
-pkgrel=2
+pkgver=18.0.0
+pkgrel=1
 pkgdesc="Columnar in-memory analytics layer for big data — Python module (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -33,25 +33,20 @@ makedepends=(
   "${MINGW_PACKAGE_PREFIX}-python-wheel"
 )
 options=('!strip')
-source=("https://www.apache.org/dyn/closer.lua?action=download&filename=arrow/arrow-${pkgver}/apache-arrow-${pkgver}.tar.gz"{,.asc}
-        "0001-arrow-setup-fix-cmake-generator.patch")
-sha256sums=('9d280d8042e7cf526f8c28d170d93bfab65e50f94569f6a790982a878d8d898d'
-            'SKIP'
-            '77442c5681af7cdfff8d37dd8eb94e52b934db086c605459e0ab68535d820d47')
+source=("https://www.apache.org/dyn/closer.lua?action=download&filename=arrow/arrow-${pkgver}/apache-arrow-${pkgver}.tar.gz"{,.asc})
+sha256sums=('abcf1934cd0cdddd33664e9f2d9a251d6c55239d1122ad0ed223b13a583c82a9'
+            'SKIP')
 validpgpkeys=(
   'AF6AADA4C9835B75973FF5DA275C532289DD0F4A' # Raúl Cumplido Domínguez (CODE SIGNING KEY) <raulcd@apache.org>
+  '08D3564B7C6A9CAFBFF6A66791D18FCF079F8007' # Kouhei Sutou <kou@clear-code.com>
 )
 
-prepare() {
-  cd "apache-arrow-${pkgver}"
-  patch -p1 -i "${srcdir}/0001-arrow-setup-fix-cmake-generator.patch"
-}
-
 build() {
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 
   cd "apache-arrow-${pkgver}/python"
 
+  PYARROW_CMAKE_GENERATOR="Ninja" \
   PYARROW_CMAKE_OPTIONS="-DARROW_SIMD_LEVEL=NONE -DARROW_RUNTIME_SIMD_LEVEL=MAX" \
   PYARROW_WITH_DATASET=1 \
   PYARROW_WITH_FLIGHT=1 \