This is an automated email from the ASF dual-hosted git repository. raulcd pushed a commit to branch maint-26.0.0 in repository https://gitbox.apache.org/repos/asf/arrow.git
commit 1deceed534441193b79006331d5ef2a6b9dda99d Author: Raúl Cumplido <[email protected]> AuthorDate: Thu Oct 1 23:44:58 2026 +0200 GH-51675: [Python][Packaging] Apply upstream fix to UriParser from vcpkg and force Windows image rebuild to fix builds on wheels (#51676) ### Rationale for this change We have bumped UriParser from a vendored version to be built from external sources. We have to rebuild Windows wheels and we have to apply a fix for older GLIBC see the following upstream commit: - https://github.com/uriparser/uriparser/commit/072a97c604a05d120686d8ada8eff093a983d75d ### What changes are included in this PR? Apply to vcpkg the upstream commit to fix older GLIBC. ### Are these changes tested? Yes via archery wheels builds ### Are there any user-facing changes? No ### Was AI used for this PR? In accordance to the [AI generation guidelines](https://arrow.apache.org/docs/dev/developers/overview.html#ai-generated-code), please disclose below whether and how AI was used in this PR. **PR code and description written by:** - [x] Human - [x] AI I've used AI to analyze the errors. Changes have been added and applied by me locally. **Reviewed before submission by:** - [x] Human - [ ] AI - [ ] Not reviewed * GitHub Issue: #51675 Authored-by: Raúl Cumplido <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]> --- .env | 2 +- ci/vcpkg/ports.patch | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/.env b/.env index f0d538ccd93..cd30f7aa7c8 100644 --- a/.env +++ b/.env @@ -98,6 +98,6 @@ VCPKG="9b965a116838c6cdcd36bca60d1b81b030c8ab8d" # 2026.05.27 (not release, u # ci/docker/python-*-windows-*.dockerfile or the vcpkg config. # This is a workaround for our CI problem that "archery docker build" doesn't # use pulled built images in dev/tasks/python-wheels/github.windows.yml. -PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2026-09-09 +PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2026-10-01 PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2026-09-14 diff --git a/ci/vcpkg/ports.patch b/ci/vcpkg/ports.patch index 8e62c75e7ac..db38c25de3f 100644 --- a/ci/vcpkg/ports.patch +++ b/ci/vcpkg/ports.patch @@ -80,3 +80,37 @@ index 278bc17a1c..d47d859360 100644 ) file(GLOB modules "${SOURCE_PATH}/cmake_modules/Find*.cmake") file(REMOVE ${modules} "${SOURCE_PATH}/c++/libs/libhdfspp/libhdfspp.tar.gz") +diff --git a/ports/uriparser/fix-glibc-2.28-reallocarray.diff b/ports/uriparser/fix-glibc-2.28-reallocarray.diff +new file mode 100644 +index 0000000..57adef4 +--- /dev/null ++++ b/ports/uriparser/fix-glibc-2.28-reallocarray.diff +@@ -0,0 +1,15 @@ ++diff --git a/src/UriMemory.c b/src/UriMemory.c ++--- a/src/UriMemory.c +++++ b/src/UriMemory.c ++@@ -50,6 +50,11 @@ ++ # define _DEFAULT_SOURCE 1 ++ # endif ++ +++// For glibc <2.29 +++# if !defined(_GNU_SOURCE) +++# define _GNU_SOURCE 1 +++# endif +++ ++ // For NetBSD (stdlib.h revision 1.122 of 2020-05-26) ++ # if defined(__NetBSD__) && !defined(_OPENBSD_SOURCE) ++ # define _OPENBSD_SOURCE 1 +diff --git a/ports/uriparser/portfile.cmake b/ports/uriparser/portfile.cmake +index 5df5e94..225e5fb 100644 +--- a/ports/uriparser/portfile.cmake ++++ b/ports/uriparser/portfile.cmake +@@ -4,6 +4,8 @@ vcpkg_from_github( + REF "uriparser-${VERSION}" + SHA512 1e4c397418e71e705b5712de2dc3ea6e95163c9d95bfbaa5f7d2fd2344d34eaf167d7d9389ab9671cfb314af026621b56e632ea34b681c2f4d7951a1b32a98b4 + HEAD_REF master ++ PATCHES ++ fix-glibc-2.28-reallocarray.diff + ) + + if("tool" IN_LIST FEATURES)
