diff --git a/.claude/skills/forge-error-catalogue/references/failure-catalogue.md b/.claude/skills/forge-error-catalogue/references/failure-catalogue.md index 760ba097..a61dd3fe 100644 --- a/.claude/skills/forge-error-catalogue/references/failure-catalogue.md +++ b/.claude/skills/forge-error-catalogue/references/failure-catalogue.md @@ -1182,6 +1182,87 @@ list entry covers. Every maturin recipe fails on iOS while Android stays green. --- +### scikit-build-core: `Could NOT find Python (missing: Python_SABI_LIBRARIES Interpreter Development.Module Development.SABIModule)` + +**Cause:** the package builds an abi3 wheel (`wheel.py-api = "cp3xx"` in +pyproject, or a PyO3 `abi3-py3xx` feature), so FindPython is asked for +`Development.SABIModule`, i.e. `libpython3.so`. Our support trees don't ship it, +and one missing component makes FindPython report *every* component missing, +the interpreter included. That reads like a cross-compile interpreter problem +and isn't one: the same `Python_*` hints find the interpreter fine without SABI. + +**Fix:** build a per-version wheel: `backend-args: [-Cwheel.py-api=]`. For PyO3 +crates, drop the `abi3-py3xx` feature in a patch; on iOS it otherwise links +`-lpython3.10` (`ld: library 'python3.10' not found`). argon2-cffi-bindings 26, +duckdb 2.0, uuid-utils 1.2. + +--- + +### Android nanobind module: `ld.lld: error: undefined symbol: PyMem_Malloc` (`_Py_Dealloc`, `PyObject_Str`, …) + +**Cause:** nanobind links its modules without libpython and leaves Python symbols +for load time. pybind11's `Python::Module` linked libpython on Android, so a +package that moves from pybind11 to nanobind starts failing, because the NDK +links with `--no-undefined`. iOS links with `-undefined dynamic_lookup` and is fine. + +**Fix:** add `-L{HOST_PYTHON_HOME}/lib -lpython{py_version_short}` to +`CMAKE_MODULE_LINKER_FLAGS` in the Android `CMAKE_ARGS`. duckdb 2.0. If the +package still offers its old binding layer, opting out works too: coolprop 8.0 +`-DCOOLPROP_NANOBIND=OFF`. + +--- + +### Android: `fatal error: error in backend: Cannot scalarize scalable vector loads` + +**Cause:** NDK r27 clang crashes on SVE code. Arrow 26 added runtime-dispatched +SVE-256 bit-unpacking kernels (`util/bpacking_simd_256.cc`), which are built even +with `ARROW_SIMD_LEVEL=NONE`, because runtime dispatch is a separate switch. + +**Fix:** `-DARROW_RUNTIME_SIMD_LEVEL=NONE` alongside `ARROW_SIMD_LEVEL=NONE`. +flet-libarrow 26.0.1. + +--- + +### iOS link: `duplicate symbol '__TIFF…'` in `libgdal.a` and `libtiff.a` + +**Cause:** on iOS, flet-libgdal is static and, with `GDAL_USE_EXTERNAL_LIBS=OFF`, +compiles its internal libtiff into `libgdal.a`. Consumers also link flet-libtiff's +`libtiff.a` for `libproj.a`. Once PROJ needs a TIFF symbol only the external copy +defines, the linker pulls that object and both copies collide (libtiff 4.7.2 + +PROJ 9.9). Android is unaffected because libgdal is shared there. + +**Fix:** build GDAL against the external static libtiff on iOS: +`-DGDAL_USE_TIFF=ON -DGDAL_USE_TIFF_INTERNAL=OFF -DTIFF_LIBRARY=… -DTIFF_INCLUDE_DIR=…`. +flet-libgdal 3.13.3. + +--- + +### iOS CMake: `error: thread-local storage is not supported for the current target` + +**Cause:** the library started using C++ `thread_local`, and the iOS `cmake` call in +build.sh passes no deployment target, so clang compiles for an iOS version +without thread-local storage. Android is unaffected. + +**Fix:** add `-DCMAKE_OSX_DEPLOYMENT_TARGET=$SDK_VERSION` to the iOS `cmake` line. +flet-libgeos 3.15.0. + +--- + +### meson: a `flet-lib*` dependency is not found (`dependency('geos')`) + +**Cause:** our `flet-lib*` build.sh recipes delete `lib/pkgconfig` and `lib/cmake`, +because their prefixes are absolute build paths. A package that moves from +setuptools (env-var paths) to meson-python finds the library only via pkg-config +or CMake config, so the dependency lookup fails. + +**Fix:** a small `meson.build` patch that declares the dependency from the env +vars the recipe already sets, with `-I`/`-L` compile and link args. +`include_directories()` refuses absolute paths inside the source tree. Add +`--cross-file {MESON_CROSS_FILE}` backend-args and ninja/meson/cython build +requirements, as other meson recipes do. shapely 2.2 (`geos-from-env.patch`). + +--- + ### iOS CMake: `install TARGETS given no BUNDLE DESTINATION for MacOS bundle target "flatc"` **Cause:** a FetchContent'd flatbuffers builds its `flatc` TOOL as part of the @@ -2051,6 +2132,18 @@ model pack is `buffalo_sc` (det_500m + w600k_mbf, 15MB download). ## Recipe-tester app failures +### Android CI: `downloadDistArchive_` / `downloadDartBridge_` FAILED, `The current character read is ' ' with an int value of 0` + +**Cause:** not the recipe. serious_python_android registers one `Download` task per +ABI with `onlyIfModified` + `useETag("all")` and the default shared +`etags.json`. Gradle runs them in parallel and they corrupt the file (zero-filled). +Hit about 10% of Android jobs in November 2026. + +**Fix:** rerun. In a long CI campaign, `org.gradle.workers.max=1` in +`~/.gradle/gradle.properties` before the APK build stops it. The real fix is a +per-ABI `cachedETagsFile` in serious_python. + + ### `ResolutionImpossible` — a package's `numpy` upper-cap can't be satisfied on a newer CPython **Symptom:** `flet build` (or a mobile test) dies with pip diff --git a/recipes/apsw/meta.yaml b/recipes/apsw/meta.yaml index 7483860d..1f9bcf4c 100644 --- a/recipes/apsw/meta.yaml +++ b/recipes/apsw/meta.yaml @@ -1,6 +1,6 @@ package: name: apsw - version: "3.53.2.0" + version: "3.54.1.0" build: number: 1 diff --git a/recipes/apsw/patches/mobile.patch b/recipes/apsw/patches/mobile.patch index 9034cb38..eb6abf96 100644 --- a/recipes/apsw/patches/mobile.patch +++ b/recipes/apsw/patches/mobile.patch @@ -8,7 +8,7 @@ compiles `sqlite3/sqlite3.c` straight into the extension (APSW_USE_SQLITE_AMALGAMATION=1) -> a self-contained .so with no external libsqlite3 link. That part is exactly what we want for mobile. -Three default behaviours are host-tainted and must be neutralised for a +Two default behaviours are host-tainted and must be neutralised for a cross-compile: 1. After fetching the amalgamation, setup.py runs `./configure` inside @@ -24,14 +24,9 @@ cross-compile: amalgamation tarball is needed for findamalgamation(). Set `fc.all = False` so just sqlite-autoconf-.tar.gz is downloaded. - 3. APSW_FORK_CHECKER is compiled in iff the BUILD python has os.fork (always - true on a macOS build host). It is target-inappropriate for mobile (iOS - python typically lacks os.fork) and relies on pthread_atfork. Drop the - define so the mobile wheel matches its target rather than the build host. - --- a/setup.py +++ b/setup.py -@@ -351,16 +351,7 @@ +@@ -346,16 +346,6 @@ assert info.mode & 0o777 == info.mode self.extract_entry(tarf.extractfile(info).read(), info.name, info.mtime, info.mode) @@ -42,13 +37,13 @@ cross-compile: - val = sysconfig.get_config_var(v) - if val: - env[v] = val -- subprocess.check_call(["./configure"], cwd="sqlite3", env=env) +- # configure failing to run is ignored - this happens with +- # linux host doing emscripten etc +- subprocess.call(["./configure"], cwd="sqlite3", env=env) + -- # We allow enable/omit to be specified to build and then pass them to build_ext - build_enable = None - build_omit = None -@@ -398,7 +389,7 @@ +@@ -395,7 +385,7 @@ if self.fetch: fc = fetch(self._saved_dist) fc.initialize_options() @@ -57,14 +52,3 @@ cross-compile: fc.finalize_options() fc.run() return bparent.finalize_options(self) -@@ -557,10 +548,6 @@ - else: - ext.define_macros.append(("NDEBUG", "1")) - -- # fork checker? -- if hasattr(os, "fork"): -- ext.define_macros.append(("APSW_FORK_CHECKER", "1")) -- - # SQLite 3 - # Look for amalgamation in sqlite3 subdirectory - diff --git a/recipes/argon2-cffi-bindings/meta.yaml b/recipes/argon2-cffi-bindings/meta.yaml index 142624fd..7ef33e3a 100644 --- a/recipes/argon2-cffi-bindings/meta.yaml +++ b/recipes/argon2-cffi-bindings/meta.yaml @@ -1,6 +1,45 @@ package: name: argon2-cffi-bindings - version: "25.1.0" + version: "26.2.0" + +requirements: + build: + # 26.x builds with scikit-build-core + CMake (was setuptools + cffi). + - cmake + - ninja build: number: 1 + backend-args: + # Build a regular CPython-ABI wheel. The abi3 build asks FindPython for + # Development.SABIModule (libpython3.so), which our support tree lacks, and + # one missing component makes FindPython report all of them missing. + - -Cwheel.py-api= + script_env: + # Toolchain, the crossenv python and the target Python headers/lib for + # FindPython; the /usr/bin/env emulator lets CMake 4 search the interpreter. +# {% if sdk == 'android' %} + CMAKE_ARGS: >- + -DCMAKE_TOOLCHAIN_FILE={NDK_ROOT}/build/cmake/android.toolchain.cmake + -DANDROID_ABI={ANDROID_ABI} + -DANDROID_NATIVE_API_LEVEL={ANDROID_API_LEVEL} + -DCMAKE_CROSSCOMPILING_EMULATOR=/usr/bin/env + -DCMAKE_SHARED_LINKER_FLAGS=-Wl,-z,max-page-size=16384 + -DCMAKE_MODULE_LINKER_FLAGS=-Wl,-z,max-page-size=16384 + -DPython_EXECUTABLE={CROSS_VENV_PYTHON} + -DPython_INCLUDE_DIR={HOST_PYTHON_HOME}/include/python{py_version_short} + -DPython_LIBRARY={HOST_PYTHON_HOME}/lib/libpython{py_version_short}.so +# {% else %} + # The `ninja` pip package crashes importing on the iOS crossenv python + # (pyzmq tell), so use the Makefiles generator on iOS. + CMAKE_GENERATOR: Unix Makefiles + CMAKE_ARGS: >- + -DCMAKE_SYSTEM_NAME=iOS + -DCMAKE_OSX_SYSROOT={{ sdk }} + -DCMAKE_OSX_DEPLOYMENT_TARGET={{ sdk_version }} + -DCMAKE_OSX_ARCHITECTURES={{ arch }} + -DCMAKE_CROSSCOMPILING_EMULATOR=/usr/bin/env + -DPython_EXECUTABLE={CROSS_VENV_PYTHON} + -DPython_INCLUDE_DIR={HOST_PYTHON_HOME}/include/python{py_version_short} + -DPython_LIBRARY={HOST_PYTHON_HOME}/lib/libpython{py_version_short}.dylib +# {% endif %} diff --git a/recipes/astropy/meta.yaml b/recipes/astropy/meta.yaml index 97be81bc..ce53a3f8 100644 --- a/recipes/astropy/meta.yaml +++ b/recipes/astropy/meta.yaml @@ -1,6 +1,6 @@ package: name: astropy - version: "8.0.0" + version: "8.0.2" build: number: 1 diff --git a/recipes/av/examples/clip-roundtrip/pyproject.toml b/recipes/av/examples/clip-roundtrip/pyproject.toml index 43fd3013..b475411d 100644 --- a/recipes/av/examples/clip-roundtrip/pyproject.toml +++ b/recipes/av/examples/clip-roundtrip/pyproject.toml @@ -6,7 +6,7 @@ requires-python = ">=3.11" dependencies = [ "flet==0.86.5", - "av==18.1.0", + "av==19.0.2", ] [dependency-groups] diff --git a/recipes/av/meta.yaml b/recipes/av/meta.yaml index c995ba69..6c7b6768 100644 --- a/recipes/av/meta.yaml +++ b/recipes/av/meta.yaml @@ -1,6 +1,6 @@ package: name: av - version: "18.1.0" + version: "19.0.2" build: number: 1 @@ -37,4 +37,4 @@ requirements: # Pinned exactly: PyAV tracks the FFmpeg 8.x ABI closely and the two are # released as a pair, so a floating >= would let a future ABI bump resolve # into an `av` built against the old headers. - - flet-libffmpeg ==8.1.2 + - flet-libffmpeg ==8.1.3 diff --git a/recipes/biopython/meta.yaml b/recipes/biopython/meta.yaml index f5c94ce5..7d24fbf8 100644 --- a/recipes/biopython/meta.yaml +++ b/recipes/biopython/meta.yaml @@ -1,6 +1,6 @@ package: name: biopython - version: "1.87" + version: "1.88" build: - number: 10 + number: 1 diff --git a/recipes/bitarray/meta.yaml b/recipes/bitarray/meta.yaml index 0d935757..6f3cd29b 100644 --- a/recipes/bitarray/meta.yaml +++ b/recipes/bitarray/meta.yaml @@ -1,6 +1,6 @@ package: name: bitarray - version: "3.8.1" + version: "3.12.3" build: number: 1 diff --git a/recipes/blis/meta.yaml b/recipes/blis/meta.yaml index 436fb548..6320a6eb 100644 --- a/recipes/blis/meta.yaml +++ b/recipes/blis/meta.yaml @@ -1,6 +1,6 @@ package: name: blis - version: "1.3.3" + version: "1.3.4" build: number: 1 diff --git a/recipes/blis/patches/mobile.patch b/recipes/blis/patches/mobile.patch index ddd34412..7b44d145 100644 --- a/recipes/blis/patches/mobile.patch +++ b/recipes/blis/patches/mobile.patch @@ -1,46 +1,44 @@ -diff --git a/blis/_src/frame/thread/bli_pthread.c b/blis/_src/frame/thread/bli_pthread.c --- a/blis/_src/frame/thread/bli_pthread.c +++ b/blis/_src/frame/thread/bli_pthread.c @@ -319,7 +319,7 @@ - + // -- pthread_barrier_*() -- - + -#if defined(__APPLE__) || defined(_MSC_VER) +#if defined(__APPLE__) || defined(_MSC_VER) || defined(__ANDROID__) - + // For OS X and Windows, we define barriers ourselves in terms of the rest // of the API, though for slightly different reasons: For Windows, we must -diff --git a/blis/_src/include/linux-generic/blis.h b/blis/_src/include/linux-generic/blis.h --- a/blis/_src/include/linux-generic/blis.h +++ b/blis/_src/include/linux-generic/blis.h -@@ -1537,7 +1537,7 @@ typedef pthread_cond_t bli_pthread_cond_t; +@@ -1537,7 +1537,7 @@ typedef pthread_condattr_t bli_pthread_condattr_t; typedef pthread_once_t bli_pthread_once_t; - + -#if defined(__APPLE__) +#if defined(__APPLE__) || defined(__ANDROID__) - + // For OS X, we must define the barrier types ourselves since Apple does // not implement barriers in their variant of pthreads. -diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py -@@ -21,8 +21,13 @@ +@@ -21,9 +21,14 @@ import sys import platform import numpy +import sysconfig - + from multiprocessing.pool import ThreadPool + MOD_NAMES = ["blis.cy", "blis.py"] + +# Redirect the compiler to CC +os.environ["BLIS_ARCH"] = "generic" +os.environ["BLIS_COMPILER"] = os.environ["CC"] - + print("BLIS_COMPILER?", os.environ.get("BLIS_COMPILER", "None")) - -@@ -199,6 +204,9 @@ - objects = [] + +@@ -237,6 +242,9 @@ + specs = [] platform_arch = platform + "-" + py_arch compiler = self.get_compiler_name() + host_triplet = sysconfig.get_platform().split("-") @@ -49,7 +47,7 @@ diff --git a/setup.py b/setup.py with open(os.path.join(BLIS_DIR, "make", "%s.jsonl" % platform_arch)) as file_: env = {} for line in file_: -@@ -228,6 +236,8 @@ +@@ -266,6 +274,8 @@ spec["flags"] = [ f for f in spec["flags"] if "visibility=hidden" not in f ] diff --git a/recipes/brotli/meta.yaml b/recipes/brotli/meta.yaml index 95beed18..00861f00 100644 --- a/recipes/brotli/meta.yaml +++ b/recipes/brotli/meta.yaml @@ -1,6 +1,6 @@ package: name: Brotli - version: "1.2.0" + version: "1.2.1" build: number: 1 diff --git a/recipes/cbor2/meta.yaml b/recipes/cbor2/meta.yaml index b43c1b76..f9c9aadd 100644 --- a/recipes/cbor2/meta.yaml +++ b/recipes/cbor2/meta.yaml @@ -1,6 +1,6 @@ package: name: cbor2 - version: "6.1.4" + version: "6.3.0" build: number: 1 diff --git a/recipes/contourpy/meta.yaml b/recipes/contourpy/meta.yaml index 84777204..9704db91 100644 --- a/recipes/contourpy/meta.yaml +++ b/recipes/contourpy/meta.yaml @@ -1,6 +1,6 @@ package: name: contourpy - version: "1.3.3" + version: "1.4.0" requirements: build: diff --git a/recipes/coolprop/meta.yaml b/recipes/coolprop/meta.yaml index ccae1eb9..fca7f827 100644 --- a/recipes/coolprop/meta.yaml +++ b/recipes/coolprop/meta.yaml @@ -1,6 +1,6 @@ package: name: coolprop - version: "7.2.0" + version: "8.0.0" requirements: build: @@ -14,10 +14,15 @@ patches: - mkdir-cython-output.patch build: - number: 11 + number: 1 script_env: + # 8.0 defaults to a nanobind core plus Cython "capsule shim" sidecars. That + # path links no libpython on Android (undefined PyMem_Malloc etc.) and writes + # into a build dir it never creates on iOS. COOLPROP_NANOBIND=OFF keeps the + # legacy Cython wrapper, the shape 7.x shipped. # {% if sdk == 'android' %} CMAKE_ARGS: >- + -DCOOLPROP_NANOBIND=OFF -DCMAKE_TOOLCHAIN_FILE={NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI={ANDROID_ABI} -DANDROID_PLATFORM=android-{ANDROID_API_LEVEL} @@ -30,6 +35,7 @@ build: -DPython3_INCLUDE_DIR={HOST_PYTHON_HOME}/include/python{py_version_short} # {% else %} CMAKE_ARGS: >- + -DCOOLPROP_NANOBIND=OFF -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT={{ sdk }} -DCMAKE_OSX_DEPLOYMENT_TARGET={{ sdk_version }} diff --git a/recipes/cymem/meta.yaml b/recipes/cymem/meta.yaml index 8e89286a..0cf8df7b 100644 --- a/recipes/cymem/meta.yaml +++ b/recipes/cymem/meta.yaml @@ -1,6 +1,6 @@ package: name: cymem - version: "2.0.13" + version: "2.0.16" build: number: 1 diff --git a/recipes/duckdb/meta.yaml b/recipes/duckdb/meta.yaml index ef34d546..fdbf98a5 100644 --- a/recipes/duckdb/meta.yaml +++ b/recipes/duckdb/meta.yaml @@ -1,6 +1,6 @@ package: name: duckdb - version: "1.5.4" + version: "2.0.0" requirements: build: @@ -18,8 +18,15 @@ requirements: build: number: 1 + backend-args: + # 2.0 builds a cp312 abi3 wheel by default, which asks FindPython for + # Development.SABIModule (libpython3.so). Our support tree lacks it, and one + # missing component makes FindPython report all of them missing. + - -Cwheel.py-api= script_env: # {% if sdk == 'android' %} + # nanobind (2.0) leaves Python symbols for load time, unlike pybind11's + # Python::Module; the NDK links with --no-undefined, so link libpython. CMAKE_ARGS: >- -DCMAKE_TOOLCHAIN_FILE={NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI={ANDROID_ABI} @@ -27,7 +34,7 @@ build: -DANDROID_STL=c++_shared -DCMAKE_CROSSCOMPILING_EMULATOR=/usr/bin/env -DCMAKE_SHARED_LINKER_FLAGS=-Wl,-z,max-page-size=16384 - -DCMAKE_MODULE_LINKER_FLAGS=-Wl,-z,max-page-size=16384 + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,-z,max-page-size=16384 -L{HOST_PYTHON_HOME}/lib -lpython{py_version_short}" -DPython_EXECUTABLE={CROSS_VENV_PYTHON} -DPython_INCLUDE_DIR={HOST_PYTHON_HOME}/include/python{py_version_short} -DPython_LIBRARY={HOST_PYTHON_HOME}/lib/libpython{py_version_short}.so diff --git a/recipes/faiss-cpu/meta.yaml b/recipes/faiss-cpu/meta.yaml index 34f4c55c..e9cdd797 100644 --- a/recipes/faiss-cpu/meta.yaml +++ b/recipes/faiss-cpu/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.14.3" %} +{% set version = "1.16.0" %} package: name: faiss-cpu @@ -8,7 +8,7 @@ source: url: https://github.com/facebookresearch/faiss/archive/refs/tags/v{{ version }}.tar.gz build: - number: 2 + number: 1 script_env: # scikit-build-core honors the CMAKE_ARGS env var (appended to its cmake call), # same as recipes/duckdb. faiss defines + BLAS + OpenMP are shared across @@ -83,7 +83,7 @@ requirements: host_build: # Static libs linked INTO libfaiss / _swigfaiss.so — needed to build/link but # never dlopened at runtime, so kept OUT of the wheel's Requires-Dist. - - flet-libopenblas 0.3.33 + - flet-libopenblas 0.3.34 # {% if sdk != 'android' %} # iOS serial-stub libomp.a (+ omp.h) — static-linked. - flet-libomp 27.3.13750724 diff --git a/recipes/fiona/meta.yaml b/recipes/fiona/meta.yaml index 2c8826b0..7103baed 100644 --- a/recipes/fiona/meta.yaml +++ b/recipes/fiona/meta.yaml @@ -4,23 +4,19 @@ package: requirements: host: - - flet-libgdal 3.13.1 + - flet-libgdal 3.13.3 # {% if sdk != 'android' %} # iOS-only — see GDAL_LIBS comment below for the rationale. - openssl >=3.0.15 - - flet-libjpeg 3.0.90 + - flet-libjpeg 3.2.1 # {% endif %} build: - # Same source version as pypi.flet.dev's fiona-1.10.1-10 wheel, but - # this rebuild links against flet-libgdal 3.13.1 (vs. the published - # wheel's 3.10.0). pip's wheel selection picks the higher build_tag - # per PEP 427 when name+version collide; the new wheel must outrank - # build 10 or downstream installs would silently keep the old - # libgdal-3.10-linked fiona and the gdal chain bump would be invisible. - number: 11 + # fiona stays at 1.10.1 but relinks against each flet-libgdal bump, so + # every rebuild must outrank the published build tags (highest: 11). + number: 12 script_env: - GDAL_VERSION: 3.13.1 + GDAL_VERSION: 3.13.3 GDAL_LIB_PATH: '{platlib}/opt/lib' GDAL_INCLUDE_PATH: '{platlib}/opt/include' # {% if sdk == 'android' %} diff --git a/recipes/flet-libarrow/build.sh b/recipes/flet-libarrow/build.sh index 2428e93d..a2998e2e 100755 --- a/recipes/flet-libarrow/build.sh +++ b/recipes/flet-libarrow/build.sh @@ -11,6 +11,9 @@ # * iOS link: -framework CoreFoundation — Arrow's vendored `date` lib compiles # ios.mm (Obj-C++) using CoreFoundation for the tzdata. # * ARROW_SIMD_LEVEL=NONE — avoids -march=armv8-a (Apple clang dislikes it). +# * ARROW_RUNTIME_SIMD_LEVEL=NONE — 26.x adds runtime-dispatched SVE-256 kernels +# (util/bpacking_simd_256.cc) that crash NDK r27 clang ("Cannot scalarize +# scalable vector loads"). set -eu # Locate the Arrow C++ source (cpp/), whether or not forge stripped the tarball top dir. @@ -58,6 +61,7 @@ COMMON_ARGS=( -DCMAKE_INSTALL_LIBDIR=lib -DARROW_CPU_FLAG="$CPU" -DARROW_SIMD_LEVEL=NONE + -DARROW_RUNTIME_SIMD_LEVEL=NONE -DARROW_BUILD_SHARED=ON -DARROW_BUILD_STATIC=OFF -DARROW_IPC=ON # pyarrow 24 builds 7 UNCONDITIONAL Cython modules (lib, _compute, _csv, diff --git a/recipes/flet-libarrow/meta.yaml b/recipes/flet-libarrow/meta.yaml index 7a4b3399..810afe02 100644 --- a/recipes/flet-libarrow/meta.yaml +++ b/recipes/flet-libarrow/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "24.0.0" %} +{% set version = "26.0.1" %} package: name: flet-libarrow version: '{{ version }}' @@ -9,7 +9,7 @@ package: # not worth diverging from the flet-lib* convention to skip it. build: - number: 2 + number: 1 source: # Apache Arrow C++ (curated source release; build dir = its cpp/). pyarrow diff --git a/recipes/flet-libcurl/meta.yaml b/recipes/flet-libcurl/meta.yaml index bc1b1b98..c66215a5 100644 --- a/recipes/flet-libcurl/meta.yaml +++ b/recipes/flet-libcurl/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "8.11.0" %} +{% set version = "8.23.0" %} package: name: flet-libcurl @@ -8,14 +8,14 @@ source: url: https://curl.se/download/curl-{{ version }}.tar.gz build: - number: 10 + number: 1 requirements: host: # {% if sdk in ['iphoneos', 'iphonesimulator'] %} - openssl >=3.0.15 # {% endif %} - - flet-libpsl 0.21.5 + - flet-libpsl 0.23.3 patches: - config.patch diff --git a/recipes/flet-libffmpeg/meta.yaml b/recipes/flet-libffmpeg/meta.yaml index 33e38eb6..edf62bdd 100644 --- a/recipes/flet-libffmpeg/meta.yaml +++ b/recipes/flet-libffmpeg/meta.yaml @@ -1,4 +1,4 @@ -# {% set version = "8.1.2" %} +# {% set version = "8.1.3" %} package: name: flet-libffmpeg version: '{{ version }}' diff --git a/recipes/flet-libfreetds/meta.yaml b/recipes/flet-libfreetds/meta.yaml index b9a71022..c13a5e87 100644 --- a/recipes/flet-libfreetds/meta.yaml +++ b/recipes/flet-libfreetds/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.4.27" %} +{% set version = "1.5.21" %} package: name: flet-libfreetds @@ -9,7 +9,7 @@ source: url: https://www.freetds.org/files/stable/freetds-{{ version }}.tar.gz build: - number: 2 + number: 1 script_env: # OpenSSL (for TLS) comes from the python-build support tree, surfaced by the # `openssl` host requirement at {platlib}/opt (same as cryptography). diff --git a/recipes/flet-libfreetype/meta.yaml b/recipes/flet-libfreetype/meta.yaml index b83b628b..fdcc6879 100644 --- a/recipes/flet-libfreetype/meta.yaml +++ b/recipes/flet-libfreetype/meta.yaml @@ -1,11 +1,11 @@ -{% set version = "2.13.3" %} +{% set version = "2.15.0" %} package: name: flet-libfreetype version: '{{ version }}' build: - number: 11 + number: 1 source: url: https://downloads.sourceforge.net/project/freetype/freetype2/{{ version }}/freetype-{{ version }}.tar.gz diff --git a/recipes/flet-libgdal/build.sh b/recipes/flet-libgdal/build.sh index 39e70b1c..dd2c7c57 100755 --- a/recipes/flet-libgdal/build.sh +++ b/recipes/flet-libgdal/build.sh @@ -61,6 +61,13 @@ else -DGDAL_USE_EXTERNAL_LIBS=OFF \ -DPROJ_LIBRARY=$PLATLIB/opt/lib/libproj.a \ -DPROJ_INCLUDE_DIR=$PLATLIB/opt/include \ + `# Use flet-libtiff (already here via flet-libproj), not GDAL's internal` \ + `# copy: consumers link libtiff.a for libproj.a, and two static TIFFs` \ + `# give duplicate symbols (libtiff 4.7.2 + PROJ 9.9).` \ + -DGDAL_USE_TIFF=ON \ + -DGDAL_USE_TIFF_INTERNAL=OFF \ + -DTIFF_LIBRARY=$PLATLIB/opt/lib/libtiff.a \ + -DTIFF_INCLUDE_DIR=$PLATLIB/opt/include \ -DSQLite3_LIBRARY=$SDK_ROOT/usr/lib/libsqlite3.tbd \ -DSQLite3_INCLUDE_DIR=$SDK_ROOT/usr/include \ -DGDAL_BUILD_OPTIONAL_DRIVERS=OFF \ diff --git a/recipes/flet-libgdal/meta.yaml b/recipes/flet-libgdal/meta.yaml index 32d3e9a8..08f78855 100644 --- a/recipes/flet-libgdal/meta.yaml +++ b/recipes/flet-libgdal/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.13.1" %} +{% set version = "3.13.3" %} package: name: flet-libgdal @@ -8,13 +8,13 @@ source: url: https://github.com/OSGeo/gdal/releases/download/v{{ version }}/gdal-{{ version }}.tar.gz build: - number: 2 + number: 1 requirements: build: - cmake host: - - flet-libproj 9.5.0 + - flet-libproj 9.9.0 patches: - mobile.patch diff --git a/recipes/flet-libgdal/patches/mobile.patch b/recipes/flet-libgdal/patches/mobile.patch index 8460b7be..1e0b9c81 100644 --- a/recipes/flet-libgdal/patches/mobile.patch +++ b/recipes/flet-libgdal/patches/mobile.patch @@ -1,24 +1,24 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt +Skip GDAL's target-Python probe when Python bindings are explicitly off. + +GDAL probes for a target Python interpreter before it decides whether to build +the bindings. Cross-compiling under CMake 4.x, that probe fails policy CMP0190 +("Interpreter and/or Compiler components cannot be searched when +CMAKE_CROSSCOMPILING_EMULATOR variable is not specified"). 3.13.3 guards the +probe on BUILD_PYTHON_BINDINGS_OLD_VAL, but that cache entry only exists after a +first configure, so a fresh -DBUILD_PYTHON_BINDINGS=OFF build still probes. + --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -221,6 +221,12 @@ endif() +@@ -221,7 +221,11 @@ endif() set(ENV{MKL_ENABLE_INSTRUCTIONS} "SSE4_2") - -+# Mobile cross-compile guard: GDAL 3.13 unconditionally probes for the -+# target Python interpreter even when -DBUILD_PYTHON_BINDINGS=OFF. Under -+# CMake 4.x that trips policy CMP0190 ("Interpreter and/or Compiler -+# components cannot be searched when CMAKE_CROSSCOMPILING_EMULATOR -+# variable is not specified"). Skip the block when bindings are off. -+if (BUILD_PYTHON_BINDINGS OR NOT DEFINED BUILD_PYTHON_BINDINGS) - if (Python_LOOKUP_VERSION) - set(Python_FIND_STRATEGY VERSION) - find_package(Python ${Python_LOOKUP_VERSION} EXACT COMPONENTS Interpreter Development NumPy) -@@ -248,6 +254,7 @@ if (Python_Interpreter_FOUND) - endif () - endif() - endif() -+endif() - - # Restore previous value of MKL_ENABLE_INSTRUCTIONS - if(DEFINED BACKUP_ENV_VAR_MKL_ENABLE_INSTRUCTIONS) + +-if (BUILD_PYTHON_BINDINGS OR (NOT DEFINED BUILD_PYTHON_BINDINGS_OLD_VAL)) ++# Mobile cross-compile guard: upstream's condition still probes for the target ++# Python on a first configure with -DBUILD_PYTHON_BINDINGS=OFF (the _OLD_VAL ++# cache entry is not set yet), and under CMake 4.x that trips CMP0190 when ++# cross-compiling without CMAKE_CROSSCOMPILING_EMULATOR. Honour the explicit OFF. ++if (BUILD_PYTHON_BINDINGS OR (NOT DEFINED BUILD_PYTHON_BINDINGS AND NOT DEFINED BUILD_PYTHON_BINDINGS_OLD_VAL)) + if (Python_LOOKUP_VERSION) + set(Python_FIND_STRATEGY VERSION) + find_package(Python ${Python_LOOKUP_VERSION} EXACT COMPONENTS Interpreter Development NumPy) diff --git a/recipes/flet-libgeos/build.sh b/recipes/flet-libgeos/build.sh index dfb261c5..e0b957a6 100755 --- a/recipes/flet-libgeos/build.sh +++ b/recipes/flet-libgeos/build.sh @@ -16,6 +16,7 @@ else -DCMAKE_SYSTEM_NAME=iOS \ -DCMAKE_OSX_SYSROOT=$SDK \ -DCMAKE_OSX_ARCHITECTURES=$HOST_ARCH \ + -DCMAKE_OSX_DEPLOYMENT_TARGET=$SDK_VERSION \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DBUILD_SHARED_LIBS=OFF \ diff --git a/recipes/flet-libgeos/meta.yaml b/recipes/flet-libgeos/meta.yaml index 74ba0705..b1dc07db 100644 --- a/recipes/flet-libgeos/meta.yaml +++ b/recipes/flet-libgeos/meta.yaml @@ -3,14 +3,14 @@ # FSF version -- broader than -or-later, and positively not -only. Neither # standard identifier is faithful, and src/deps/ryu (Apache-2.0 OR BSL-1.0) is # linked in besides. The COPYING file ships either way. -{% set version = "3.13.1" %} +{% set version = "3.15.0" %} package: name: flet-libgeos version: '{{ version }}' build: - number: 2 + number: 1 source: url: http://download.osgeo.org/geos/geos-{{ version }}.tar.bz2 diff --git a/recipes/flet-libiconv/meta.yaml b/recipes/flet-libiconv/meta.yaml index 2db6b74c..1e052542 100644 --- a/recipes/flet-libiconv/meta.yaml +++ b/recipes/flet-libiconv/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.17" %} +{% set version = "1.19.1" %} package: name: flet-libiconv @@ -10,7 +10,7 @@ package: platforms: [android] build: - number: 2 + number: 1 source: url: https://ftp.gnu.org/gnu/libiconv/libiconv-{{ version }}.tar.gz diff --git a/recipes/flet-libjpeg/meta.yaml b/recipes/flet-libjpeg/meta.yaml index 6918e805..eaa16279 100644 --- a/recipes/flet-libjpeg/meta.yaml +++ b/recipes/flet-libjpeg/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.0.90" %} +{% set version = "3.2.1" %} package: name: flet-libjpeg @@ -8,7 +8,7 @@ source: url: https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/{{ version }}/libjpeg-turbo-{{ version }}.tar.gz build: - number: 11 + number: 1 requirements: build: diff --git a/recipes/flet-libjq/meta.yaml b/recipes/flet-libjq/meta.yaml index 5a813eea..bce58a53 100644 --- a/recipes/flet-libjq/meta.yaml +++ b/recipes/flet-libjq/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.7.1" %} +{% set version = "1.8.2" %} package: name: flet-libjq @@ -8,7 +8,7 @@ source: url: https://github.com/jqlang/jq/releases/download/jq-{{ version }}/jq-{{ version }}.tar.gz build: - number: 12 + number: 1 requirements: build: @@ -21,5 +21,5 @@ about: # oniguruma is bundled (--with-oniguruma=builtin), so its notice ships too. license_file: - COPYING - - modules/oniguruma/COPYING + - vendor/oniguruma/COPYING license: MIT AND BSD-2-Clause AND ICU AND dtoa diff --git a/recipes/flet-libjq/patches/config.patch b/recipes/flet-libjq/patches/config.patch index d4a35e70..90b4bf3d 100644 --- a/recipes/flet-libjq/patches/config.patch +++ b/recipes/flet-libjq/patches/config.patch @@ -1,26 +1,24 @@ diff --git a/config/config.sub b/config/config.sub -index dba16e8..215b8e2 100755 --- a/config/config.sub +++ b/config/config.sub -@@ -1792,6 +1792,8 @@ case $kernel-$os in +@@ -1791,6 +1791,8 @@ + os2-emx) ;; *-eabi* | *-gnueabi*) - ;; -+ ios-simulator) + ;; ++ ios-simulator) + ;; -*) # Blank kernel with real OS is always fine. - ;; -diff --git a/modules/oniguruma/config.sub b/modules/oniguruma/config.sub -index 0753e30..fe182ac 100755 ---- a/modules/oniguruma/config.sub -+++ b/modules/oniguruma/config.sub -@@ -1753,6 +1753,8 @@ case $kernel-$os in +diff --git a/vendor/oniguruma/config.sub b/vendor/oniguruma/config.sub +--- a/vendor/oniguruma/config.sub ++++ b/vendor/oniguruma/config.sub +@@ -1752,6 +1752,8 @@ + nto-qnx*) ;; *-eabi* | *-gnueabi*) - ;; -+ ios-simulator) + ;; ++ ios-simulator) + ;; -*) # Blank kernel with real OS is always fine. - ;; diff --git a/recipes/flet-libmagic/meta.yaml b/recipes/flet-libmagic/meta.yaml index 86cfeaba..6c2da23f 100644 --- a/recipes/flet-libmagic/meta.yaml +++ b/recipes/flet-libmagic/meta.yaml @@ -1,11 +1,11 @@ -{% set version = "5.46" %} +{% set version = "5.48" %} package: name: flet-libmagic version: '{{ version }}' build: - number: 2 + number: 1 source: # The `file` project ships a release tarball with a pre-generated ./configure diff --git a/recipes/flet-libmp3lame/meta.yaml b/recipes/flet-libmp3lame/meta.yaml index 999bc2d3..a1127c63 100644 --- a/recipes/flet-libmp3lame/meta.yaml +++ b/recipes/flet-libmp3lame/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.100" %} +{% set version = "4.0" %} # Static PIC libmp3lame -- the MP3 *encoder* half of flet-libsndfile's MP3 # support (mpg123 is the decoder half; libsndfile needs both or neither). diff --git a/recipes/flet-libopaque/meta.yaml b/recipes/flet-libopaque/meta.yaml index 1be2cf8c..59ab6806 100644 --- a/recipes/flet-libopaque/meta.yaml +++ b/recipes/flet-libopaque/meta.yaml @@ -5,14 +5,14 @@ package: version: '{{ version }}' build: - number: 2 + number: 3 source: url: https://github.com/stef/libopaque/archive/refs/tags/v{{ version }}.tar.gz requirements: host: - - flet-libsodium 1.0.20 + - flet-libsodium 1.0.22 - flet-liboprf 0.5.0 patches: diff --git a/recipes/flet-libopenblas/meta.yaml b/recipes/flet-libopenblas/meta.yaml index 10978ac2..ca27da8b 100644 --- a/recipes/flet-libopenblas/meta.yaml +++ b/recipes/flet-libopenblas/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "0.3.33" %} +{% set version = "0.3.34" %} package: name: flet-libopenblas diff --git a/recipes/flet-liboprf/meta.yaml b/recipes/flet-liboprf/meta.yaml index e8b5fc44..f9881c47 100644 --- a/recipes/flet-liboprf/meta.yaml +++ b/recipes/flet-liboprf/meta.yaml @@ -9,10 +9,10 @@ source: requirements: host: - - flet-libsodium 1.0.20 + - flet-libsodium 1.0.22 build: - number: 10 + number: 11 script_env: CFLAGS: '-Qunused-arguments -Wno-unreachable-code' diff --git a/recipes/flet-libpng/meta.yaml b/recipes/flet-libpng/meta.yaml index a43e4cdc..e4fe57c7 100644 --- a/recipes/flet-libpng/meta.yaml +++ b/recipes/flet-libpng/meta.yaml @@ -1,18 +1,15 @@ -{% set version = "1.6.43" %} +{% set version = "1.6.59" %} package: name: flet-libpng version: '{{ version }}' build: - number: 11 + number: 1 source: url: https://github.com/pnggroup/libpng/archive/refs/tags/v{{ version }}.tar.gz -patches: - - config.patch - about: # Lowercase libpng-2.0: the capital-L `Libpng` licence applies only up to 1.6.35. license: libpng-2.0 diff --git a/recipes/flet-libpng/patches/config.patch b/recipes/flet-libpng/patches/config.patch deleted file mode 100644 index 76722d9d..00000000 --- a/recipes/flet-libpng/patches/config.patch +++ /dev/null @@ -1,29 +0,0 @@ -index defe52c..829037b 100755 ---- a/config.sub -+++ b/config.sub -@@ -146,6 +146,7 @@ case $1 in - | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ - | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ - | storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \ -+ | ios*-simulator | tvos*-simulator | watchos*-simulator \ - | windows-* ) - basic_machine=$field1 - basic_os=$maybe_os -@@ -1500,6 +1501,8 @@ case $os in - obj=$os - os= - ;; -+ ios | ios-simulator) -+ ;; - *) - # No normalization, but not necessarily accepted, that comes below. - ;; -@@ -1855,6 +1858,8 @@ case $kernel-$os-$obj in - ;; - *-eabi*- | *-gnueabi*-) - ;; -+ ios-simulator-) -+ ;; - none--*) - # None (no kernel, i.e. freestanding / bare metal), - # can be paired with an machine code file format \ No newline at end of file diff --git a/recipes/flet-libpq/meta.yaml b/recipes/flet-libpq/meta.yaml index 791dfe54..afc93022 100644 --- a/recipes/flet-libpq/meta.yaml +++ b/recipes/flet-libpq/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "17.5" %} +{% set version = "17.12" %} package: name: flet-libpq @@ -10,7 +10,7 @@ source: url: https://ftp.postgresql.org/pub/source/v{{ version }}/postgresql-{{ version }}.tar.gz build: - number: 2 + number: 1 script_env: # OpenSSL (libpq TLS) comes from the python-build support tree, surfaced by # the `openssl` host requirement at {platlib}/opt (same as cryptography). diff --git a/recipes/flet-libproj/meta.yaml b/recipes/flet-libproj/meta.yaml index bb38e0d7..0563488c 100644 --- a/recipes/flet-libproj/meta.yaml +++ b/recipes/flet-libproj/meta.yaml @@ -1,14 +1,15 @@ -{% set version = "9.5.0" %} +{% set version = "9.9.0" %} package: name: flet-libproj version: '{{ version }}' source: - url: https://download.osgeo.org/proj/proj-{{ version }}.tar.gz + # GitHub release asset: byte-identical to download.osgeo.org, which flakes in CI. + url: https://github.com/OSGeo/PROJ/releases/download/{{ version }}/proj-{{ version }}.tar.gz build: - number: 10 + number: 1 # {% if sdk != 'android' %} script_env: LDFLAGS: '-undefined dynamic_lookup' @@ -18,8 +19,8 @@ requirements: build: - cmake host: - - flet-libtiff 4.7.0 - - flet-libcurl 8.11.0 + - flet-libtiff 4.7.2 + - flet-libcurl 8.23.0 about: license: MIT diff --git a/recipes/flet-libpsl/meta.yaml b/recipes/flet-libpsl/meta.yaml index a78b29f1..cb1856a0 100644 --- a/recipes/flet-libpsl/meta.yaml +++ b/recipes/flet-libpsl/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "0.21.5" %} +{% set version = "0.23.3" %} package: name: flet-libpsl @@ -8,7 +8,7 @@ source: url: https://github.com/rockdaboot/libpsl/releases/download/{{ version }}/libpsl-{{ version }}.tar.gz build: - number: 11 + number: 1 patches: - config.patch diff --git a/recipes/flet-libpsl/patches/config.patch b/recipes/flet-libpsl/patches/config.patch index 3000a67f..edea4c5d 100644 --- a/recipes/flet-libpsl/patches/config.patch +++ b/recipes/flet-libpsl/patches/config.patch @@ -1,13 +1,12 @@ diff --git a/build-aux/config.sub b/build-aux/config.sub -index dba16e8..215b8e2 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub -@@ -1792,6 +1792,8 @@ case $kernel-$os in - ;; - *-eabi* | *-gnueabi*) - ;; -+ ios-simulator) +@@ -2252,6 +2252,8 @@ + none--*) + # None (no kernel, i.e. freestanding / bare metal), + # can be paired with an machine code file format + ;; - -*) - # Blank kernel with real OS is always fine. ++ ios-simulator-) ;; + -*-) + # Blank kernel with real OS is always fine. diff --git a/recipes/flet-libsndfile/meta.yaml b/recipes/flet-libsndfile/meta.yaml index ba3d7458..000f54ca 100644 --- a/recipes/flet-libsndfile/meta.yaml +++ b/recipes/flet-libsndfile/meta.yaml @@ -5,7 +5,7 @@ package: version: '{{ version }}' build: - number: 1 + number: 2 source: url: https://github.com/libsndfile/libsndfile/releases/download/{{ version }}/libsndfile-{{ version }}.tar.xz @@ -22,7 +22,7 @@ requirements: - flet-libflac 1.5.0 - flet-libopus 1.5.2 - flet-libmpg123 1.33.7 - - flet-libmp3lame 3.100 + - flet-libmp3lame 4.0 patches: - security-backports.patch diff --git a/recipes/flet-libsodium/meta.yaml b/recipes/flet-libsodium/meta.yaml index 50bc4ab2..b16c3a5c 100644 --- a/recipes/flet-libsodium/meta.yaml +++ b/recipes/flet-libsodium/meta.yaml @@ -1,11 +1,11 @@ -{% set version = "1.0.20" %} +{% set version = "1.0.22" %} package: name: flet-libsodium version: '{{ version }}' build: - number: 11 + number: 1 source: url: https://github.com/jedisct1/libsodium/releases/download/{{ version }}-RELEASE/libsodium-{{ version }}.tar.gz diff --git a/recipes/flet-libtiff/meta.yaml b/recipes/flet-libtiff/meta.yaml index 3a38e33b..73cb9c0c 100644 --- a/recipes/flet-libtiff/meta.yaml +++ b/recipes/flet-libtiff/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "4.7.0" %} +{% set version = "4.7.2" %} package: name: flet-libtiff @@ -8,11 +8,11 @@ source: url: https://download.osgeo.org/libtiff/tiff-{{ version }}.tar.gz build: - number: 10 + number: 1 requirements: host: - - flet-libjpeg 3.0.90 + - flet-libjpeg 3.2.1 patches: - config.patch diff --git a/recipes/flet-libxml2/meta.yaml b/recipes/flet-libxml2/meta.yaml index 6583381d..3e77d03c 100755 --- a/recipes/flet-libxml2/meta.yaml +++ b/recipes/flet-libxml2/meta.yaml @@ -1,4 +1,4 @@ -# {% set version = "2.15.3" %} +# {% set version = "2.15.4" %} # {% if version.startswith('2.9.') %} # {% set patch = "mobile-2.9.x.patch" %} # {% else %} @@ -10,7 +10,7 @@ package: version: '{{ version }}' build: - number: 11 + number: 1 source: url: https://download.gnome.org/sources/libxml2/{{ version.rsplit('.', 1)[0] }}/libxml2-{{ version }}.tar.xz diff --git a/recipes/flet-libxslt/meta.yaml b/recipes/flet-libxslt/meta.yaml index 20e756df..8a29b831 100755 --- a/recipes/flet-libxslt/meta.yaml +++ b/recipes/flet-libxslt/meta.yaml @@ -8,7 +8,7 @@ # {% set libxml2_version = "2.9.8" %} # {% set patch = "mobile-1.1.32.patch" %} # {% else %} -# {% set libxml2_version = "2.15.3" %} +# {% set libxml2_version = "2.15.4" %} # {% set patch = "mobile-1.1.45.patch" %} # {% endif %} @@ -17,7 +17,7 @@ package: version: '{{ version }}' build: - number: 11 + number: 12 source: url: https://download.gnome.org/sources/libxslt/{{ version.rsplit('.', 1)[0] }}/libxslt-{{ version }}.tar.xz diff --git a/recipes/flet-libzbar/meta.yaml b/recipes/flet-libzbar/meta.yaml index 64525d73..4cf38bd7 100644 --- a/recipes/flet-libzbar/meta.yaml +++ b/recipes/flet-libzbar/meta.yaml @@ -1,4 +1,5 @@ {% set version = "0.23.93" %} +# Hold: 0.23.95 replaced autotools with meson, which build.sh does not drive. package: name: flet-libzbar @@ -11,7 +12,7 @@ source: url: https://github.com/mchehab/zbar/archive/refs/tags/{{ version }}.tar.gz build: - number: 2 + number: 3 # zbar's GitHub archive ships only configure.ac, so build.sh runs autoreconf — # which needs autotools + gettext/autopoint on the build host. before_all: @@ -27,7 +28,7 @@ requirements: host: # zbar's QR decoder #includes unconditionally; Android bionic has # no iconv at API 24, so provide the static GNU libiconv to compile + link. - - flet-libiconv 1.17 + - flet-libiconv 1.19.1 # {% endif %} about: diff --git a/recipes/gdal/meta.yaml b/recipes/gdal/meta.yaml index 2fe1bc55..555b44a4 100644 --- a/recipes/gdal/meta.yaml +++ b/recipes/gdal/meta.yaml @@ -4,11 +4,11 @@ package: # bindings hard-require an exact major.minor match with libgdal — # any bump here must come with flet-libgdal bumped to the same # version, plus fiona / rasterio / pyogrio re-pinned in lockstep. - version: "3.13.1" + version: "3.13.3" requirements: host: - - flet-libgdal 3.13.1 + - flet-libgdal 3.13.3 # {% if sdk == 'android' %} # libgdal links C++; the SWIG-generated _gdal.so loads via dlopen which # needs libc++_shared.so on Android. @@ -16,13 +16,13 @@ requirements: # {% else %} # iOS-only — see GDAL_LIBS comment below for the rationale. - openssl >=3.0.15 - - flet-libjpeg 3.0.90 + - flet-libjpeg 3.2.1 # {% endif %} build: number: 1 script_env: - GDAL_VERSION: 3.13.1 + GDAL_VERSION: 3.13.3 GDAL_PREFIX: '{platlib}/opt' GDAL_CFLAGS: '' # {% if sdk != 'android' %} diff --git a/recipes/google-crc32c/meta.yaml b/recipes/google-crc32c/meta.yaml index 06cee9b9..374eadc1 100644 --- a/recipes/google-crc32c/meta.yaml +++ b/recipes/google-crc32c/meta.yaml @@ -1,6 +1,6 @@ package: name: google-crc32c - version: "1.8.0" + version: "1.9.0" requirements: host: diff --git a/recipes/greenlet/meta.yaml b/recipes/greenlet/meta.yaml index 335cb351..41c57945 100644 --- a/recipes/greenlet/meta.yaml +++ b/recipes/greenlet/meta.yaml @@ -1,6 +1,6 @@ package: name: greenlet - version: "3.5.1" + version: "3.5.6" # {% if sdk == 'android' %} requirements: diff --git a/recipes/grpcio/meta.yaml b/recipes/grpcio/meta.yaml index 66fabaf1..b73a18b8 100644 --- a/recipes/grpcio/meta.yaml +++ b/recipes/grpcio/meta.yaml @@ -1,6 +1,6 @@ package: name: grpcio - version: "1.81.0" + version: "1.85.1" build: number: 1 diff --git a/recipes/grpcio/patches/mobile.patch b/recipes/grpcio/patches/mobile.patch index 89c6c1ac..da78f9f5 100644 --- a/recipes/grpcio/patches/mobile.patch +++ b/recipes/grpcio/patches/mobile.patch @@ -1,8 +1,8 @@ ---- a/setup.py 2026-03-31 12:55:12 -+++ b/setup.py 2026-03-31 12:56:03 +--- a/setup.py ++++ b/setup.py @@ -58,12 +58,14 @@ - os.path.join("third_party", "cares"), - os.path.join("third_party", "cares", "cares"), + os.path.join("third_party", "cares", "cares", "src", "lib", "include"), + os.path.join("third_party", "cares", "cares", "src", "lib"), ) -if "darwin" in sys.platform: +if "darwin" in sys.platform or "ios" in sys.platform: @@ -16,10 +16,10 @@ if "openbsd" in sys.platform: CARES_INCLUDE += (os.path.join("third_party", "cares", "config_openbsd"),) RE2_INCLUDE = (os.path.join("third_party", "re2"),) -@@ -302,7 +304,9 @@ +@@ -345,7 +347,9 @@ + CORE_C_FILES = filter( lambda x: "third_party/boringssl" not in x, CORE_C_FILES ) - CORE_C_FILES = filter(lambda x: "src/boringssl" not in x, CORE_C_FILES) - SSL_INCLUDE = (os.path.join("/usr", "include", "openssl"),) + # Use cross-compiled OpenSSL headers when OPENSSL_ROOT_DIR is set + _ssl_prefix = os.environ.get("OPENSSL_ROOT_DIR", "/usr") @@ -27,7 +27,7 @@ if BUILD_WITH_SYSTEM_ZLIB: CORE_C_FILES = filter(lambda x: "third_party/zlib" not in x, CORE_C_FILES) -@@ -329,14 +333,17 @@ +@@ -372,16 +376,19 @@ + ADDRESS_SORTING_INCLUDE + CARES_INCLUDE + RE2_INCLUDE @@ -37,13 +37,15 @@ + UPBDEFS_GRPC_GENERATED_INCLUDE + UTF8_RANGE_INCLUDE + XXHASH_INCLUDE + + CEL_C_INCLUDE - + ZLIB_INCLUDE ) -+ + +# On Android, SSL_INCLUDE uses OPENSSL_ROOT_DIR; skip ZLIB_INCLUDE to avoid /usr/include +EXTENSION_INCLUDE_DIRECTORIES += SSL_INCLUDE +if "android" not in sys.platform: + EXTENSION_INCLUDE_DIRECTORIES += ZLIB_INCLUDE - ++ EXTENSION_LIBRARIES = () if "linux" in sys.platform: + EXTENSION_LIBRARIES += ("rt",) diff --git a/recipes/jq/meta.yaml b/recipes/jq/meta.yaml index 5514ef1d..ce1e5d95 100644 --- a/recipes/jq/meta.yaml +++ b/recipes/jq/meta.yaml @@ -1,6 +1,6 @@ package: name: jq - version: "1.11.0" + version: "1.13.0" requirements: # host_build (not host): flet-libjq's static archives are linked INTO the jq @@ -8,10 +8,10 @@ requirements: # libjq.so would collide with the `jq` extension's own jniLibs name on Android # (see recipes/jq/patches/mobile.patch and recipes/flet-libjq/build.sh). host_build: - - flet-libjq 1.7.1 + - flet-libjq 1.8.2 build: - number: 2 + number: 1 script_env: JQPY_USE_SYSTEM_LIBS: 1 diff --git a/recipes/kiwisolver/meta.yaml b/recipes/kiwisolver/meta.yaml index ef06ce93..751906dd 100644 --- a/recipes/kiwisolver/meta.yaml +++ b/recipes/kiwisolver/meta.yaml @@ -3,10 +3,10 @@ package: version: "1.5.1" build: - number: 1 + number: 2 # {% if sdk == 'android' %} requirements: host: - - flet-libcpp-shared 27.2.12479018 + - flet-libcpp-shared >=27.2.12479018 # {% endif %} \ No newline at end of file diff --git a/recipes/lxml/meta.yaml b/recipes/lxml/meta.yaml index fd40fde1..b032345a 100644 --- a/recipes/lxml/meta.yaml +++ b/recipes/lxml/meta.yaml @@ -1,9 +1,9 @@ -# {% set version = "6.1.1" %} +# {% set version = "6.1.3" %} # {% if version.startswith('5.') %} # {% set libxml2_version = "2.9.8" %} # {% set libxslt_version = "1.1.32" %} # {% else %} -# {% set libxml2_version = "2.15.3" %} +# {% set libxml2_version = "2.15.4" %} # {% set libxslt_version = "1.1.45" %} # {% endif %} diff --git a/recipes/matplotlib/meta.yaml b/recipes/matplotlib/meta.yaml index a1e9cab4..b15a55bb 100644 --- a/recipes/matplotlib/meta.yaml +++ b/recipes/matplotlib/meta.yaml @@ -1,6 +1,6 @@ package: name: matplotlib - version: "3.10.9" + version: "3.11.2" requirements: build: @@ -9,13 +9,13 @@ requirements: host: - numpy ^2.0.0 - pybind11 - - flet-libjpeg 3.0.90 + - flet-libjpeg 3.2.1 # {% if sdk == 'android' %} - flet-libcpp-shared >=27.2.12479018 # {% endif %} build: - number: 2 + number: 1 # {% if sdk == 'android' and arch in ['armeabi-v7a', 'x86'] %} script_env: CPPFLAGS: -Wno-c++11-narrowing diff --git a/recipes/msgspec/meta.yaml b/recipes/msgspec/meta.yaml index bd866bc4..2aed1318 100644 --- a/recipes/msgspec/meta.yaml +++ b/recipes/msgspec/meta.yaml @@ -1,6 +1,6 @@ package: name: msgspec - version: "0.21.1" + version: "0.22.0" build: number: 1 diff --git a/recipes/murmurhash/meta.yaml b/recipes/murmurhash/meta.yaml index 11ba0fa0..82f453be 100644 --- a/recipes/murmurhash/meta.yaml +++ b/recipes/murmurhash/meta.yaml @@ -1,6 +1,6 @@ package: name: murmurhash - version: "1.0.15" + version: "1.0.16" build: number: 1 diff --git a/recipes/numpy/meta.yaml b/recipes/numpy/meta.yaml index 94a67578..8b597de9 100644 --- a/recipes/numpy/meta.yaml +++ b/recipes/numpy/meta.yaml @@ -3,7 +3,7 @@ package: name: numpy - version: "2.4.6" + version: "2.5.4" requirements: build: diff --git a/recipes/onnxruntime/meta.yaml b/recipes/onnxruntime/meta.yaml index 7279d65a..81e17ca8 100644 --- a/recipes/onnxruntime/meta.yaml +++ b/recipes/onnxruntime/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.27.0" %} +{% set version = "1.32.0" %} package: name: onnxruntime @@ -11,7 +11,7 @@ package: - armeabi-v7a build: - number: 2 + number: 1 script_env: _PYTHON_SYSCONFIGDATA_NAME: '{sysconfigdata_name}' # Consumed by the patch-added PEP 517 shim (_forge/forge_ort_backend.py), diff --git a/recipes/onnxruntime/patches/mobile.patch b/recipes/onnxruntime/patches/mobile.patch index c46a72ba..3c6e0d7c 100644 --- a/recipes/onnxruntime/patches/mobile.patch +++ b/recipes/onnxruntime/patches/mobile.patch @@ -139,7 +139,7 @@ diff -ruN a/pyproject.toml b/pyproject.toml +++ b/pyproject.toml 2026-07-08 18:23:09 @@ -1,6 +1,7 @@ [build-system] - requires = ["setuptools>=61.0.0", "wheel", "packaging"] + requires = ["setuptools>=84.2.1", "wheel", "packaging"] -build-backend = "setuptools.build_meta" +build-backend = "forge_ort_backend" +backend-path = ["_forge"] diff --git a/recipes/oracledb/meta.yaml b/recipes/oracledb/meta.yaml index 1746577a..d076d811 100644 --- a/recipes/oracledb/meta.yaml +++ b/recipes/oracledb/meta.yaml @@ -1,6 +1,6 @@ package: name: oracledb - version: "4.0.1" + version: "26.1.0" build: number: 1 diff --git a/recipes/orjson/meta.yaml b/recipes/orjson/meta.yaml index e7443f6e..e84e64a3 100644 --- a/recipes/orjson/meta.yaml +++ b/recipes/orjson/meta.yaml @@ -1,8 +1,8 @@ package: name: orjson - version: "3.11.9" + version: "3.13.0" build: - number: 10 + number: 1 script_env: _PYTHON_SYSCONFIGDATA_NAME: '{sysconfigdata_name}' diff --git a/recipes/ormsgpack/meta.yaml b/recipes/ormsgpack/meta.yaml index d1d56457..7337822c 100644 --- a/recipes/ormsgpack/meta.yaml +++ b/recipes/ormsgpack/meta.yaml @@ -1,6 +1,6 @@ package: name: ormsgpack - version: "1.12.2" + version: "1.13.1" build: number: 1 diff --git a/recipes/pandas/meta.yaml b/recipes/pandas/meta.yaml index 8ba4e2fc..ca48f0f8 100644 --- a/recipes/pandas/meta.yaml +++ b/recipes/pandas/meta.yaml @@ -1,6 +1,6 @@ package: name: pandas - version: "3.0.3" + version: "3.1.1" # {% if not version or version >= (2,1) %} # pandas >= 2.1.0 @@ -12,7 +12,7 @@ requirements: host: - numpy ^2.0.0 # {% if sdk == 'android' %} - - flet-libcpp-shared 27.2.12479018 + - flet-libcpp-shared >=27.2.12479018 # {% endif %} patches: diff --git a/recipes/pendulum/meta.yaml b/recipes/pendulum/meta.yaml index e2c66e4b..6c3e0d4a 100644 --- a/recipes/pendulum/meta.yaml +++ b/recipes/pendulum/meta.yaml @@ -1,6 +1,6 @@ package: name: pendulum - version: "3.2.0" + version: "3.3.0" build: number: 1 diff --git a/recipes/pillow/meta.yaml b/recipes/pillow/meta.yaml index 0e3a203a..eca4ab8e 100644 --- a/recipes/pillow/meta.yaml +++ b/recipes/pillow/meta.yaml @@ -14,16 +14,16 @@ requirements: # carry as DT_NEEDED, and flet stages it into jniLibs. # {% if sdk == 'android' %} host: - - flet-libjpeg 3.0.90 - - flet-libfreetype 2.13.3 + - flet-libjpeg 3.2.1 + - flet-libfreetype 2.15.0 - flet-libwebp 1.6.0 - - flet-libtiff 4.7.0 + - flet-libtiff 4.7.2 # {% else %} host_build: - - flet-libjpeg 3.0.90 - - flet-libfreetype 2.13.3 + - flet-libjpeg 3.2.1 + - flet-libfreetype 2.15.0 - flet-libwebp 1.6.0 - - flet-libtiff 4.7.0 + - flet-libtiff 4.7.2 # {% endif %} # {% if not version or version >= (13,0,0) %} @@ -50,7 +50,7 @@ patches: # {% endif %} build: - number: 1 + number: 2 script_env: # {% if sdk == 'android' %} # pillow's setup.py manually probes `self.compiler.{include,library}_dirs` diff --git a/recipes/preshed/meta.yaml b/recipes/preshed/meta.yaml index 59da9708..02b1583f 100644 --- a/recipes/preshed/meta.yaml +++ b/recipes/preshed/meta.yaml @@ -1,6 +1,6 @@ package: name: preshed - version: "3.0.13" + version: "3.0.15" build: diff --git a/recipes/primp/meta.yaml b/recipes/primp/meta.yaml index e153a72a..9f50b878 100644 --- a/recipes/primp/meta.yaml +++ b/recipes/primp/meta.yaml @@ -1,9 +1,11 @@ package: name: primp - version: "1.3.1" + version: "2.0.1" build: - number: 11 + number: 1 patches: - mobile.patch + - armv7-atomic.patch + - no-abi3.patch diff --git a/recipes/primp/patches/armv7-atomic.patch b/recipes/primp/patches/armv7-atomic.patch new file mode 100644 index 00000000..d3ba9ad9 --- /dev/null +++ b/recipes/primp/patches/armv7-atomic.patch @@ -0,0 +1,31 @@ +Take AtomicU64 from portable-atomic so primp builds for armeabi-v7a. + +2.0's HTTP/2 connection pool (crates/primp/src/async_impl/h2_client/pool.rs) +uses std::sync::atomic::AtomicU64, which the 32-bit ARM Android target lacks +(E0432). portable-atomic (already in Cargo.lock) supplies a fallback with the +same API; Ordering stays from std. Same fix as uuid-utils and tokenizers. + +diff --git a/crates/primp/Cargo.toml b/crates/primp/Cargo.toml +--- a/crates/primp/Cargo.toml ++++ b/crates/primp/Cargo.toml +@@ -75,6 +75,7 @@ + serde_json = { version = "1.0", optional = true } + mime_guess = { version = "2.0", default-features = false, optional = true } + rand = "0.10" ++portable-atomic = "1" + foldhash = "0.2" + encoding_rs = { version = "0.8", optional = true } + http-body = "1" +diff --git a/crates/primp/src/async_impl/h2_client/pool.rs b/crates/primp/src/async_impl/h2_client/pool.rs +--- a/crates/primp/src/async_impl/h2_client/pool.rs ++++ b/crates/primp/src/async_impl/h2_client/pool.rs +@@ -2,7 +2,8 @@ + + use foldhash::{HashMap, HashMapExt}; + use std::pin::Pin; +-use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering}; ++use portable_atomic::AtomicU64; ++use std::sync::atomic::{AtomicUsize, Ordering}; + use std::sync::{Arc, Mutex}; + use std::task::{Context, Poll}; + use std::time::{Duration, Instant}; diff --git a/recipes/primp/patches/no-abi3.patch b/recipes/primp/patches/no-abi3.patch new file mode 100644 index 00000000..49e1c929 --- /dev/null +++ b/recipes/primp/patches/no-abi3.patch @@ -0,0 +1,18 @@ +Build a per-version extension instead of abi3. + +With PyO3's abi3-py310 feature, iOS extensions link against `-lpython3.10`, +which no iOS Python tree has ("ld: library 'python3.10' not found"). Drop it so +each wheel links its own libpython. Same fix as uuid-utils and tokenizers. + +diff --git a/crates/primp-python/Cargo.toml b/crates/primp-python/Cargo.toml +--- a/crates/primp-python/Cargo.toml ++++ b/crates/primp-python/Cargo.toml +@@ -15,7 +15,7 @@ + doc = false + + [dependencies] +-pyo3 = { version = "0.29", features = ["abi3-py310", "indexmap", "anyhow", "multiple-pymethods"] } ++pyo3 = { version = "0.29", features = ["indexmap", "anyhow", "multiple-pymethods"] } + pyo3-async-runtimes = { version = "0.29", features = ["tokio-runtime"] } + anyhow = "1.0.104" + tracing = { version = "0.1.41", features = ["log-always"] } diff --git a/recipes/protobuf/meta.yaml b/recipes/protobuf/meta.yaml index 45ff825d..8f9fc243 100644 --- a/recipes/protobuf/meta.yaml +++ b/recipes/protobuf/meta.yaml @@ -1,6 +1,6 @@ package: name: protobuf - version: "7.35.0" + version: "7.36.2" build: number: 1 diff --git a/recipes/psycopg2/meta.yaml b/recipes/psycopg2/meta.yaml index c0a3c853..324a3e38 100644 --- a/recipes/psycopg2/meta.yaml +++ b/recipes/psycopg2/meta.yaml @@ -1,6 +1,6 @@ package: name: psycopg2 - version: "2.9.12" + version: "2.9.13" build: number: 1 @@ -22,7 +22,7 @@ requirements: # build-time-only dependency. host_build extracts it for the link without # adding it to the wheel's Requires-Dist, so a psycopg2 app does not bundle # the (unused) flet-libpq wheel at runtime. - - flet-libpq 17.5 + - flet-libpq 17.12 patches: - mobile.patch diff --git a/recipes/pyarrow/meta.yaml b/recipes/pyarrow/meta.yaml index bb444feb..dbd0609c 100644 --- a/recipes/pyarrow/meta.yaml +++ b/recipes/pyarrow/meta.yaml @@ -1,6 +1,6 @@ package: name: pyarrow - version: "24.0.0" + version: "26.0.1" # Arrow's CMake configs carry a 32/64-bit gate (ArrowConfigVersion.cmake: # PACKAGE_VERSION_UNSUITABLE unless sizeof(void*)==8), so a 64-bit flet-libarrow # cannot be consumed by a 32-bit pyarrow. Drop armeabi-v7a — the only shipped @@ -15,7 +15,7 @@ package: # x86_64 -> x86 and arm64/arm64-v8a -> aarch64 covers every shipped slice. # {% set arrow_cpu = 'x86' if 'x86' in arch else 'aarch64' %} build: - number: 2 + number: 1 script_env: # Belt-and-suspenders: hard-lock every OPTIONAL component OFF regardless of # what the flet-libarrow Arrow C++ build enables. pyarrow's define_option macro @@ -103,7 +103,7 @@ requirements: # CDLLs them before importing pyarrow.lib so the ext modules' @rpath link binds # by install-name. (host_build would NOT ship the wheel -> dylibs never reach # jniLibs/.fwork, which is why the old iOS bundle approach was needed and failed.) - - flet-libarrow ==24.0.0 + - flet-libarrow ==26.0.1 # {% if sdk == 'android' %} # pyarrow's + libarrow's .so are C++ -> need libc++_shared.so at runtime # (iOS uses the system libc++, no flet-lib needed). diff --git a/recipes/pycares/examples/dns-lookup/pyproject.toml b/recipes/pycares/examples/dns-lookup/pyproject.toml index 70598bc8..cb9bc76b 100644 --- a/recipes/pycares/examples/dns-lookup/pyproject.toml +++ b/recipes/pycares/examples/dns-lookup/pyproject.toml @@ -7,7 +7,7 @@ requires-python = ">=3.12" dependencies = [ "flet==0.86.5", "aiodns==4.0.4", - "pycares==5.0.1", + "pycares==5.2.1", ] [dependency-groups] diff --git a/recipes/pycares/meta.yaml b/recipes/pycares/meta.yaml index c0870d9e..cab76d7a 100644 --- a/recipes/pycares/meta.yaml +++ b/recipes/pycares/meta.yaml @@ -1,6 +1,6 @@ package: name: pycares - version: "5.0.1" + version: "5.2.1" build: number: 1 diff --git a/recipes/pycryptodome/meta.yaml b/recipes/pycryptodome/meta.yaml index 2bca12ef..1aea6f52 100644 --- a/recipes/pycryptodome/meta.yaml +++ b/recipes/pycryptodome/meta.yaml @@ -1,9 +1,9 @@ package: name: pycryptodome - version: "3.23.0" + version: "4.4.0" build: - number: 2 + number: 1 # pycryptodome's internal Crypto/Util/_raw_api.py tries a cffi-based # fast path first, and only falls back to ctypes.pythonapi.PyObject_GetBuffer diff --git a/recipes/pycryptodome/patches/mobile.patch b/recipes/pycryptodome/patches/mobile.patch index da6cc938..24385b7a 100644 --- a/recipes/pycryptodome/patches/mobile.patch +++ b/recipes/pycryptodome/patches/mobile.patch @@ -2,7 +2,7 @@ pycryptodome's native modules are ctypes-loaded (not imported) by Crypto/Util/_raw_api.py:load_pycryptodome_raw_lib, which probes os.path.isfile() for the .so next to the package's __file__. This patch makes that work on mobile: -1. setup.py: add install_requires=['cffi']. Upstream declares none, so pip does +1. pyproject.toml: add dependencies = ["cffi"]. Upstream declares none, so pip does not pull cffi and _raw_api falls back to ctypes.pythonapi.PyObject_GetBuffer, which fails on Android ("undefined symbol: PyObject_GetBuffer" — Flet loads libpython with RTLD_LOCAL). See recipes/pycryptodome/meta.yaml. @@ -15,18 +15,17 @@ for the .so next to the package's __file__. This patch makes that work on mobile the APK's jniLibs and left a `.soref` marker resolved by a sys.meta_path finder. Ask importlib for the resolved on-device origin and dlopen it. -diff --git a/lib/Crypto/Util/_raw_api.py b/lib/Crypto/Util/_raw_api.py --- a/lib/Crypto/Util/_raw_api.py +++ b/lib/Crypto/Util/_raw_api.py -@@ -30,6 +30,7 @@ - - import os +@@ -33,6 +33,7 @@ + import _thread import abc + import os +import pathlib import sys - from Crypto.Util.py3compat import byte_string - from Crypto.Util._file_system import pycryptodome_filename -@@ -302,16 +303,34 @@ + import threading + import weakref +@@ -501,16 +502,34 @@ split = name.split(".") dir_comps, basename = split[:-1], split[-1] attempts = [] @@ -60,18 +59,17 @@ diff --git a/lib/Crypto/Util/_raw_api.py b/lib/Crypto/Util/_raw_api.py + except OSError as exp: + attempts.append("Cannot load '%s': %s" % (spec.origin, str(exp))) raise OSError("Cannot load native module '%s': %s" % (name, ", ".join(attempts))) - - -diff --git a/setup.py b/setup.py ---- a/setup.py -+++ b/setup.py -@@ -523,6 +523,9 @@ - platforms='Posix; MacOS X; Windows', - zip_safe=False, - python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, !=3.6.*', -+ # Mobile: cffi is needed at runtime to avoid the broken -+ # ctypes.pythonapi.PyObject_GetBuffer path. See recipes/pycryptodome/meta.yaml. -+ install_requires=['cffi'], - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'License :: OSI Approved :: BSD License', + + +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -15,6 +15,9 @@ + license = "BSD-2-Clause AND Unlicense AND MIT" + license-files = ["LICENSE.rst", "src/mldsa-native/LICENSE", "src/mlkem-native/LICENSE"] + requires-python = ">=3.9" ++# Mobile: cffi is needed at runtime to avoid the broken ++# ctypes.pythonapi.PyObject_GetBuffer path. See recipes/pycryptodome/meta.yaml. ++dependencies = ["cffi"] + classifiers = [ + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", diff --git a/recipes/pycryptodomex/meta.yaml b/recipes/pycryptodomex/meta.yaml index 958a500e..22f22157 100644 --- a/recipes/pycryptodomex/meta.yaml +++ b/recipes/pycryptodomex/meta.yaml @@ -1,9 +1,9 @@ package: name: pycryptodomex - version: "3.23.0" + version: "3.24.2" build: - number: 2 + number: 1 # Same fix rationale as recipes/pycryptodome/meta.yaml — pycryptodomex is # the sister package (same code under `Cryptodome.*` namespace). Without diff --git a/recipes/pymongo/meta.yaml b/recipes/pymongo/meta.yaml index 52049bc6..5dc23a72 100644 --- a/recipes/pymongo/meta.yaml +++ b/recipes/pymongo/meta.yaml @@ -1,6 +1,6 @@ package: name: pymongo - version: "4.17.0" + version: "4.20.0" build: - number: 2 + number: 1 diff --git a/recipes/pymssql/meta.yaml b/recipes/pymssql/meta.yaml index c3e7fe15..d1b25903 100644 --- a/recipes/pymssql/meta.yaml +++ b/recipes/pymssql/meta.yaml @@ -1,6 +1,6 @@ package: name: pymssql - version: "2.3.13" + version: "2.4.6" build: number: 1 @@ -18,5 +18,5 @@ build: requirements: host: - - flet-libfreetds 1.4.27 + - flet-libfreetds 1.5.21 - openssl ^3.0.12 diff --git a/recipes/pynacl/meta.yaml b/recipes/pynacl/meta.yaml index 1ac94062..9d98f905 100644 --- a/recipes/pynacl/meta.yaml +++ b/recipes/pynacl/meta.yaml @@ -3,11 +3,11 @@ package: version: "1.6.2" build: - number: 1 + number: 2 requirements: host: - - flet-libsodium 1.0.20 + - flet-libsodium 1.0.22 patches: - mobile.patch \ No newline at end of file diff --git a/recipes/pyogrio/meta.yaml b/recipes/pyogrio/meta.yaml index 9ac99b33..a35f3815 100644 --- a/recipes/pyogrio/meta.yaml +++ b/recipes/pyogrio/meta.yaml @@ -1,20 +1,20 @@ package: name: pyogrio - version: "0.12.1" + version: "0.13.0" requirements: host: - - flet-libgdal 3.13.1 + - flet-libgdal 3.13.3 # {% if sdk != 'android' %} # iOS-only — see GDAL_LIBS comment below for the rationale. - openssl >=3.0.15 - - flet-libjpeg 3.0.90 + - flet-libjpeg 3.2.1 # {% endif %} build: number: 1 script_env: - GDAL_VERSION: 3.13.1 + GDAL_VERSION: 3.13.3 GDAL_LIBRARY_PATH: '{platlib}/opt/lib' GDAL_INCLUDE_PATH: '{platlib}/opt/include' # {% if sdk != 'android' %} diff --git a/recipes/pyproj/meta.yaml b/recipes/pyproj/meta.yaml index 3e2d643c..5a69b7e6 100644 --- a/recipes/pyproj/meta.yaml +++ b/recipes/pyproj/meta.yaml @@ -1,6 +1,6 @@ package: name: pyproj - version: "3.7.2" + version: "3.8.0" build: number: 1 @@ -30,11 +30,11 @@ build: requirements: host: - - flet-libproj 9.5.0 + - flet-libproj 9.9.0 # {% if sdk != 'android' %} # iOS-only — see PROJ_LIBS comment above for the rationale. - openssl >=3.0.15 - - flet-libjpeg 3.0.90 + - flet-libjpeg 3.2.1 # {% endif %} patches: diff --git a/recipes/pysodium/meta.yaml b/recipes/pysodium/meta.yaml index b4f6e098..b5a1bf31 100644 --- a/recipes/pysodium/meta.yaml +++ b/recipes/pysodium/meta.yaml @@ -1,13 +1,13 @@ package: name: pysodium - version: "0.7.18" + version: "0.7.19" build: - number: 11 + number: 1 patches: - mobile.patch requirements: host: - - flet-libsodium 1.0.20 \ No newline at end of file + - flet-libsodium 1.0.22 \ No newline at end of file diff --git a/recipes/python-magic/meta.yaml b/recipes/python-magic/meta.yaml index 2feaab9a..ef346baf 100644 --- a/recipes/python-magic/meta.yaml +++ b/recipes/python-magic/meta.yaml @@ -3,7 +3,7 @@ package: version: "0.4.27" build: - number: 2 + number: 3 script_env: # flet-libmagic (the host dep below) installs the compiled magic database # into the cross-env at opt/share/misc/magic.mgc. Hand setup.py that path so @@ -18,7 +18,7 @@ requirements: # runtime (loader + magic-db patched by mobile.patch). Ship libmagic (the .so # it dlopens) and, via FLET_MAGIC_MGC above, its magic.mgc database; fix_wheel # turns this into a Requires-Dist so pip pulls the platform .so. - - flet-libmagic 5.46 + - flet-libmagic 5.48 patches: - mobile.patch diff --git a/recipes/pywavelets/meta.yaml b/recipes/pywavelets/meta.yaml index 2f5533fb..00309e50 100644 --- a/recipes/pywavelets/meta.yaml +++ b/recipes/pywavelets/meta.yaml @@ -1,6 +1,6 @@ package: name: pywavelets - version: "1.9.0" + version: "1.10.0" build: number: 1 diff --git a/recipes/rapidfuzz/meta.yaml b/recipes/rapidfuzz/meta.yaml index e89fa290..7a5d4b8c 100644 --- a/recipes/rapidfuzz/meta.yaml +++ b/recipes/rapidfuzz/meta.yaml @@ -1,6 +1,6 @@ package: name: rapidfuzz - version: "3.14.5" + version: "3.14.6" build: number: 1 diff --git a/recipes/rasterio/meta.yaml b/recipes/rasterio/meta.yaml index 21095cad..806ae06f 100644 --- a/recipes/rasterio/meta.yaml +++ b/recipes/rasterio/meta.yaml @@ -1,10 +1,10 @@ package: name: rasterio - version: "1.5.0" + version: "1.5.2" requirements: host: - - flet-libgdal 3.13.1 + - flet-libgdal 3.13.3 - numpy ^2.0.0 # {% if sdk == 'android' %} # rasterio's `_warp.so` / `_filepath.so` / `_fill.so` carry @@ -13,19 +13,13 @@ requirements: # {% else %} # iOS-only — see GDAL_LIBS comment below for the rationale. - openssl >=3.0.15 - - flet-libjpeg 3.0.90 + - flet-libjpeg 3.2.1 # {% endif %} build: - # Same source version as pypi.flet.dev's rasterio-1.5.0-10 wheel, but - # this rebuild links against flet-libgdal 3.13.1 (vs. the published - # wheel's 3.10.0). pip's wheel selection picks the higher build_tag - # per PEP 427 when name+version collide; the new wheel must outrank - # build 10 or downstream installs would silently keep the old - # libgdal-3.10-linked rasterio and the gdal chain bump would be invisible. - number: 11 + number: 1 script_env: - GDAL_VERSION: 3.13.1 + GDAL_VERSION: 3.13.3 GDAL_LIB_PATH: '{platlib}/opt/lib' GDAL_INCLUDE_PATH: '{platlib}/opt/include' # {% if sdk == 'android' %} diff --git a/recipes/regex/meta.yaml b/recipes/regex/meta.yaml index 70f9ce15..d0e28cb5 100644 --- a/recipes/regex/meta.yaml +++ b/recipes/regex/meta.yaml @@ -1,6 +1,6 @@ package: name: regex - version: "2026.5.9" + version: "2026.11.9" build: number: 1 diff --git a/recipes/rpds-py/meta.yaml b/recipes/rpds-py/meta.yaml index d85c0fa1..2efba180 100644 --- a/recipes/rpds-py/meta.yaml +++ b/recipes/rpds-py/meta.yaml @@ -1,6 +1,6 @@ package: name: rpds-py - version: "2026.5.1" + version: "2026.9.1" build: number: 1 diff --git a/recipes/scikit-learn/meta.yaml b/recipes/scikit-learn/meta.yaml index 366c0065..c63a14e8 100644 --- a/recipes/scikit-learn/meta.yaml +++ b/recipes/scikit-learn/meta.yaml @@ -1,9 +1,9 @@ package: name: scikit-learn - version: "1.9.0" + version: "1.9.1" build: - number: 2 + number: 1 backend-args: # scikit-learn borrows BLAS via scipy.linalg.cython_blas (no external BLAS # link, no Fortran); OpenMP is optional (required:false → single-threaded). @@ -27,7 +27,6 @@ requirements: # {% endif %} patches: - - relax-scipy-build-cap.patch - disable-openmp-non-android.patch # scikit-learn reads sklearn/utils/_repr_html/estimator.css via __file__ at import. diff --git a/recipes/scikit-learn/patches/relax-scipy-build-cap.patch b/recipes/scikit-learn/patches/relax-scipy-build-cap.patch deleted file mode 100644 index f9fe3bf4..00000000 --- a/recipes/scikit-learn/patches/relax-scipy-build-cap.patch +++ /dev/null @@ -1,16 +0,0 @@ -# scikit-learn 1.9.0 pins its build-time scipy to <1.18.0 — a conservative upper -# bound set before scipy 1.18 was released, not a real incompatibility. mobile-forge -# ships scipy 1.18.0; without this the build env would install an older desktop scipy -# whose cython_blas.pxd could diverge from the 1.18.0 the target links against. -# Bump the cap to <1.19.0 so both use 1.18. ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -102,7 +102,7 @@ - "meson-python>=0.17.1,<0.20.0", - "cython>=3.1.2,<3.3.0", - "numpy>=2,<2.5.0", -- "scipy>=1.10.0,<1.18.0", -+ "scipy>=1.10.0,<1.19.0", - ] - - [tool.pytest.ini_options] diff --git a/recipes/scipy/meta.yaml b/recipes/scipy/meta.yaml index d65000a4..88567c80 100644 --- a/recipes/scipy/meta.yaml +++ b/recipes/scipy/meta.yaml @@ -1,6 +1,6 @@ package: name: scipy - version: "1.18.0" + version: "1.18.1" requirements: build: @@ -8,10 +8,13 @@ requirements: - meson - cython - pythran + host_build: + # A static libopenblas.a linked into the extensions; under host it became a + # runtime Requires-Dist and every scipy app downloaded ~17 MB it never loads. + - flet-libopenblas 0.3.34 host: - numpy 2.4.6 - pybind11 - - flet-libopenblas 0.3.33 # {% if sdk == 'android' %} - flet-libcpp-shared >=27.2.12479018 # {% endif %} diff --git a/recipes/selectolax/meta.yaml b/recipes/selectolax/meta.yaml index 645ce068..cdc14f29 100644 --- a/recipes/selectolax/meta.yaml +++ b/recipes/selectolax/meta.yaml @@ -1,9 +1,6 @@ package: name: selectolax - version: "0.4.10" + version: "1.0.2" build: - number: 11 - -patches: - - mobile.patch + number: 1 diff --git a/recipes/selectolax/patches/mobile.patch b/recipes/selectolax/patches/mobile.patch deleted file mode 100644 index 6465ccd2..00000000 --- a/recipes/selectolax/patches/mobile.patch +++ /dev/null @@ -1,22 +0,0 @@ -selectolax/__init__.py imports the `modest` submodule (`from . import lexbor, -modest, parser`), but `selectolax/modest/` is only a directory of Cython `.pxi` -include files, compiled into parser.cpython-*.so at build time (parser.pyx does -`include "modest/*.pxi"`). There is no runtime `modest` module. Under normal -CPython `from . import modest` resolves as an empty PEP 420 namespace package; -under Flet 0.86 Android, site-packages ship as `sitepackages.zip` and -serious-python only synthesizes an `__init__` for dirs that have an importable -member (`.py`/`.pyc`/`.soref`), so the include-only `modest/` is invisible to -zipimport and the import fails with "cannot import name 'modest' from partially -initialized module 'selectolax'". Drop the vestigial import — `selectolax.modest` -carries no runtime API; the engines are `selectolax.parser` (Modest backend) and -`selectolax.lexbor`, both unaffected. - -diff --git a/selectolax/__init__.py b/selectolax/__init__.py ---- a/selectolax/__init__.py -+++ b/selectolax/__init__.py -@@ -5,4 +5,4 @@ - __email__ = "me@rushter.com" - __version__ = "0.4.10" - --from . import lexbor, modest, parser -+from . import lexbor, parser diff --git a/recipes/selectolax/tests/test_selectolax.py b/recipes/selectolax/tests/test_selectolax.py index a7e6f17e..f3f9d619 100644 --- a/recipes/selectolax/tests/test_selectolax.py +++ b/recipes/selectolax/tests/test_selectolax.py @@ -1,12 +1,3 @@ -def test_modest_parser(): - """Parse HTML + CSS-select with the Modest engine.""" - from selectolax.parser import HTMLParser - - tree = HTMLParser("

hello

world

") - nodes = tree.css("p.x") - assert [n.text() for n in nodes] == ["hello", "world"] - - def test_lexbor_parser(): """Parse HTML + CSS-select with the Lexbor engine.""" from selectolax.lexbor import LexborHTMLParser diff --git a/recipes/shapely/meta.yaml b/recipes/shapely/meta.yaml index c4c3507b..a4ef49d4 100644 --- a/recipes/shapely/meta.yaml +++ b/recipes/shapely/meta.yaml @@ -1,15 +1,16 @@ package: name: shapely - version: "2.1.2" + version: "2.2.0" build: number: 1 + backend-args: + - -Csetup-args=--cross-file + - -Csetup-args={MESON_CROSS_FILE} script_env: - # shapely 2.1+ supports an official cross-compile path: when both - # GEOS_INCLUDE_PATH and GEOS_LIBRARY_PATH are set, setup.py skips the - # geos-config probe and the version compatibility check, and links - # against `geos_c` directly. Replaces the 2.0.x-era mobile.patch - # that commented out the geos-config block by hand. + # shapely 2.2 builds with meson and finds GEOS only via pkg-config or CMake + # config, which flet-libgeos does not ship. geos-from-env.patch declares the + # GEOS dependency from these two paths instead, linking `geos_c` directly. GEOS_INCLUDE_PATH: '{platlib}/opt/include' GEOS_LIBRARY_PATH: '{platlib}/opt/lib' # {% if sdk != 'android' %} @@ -38,6 +39,13 @@ build: # {% endif %} requirements: + build: + - ninja + - meson + - cython host: - - flet-libgeos 3.13.1 + - flet-libgeos 3.15.0 - numpy ^2.0.0 + +patches: + - geos-from-env.patch diff --git a/recipes/shapely/patches/geos-from-env.patch b/recipes/shapely/patches/geos-from-env.patch new file mode 100644 index 00000000..b4f21acd --- /dev/null +++ b/recipes/shapely/patches/geos-from-env.patch @@ -0,0 +1,38 @@ +Let shapely 2.2's meson build use GEOS_INCLUDE_PATH / GEOS_LIBRARY_PATH. + +shapely 2.2 moved from setuptools to meson-python and now finds GEOS only via +pkg-config or CMake config files. flet-libgeos ships neither (its build.sh +removes them: their prefix is an absolute build path). Restore the env-var path +shapely 2.1's setup.py had: when both variables are set, declare the GEOS +dependency from them and skip the "no longer supported" warning. Uses -I/-L +args rather than include_directories(), which meson refuses for paths inside +the source tree. + +--- a/meson.build ++++ b/meson.build +@@ -75,7 +75,9 @@ + if name in environ: + print(name + "=" + environ[name]) + '''], check: true).stdout().strip().split() +-if ignored_env_vars != [] ++_geos_paths = run_command(py, ['-c', 'import os; print(os.environ.get("GEOS_INCLUDE_PATH", "")); print(os.environ.get("GEOS_LIBRARY_PATH", ""))'], check: true).stdout().strip().split('\n') ++_geos_from_env = _geos_paths.length() == 2 and _geos_paths[0] != '' and _geos_paths[1] != '' ++if ignored_env_vars != [] and not _geos_from_env + warning( + 'These previously-supported environment variable(s) are not supported:', + ignored_env_vars, '; use `cmake_prefix_path` ', +@@ -84,6 +86,14 @@ + + # Enforce a dependency method search priority if built-in option is specified + geos_dep = dependency('', required: false) # dummy to have dependency variable ++# mobile-forge: cross builds link a prebuilt GEOS with no .pc or CMake config; ++# take its paths from GEOS_INCLUDE_PATH / GEOS_LIBRARY_PATH, as shapely 2.1 did. ++if _geos_from_env ++ geos_dep = declare_dependency( ++ compile_args: ['-I' + _geos_paths[0]], ++ link_args: ['-L' + _geos_paths[1], '-lgeos_c'], ++ ) ++endif + if not geos_dep.found() and get_option('cmake_prefix_path').length() > 0 + # possibly configured with -Dcmake_prefix_path=/path/to/prefix + geos_dep = dependency('geos', version: f'>=@min_geos_version@', diff --git a/recipes/spacy/meta.yaml b/recipes/spacy/meta.yaml index 28b39b1b..71eb014e 100644 --- a/recipes/spacy/meta.yaml +++ b/recipes/spacy/meta.yaml @@ -1,6 +1,6 @@ package: name: spacy - version: "3.8.13" + version: "3.8.18" build: number: 1 diff --git a/recipes/spacy/patches/mobile.patch b/recipes/spacy/patches/mobile.patch index 5598e30d..f99bcc7b 100644 --- a/recipes/spacy/patches/mobile.patch +++ b/recipes/spacy/patches/mobile.patch @@ -1,6 +1,6 @@ -mobile.patch — two changes needed to cross-compile spacy for iOS/Android: +mobile.patch — cross-compiling spacy for iOS/Android: - 1. setup.py: spacy cimports sibling Cython packages (cymem, preshed, + setup.py: spacy cimports sibling Cython packages (cymem, preshed, murmurhash, thinc) and `cimport numpy`, but never puts the build env's site-packages on Cython's include_path, so cythonize can't resolve those cimports in the cross-build (crossenv patches sysconfig, so get_path() @@ -8,13 +8,6 @@ mobile.patch — two changes needed to cross-compile spacy for iOS/Android: locates each installed package via the import system / sys.path and adds its parent dir to include_path. - 2. setup.cfg: spacy imports `click` directly (spacy/cli/_util.py) but never - declares it — it relied on typer pulling click transitively, but typer - >=0.16 dropped its click dependency, so a fresh resolve of spacy 3.8.x - gets a click-less env and `import spacy` fails at runtime with - ModuleNotFoundError: No module named 'click' (even on desktop). The patch adds - click to install_requires so the built wheel declares it and pip bundles it. - --- a/setup.py +++ b/setup.py @@ -182,6 +182,35 @@ @@ -63,16 +56,6 @@ mobile.patch — two changes needed to cross-compile spacy for iOS/Android: + compiler_directives=COMPILER_DIRECTIVES, + include_path=_cython_includes, + ) - + setup( name="spacy", ---- a/setup.cfg -+++ b/setup.cfg -@@ -53,6 +53,7 @@ - weasel>=1.0.0,<2.0.0 - confection>=1.3.2,<2.0.0 - typer>=0.3.0,<1.0.0 -+ click>=8.0.0 - tqdm>=4.38.0,<5.0.0 - numpy>=1.15.0; python_version < "3.9" - numpy>=1.19.0; python_version >= "3.9" diff --git a/recipes/sqlalchemy/meta.yaml b/recipes/sqlalchemy/meta.yaml index 49653568..69ac778d 100644 --- a/recipes/sqlalchemy/meta.yaml +++ b/recipes/sqlalchemy/meta.yaml @@ -1,6 +1,6 @@ package: name: sqlalchemy - version: "2.0.50" + version: "2.1.8" build: number: 1 diff --git a/recipes/srsly/meta.yaml b/recipes/srsly/meta.yaml index 1c3dc243..1797782f 100644 --- a/recipes/srsly/meta.yaml +++ b/recipes/srsly/meta.yaml @@ -1,6 +1,6 @@ package: name: srsly - version: "2.5.3" + version: "2.5.6" build: number: 1 diff --git a/recipes/thinc/meta.yaml b/recipes/thinc/meta.yaml index adee897c..dc6ee14d 100644 --- a/recipes/thinc/meta.yaml +++ b/recipes/thinc/meta.yaml @@ -1,6 +1,6 @@ package: name: thinc - version: "8.3.13" + version: "8.3.14" build: number: 1 diff --git a/recipes/tiktoken/meta.yaml b/recipes/tiktoken/meta.yaml index 5b627ea2..5a5cfd85 100644 --- a/recipes/tiktoken/meta.yaml +++ b/recipes/tiktoken/meta.yaml @@ -1,6 +1,6 @@ package: name: tiktoken - version: "0.13.0" + version: "0.14.0" build: number: 1 diff --git a/recipes/time-machine/meta.yaml b/recipes/time-machine/meta.yaml index c8ae8a3b..3e152551 100644 --- a/recipes/time-machine/meta.yaml +++ b/recipes/time-machine/meta.yaml @@ -1,6 +1,6 @@ package: name: time-machine - version: "3.2.0" + version: "3.6.0" build: number: 1 diff --git a/recipes/tokenizers/meta.yaml b/recipes/tokenizers/meta.yaml index 40800947..82b0e8d9 100644 --- a/recipes/tokenizers/meta.yaml +++ b/recipes/tokenizers/meta.yaml @@ -1,6 +1,6 @@ package: name: tokenizers - version: "0.23.1" + version: "0.23.3" # {% if sdk == 'android' %} requirements: @@ -23,4 +23,6 @@ patches: # armeabi-v7a — no native 64-bit atomics) -> error[E0432]. The patch routes # that one type through the portable-atomic crate (which ships a 32-bit # fallback), so every arch builds. - - mobile.patch \ No newline at end of file + - mobile.patch + # abi3 links iOS extensions against -lpython3.10, which iOS lacks. + - no-abi3.patch diff --git a/recipes/tokenizers/patches/no-abi3.patch b/recipes/tokenizers/patches/no-abi3.patch new file mode 100644 index 00000000..63b44ffa --- /dev/null +++ b/recipes/tokenizers/patches/no-abi3.patch @@ -0,0 +1,31 @@ +Build a per-version extension instead of abi3. + +With the abi3-py310 feature, PyO3 links iOS extensions against +`-lpython3.10`, which no iOS Python tree has ("ld: library 'python3.10' not +found"). Drop abi3 from maturin's features and the crate defaults so each +wheel links its own libpython. Same fix as uuid-utils. + +diff --git a/pyproject.toml b/pyproject.toml +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -43,7 +43,7 @@ + [tool.maturin] + module-name = "tokenizers.tokenizers" + bindings = "pyo3" +-features = ["pyo3/extension-module", "abi3"] ++features = ["pyo3/extension-module"] + manifest-path = "bindings/python/Cargo.toml" + python-source = "py_src" + +diff --git a/bindings/python/Cargo.toml b/bindings/python/Cargo.toml +--- a/bindings/python/Cargo.toml ++++ b/bindings/python/Cargo.toml +@@ -36,7 +36,7 @@ + pyo3 = { version = "0.29", features = ["auto-initialize", "experimental-inspect"] } + + [features] +-default = ["ext-module", "abi3", "parity-aware-bpe"] ++default = ["ext-module", "parity-aware-bpe"] + ext-module = ["pyo3/extension-module"] + abi3 = ["pyo3/abi3", "pyo3/abi3-py310"] + parity-aware-bpe = ["tokenizers/parity-aware-bpe"] diff --git a/recipes/tornado/meta.yaml b/recipes/tornado/meta.yaml index c6c1318f..bf575520 100644 --- a/recipes/tornado/meta.yaml +++ b/recipes/tornado/meta.yaml @@ -1,6 +1,6 @@ package: name: tornado - version: "6.5.7" + version: "6.6.1" build: number: 1 diff --git a/recipes/ujson/meta.yaml b/recipes/ujson/meta.yaml index 349a1d5d..b2a5de09 100644 --- a/recipes/ujson/meta.yaml +++ b/recipes/ujson/meta.yaml @@ -1,9 +1,9 @@ package: name: ujson - version: "5.12.1" + version: "6.1.0" build: - number: 10 + number: 1 # {% if sdk == 'android' %} # ujson links its bundled double-conversion C++ code against NDK's libc++. diff --git a/recipes/uuid-utils/meta.yaml b/recipes/uuid-utils/meta.yaml index 47336f0f..ba1f3a87 100644 --- a/recipes/uuid-utils/meta.yaml +++ b/recipes/uuid-utils/meta.yaml @@ -1,6 +1,6 @@ package: name: uuid-utils - version: "0.17.0" + version: "1.2.0" build: number: 1 diff --git a/recipes/uuid-utils/patches/mobile.patch b/recipes/uuid-utils/patches/mobile.patch index cb9d70d2..877db6ab 100644 --- a/recipes/uuid-utils/patches/mobile.patch +++ b/recipes/uuid-utils/patches/mobile.patch @@ -1,5 +1,4 @@ -Make uuid-utils cross-compile for Flet's mobile targets. Both problems are in -dependencies, not in uuid-utils itself. +Make uuid-utils cross-compile for Flet's mobile targets. 1. armeabi-v7a (the arm-linux-androideabi Rust target) has no native 64-bit atomics, so std::sync::atomic::AtomicU64 — used for the v1/v6 MAC-node cache @@ -14,11 +13,21 @@ dependencies, not in uuid-utils itself. path (only v1/v6 UUIDs consult it; uuid4/uuid5 — what LangGraph uses — never do). arm64-v8a / x86_64 Android and desktop keep the real MAC lookup. -diff --git a/Cargo.toml b/Cargo.toml -index 0085e10..663a26f 100644 ---- a/a/Cargo.toml +3. 1.x builds a stable-ABI (abi3-py310) extension, and on iOS PyO3 then links + `-lpython3.10`, which no iOS Python tree has ("ld: library 'python3.10' not + found"). Drop the abi3 feature so each wheel links its own libpython. + +--- a/Cargo.toml +++ b/Cargo.toml -@@ -24,6 +24,13 @@ uuid = { version = "1.23.4", features = [ +@@ -10,7 +10,6 @@ + + [dependencies] + pyo3 = { version = "0.29.2", features = [ +- "abi3-py310", + "extension-module", + "generate-import-lib", + ]} +@@ -25,6 +24,13 @@ "v8", "fast-rng", ]} @@ -33,9 +42,7 @@ index 0085e10..663a26f 100644 +# _getnode() in src/lib.rs falls back to a random multicast node there (v1/v6 only). +[target.'cfg(all(not(target_arch = "wasm32"), not(target_os = "ios")))'.dependencies] mac_address = "1.1.8" -diff --git a/src/lib.rs b/src/lib.rs -index e8960b8..d90c01b 100644 ---- a/a/src/lib.rs +--- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,4 @@ -#[cfg(not(target_arch = "wasm32"))] @@ -43,7 +50,7 @@ index e8960b8..d90c01b 100644 use mac_address::MacAddressIterator; use pyo3::{ IntoPyObjectExt, -@@ -8,9 +8,10 @@ use pyo3::{ +@@ -8,9 +8,10 @@ types::{PyBytes, PyDict}, }; use std::{ @@ -52,10 +59,10 @@ index e8960b8..d90c01b 100644 time::SystemTime, }; +use portable_atomic::AtomicU64; - use uuid::{Builder, Bytes, ContextV1, Timestamp, Uuid, Variant, Version}; + use uuid::{Builder, Bytes, Timestamp, Uuid, Variant, Version}; static NODE: AtomicU64 = AtomicU64::new(0); -@@ -438,7 +439,7 @@ fn _getnode() -> u64 { +@@ -445,7 +446,7 @@ (mac & (1 << 41)) == 0 } diff --git a/recipes/websockets/meta.yaml b/recipes/websockets/meta.yaml index 4bc04b06..26155eaa 100644 --- a/recipes/websockets/meta.yaml +++ b/recipes/websockets/meta.yaml @@ -1,6 +1,6 @@ package: name: websockets - version: "16.0" + version: "17.4" build: number: 1 diff --git a/recipes/yarl/meta.yaml b/recipes/yarl/meta.yaml index 0e619fed..da62cf38 100644 --- a/recipes/yarl/meta.yaml +++ b/recipes/yarl/meta.yaml @@ -1,6 +1,6 @@ package: name: yarl - version: "1.24.2" + version: "1.25.1" build: number: 1 diff --git a/recipes/zeroconf/meta.yaml b/recipes/zeroconf/meta.yaml index 53e874a3..d54f9893 100644 --- a/recipes/zeroconf/meta.yaml +++ b/recipes/zeroconf/meta.yaml @@ -1,6 +1,6 @@ package: name: zeroconf - version: "0.150.0" + version: "0.154.0" build: number: 1 diff --git a/recipes/zope.interface/meta.yaml b/recipes/zope.interface/meta.yaml index fd9b8e6c..7b509f6e 100644 --- a/recipes/zope.interface/meta.yaml +++ b/recipes/zope.interface/meta.yaml @@ -1,6 +1,6 @@ package: name: zope.interface - version: "8.5" + version: "8.7" build: number: 1 diff --git a/src/forge/build.py b/src/forge/build.py index 808f0d69..11cfe090 100644 --- a/src/forge/build.py +++ b/src/forge/build.py @@ -190,6 +190,12 @@ def members(tf: tarfile.TarFile, strip=1): try: if parts[strip]: member.path = parts[strip] + # A hard link names its target by archive path; strip it + # the same way so tarfile can resolve the renamed target. + if member.islnk(): + link_parts = member.linkname.split("/", strip) + if len(link_parts) > strip: + member.linkname = link_parts[strip] yield member except IndexError: pass