From 01d46284d83f2fcf8fe218d30833ea3f640c36c7 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Mon, 2 Nov 2026 12:14:54 +0100 Subject: [PATCH] Update php84, python312, promote libbrotli --- recipes/dev/php84/recipe.toml | 4 ++-- recipes/dev/php84/redox.patch | 24 +++++++++---------- recipes/dev/python312/recipe.toml | 4 ++-- recipes/dev/python312/redox.patch | 20 ++++++++-------- .../libs/other => libs}/libbrotli/recipe.toml | 5 ++-- .../libs/other => libs}/libbrotli/redox.patch | 0 6 files changed, 28 insertions(+), 29 deletions(-) rename recipes/{wip/libs/other => libs}/libbrotli/recipe.toml (62%) rename recipes/{wip/libs/other => libs}/libbrotli/redox.patch (100%) diff --git a/recipes/dev/php84/recipe.toml b/recipes/dev/php84/recipe.toml index 21ca76e41..37715b9cc 100644 --- a/recipes/dev/php84/recipe.toml +++ b/recipes/dev/php84/recipe.toml @@ -1,6 +1,6 @@ [source] -tar = "https://www.php.net/distributions/php-8.4.17.tar.xz" -blake3 = "a8478dddd948d4b26e51c5727ac0895440da76e8ad9be947098a4284ca0b7f2a" +tar = "https://www.php.net/distributions/php-8.4.27.tar.xz" +blake3 = "46a605ee5ddc43d17fddf0364b23e44a85889c29eee47609d4a9aaeccf9952a3" patches = [ "redox.patch" ] diff --git a/recipes/dev/php84/redox.patch b/recipes/dev/php84/redox.patch index c1d6ef25e..a6ccc67dc 100644 --- a/recipes/dev/php84/redox.patch +++ b/recipes/dev/php84/redox.patch @@ -1,7 +1,7 @@ diff -ruwN source/configure source-new/configure ---- source/configure 2026-01-14 00:17:10.000000000 +0700 -+++ source-new/configure 2026-01-16 15:56:01.944755811 +0700 -@@ -26007,7 +26007,7 @@ +--- source/configure 2026-10-19 14:38:59.000000000 +0000 ++++ source-new/configure 2026-11-02 11:06:50.268448655 +0000 +@@ -25911,7 +25911,7 @@ then : ac_cv_lib_curl_curl_easy_perform=yes else case e in #( @@ -10,7 +10,7 @@ diff -ruwN source/configure source-new/configure esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ -@@ -37728,7 +37728,7 @@ +@@ -37632,7 +37632,7 @@ then : php_cv_lib_gd_works=yes else case e in #( @@ -19,7 +19,7 @@ diff -ruwN source/configure source-new/configure esac fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ -@@ -40464,7 +40464,7 @@ +@@ -40368,7 +40368,7 @@ LIBS_SAVED=$LIBS CFLAGS="$CFLAGS $GMP_CFLAGS" LIBS="$LIBS $GMP_LIBS" @@ -29,8 +29,8 @@ diff -ruwN source/configure source-new/configure if test "x$ac_cv_header_gmp_h" = xyes then : diff -ruwN source/ext/phar/Makefile.frag source-new/ext/phar/Makefile.frag ---- source/ext/phar/Makefile.frag 2026-01-14 00:17:10.000000000 +0700 -+++ source-new/ext/phar/Makefile.frag 2026-01-16 15:56:01.946130660 +0700 +--- source/ext/phar/Makefile.frag 2026-10-19 14:38:59.000000000 +0000 ++++ source-new/ext/phar/Makefile.frag 2026-11-02 11:06:50.269448713 +0000 @@ -30,7 +30,7 @@ -@test -f $(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc $(builddir)/phar/phar.inc @@ -41,8 +41,8 @@ diff -ruwN source/ext/phar/Makefile.frag source-new/ext/phar/Makefile.frag $(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH) -@(echo "Generating phar.php"; \ diff -ruwN source/ext/posix/posix.c source-new/ext/posix/posix.c ---- source/ext/posix/posix.c 2026-01-14 00:17:10.000000000 +0700 -+++ source-new/ext/posix/posix.c 2026-01-16 15:56:01.946290813 +0700 +--- source/ext/posix/posix.c 2026-10-19 14:38:59.000000000 +0000 ++++ source-new/ext/posix/posix.c 2026-11-02 11:06:50.269448713 +0000 @@ -375,7 +375,7 @@ ZEND_PARSE_PARAMETERS_NONE(); @@ -53,8 +53,8 @@ diff -ruwN source/ext/posix/posix.c source-new/ext/posix/posix.c RETURN_FALSE; } diff -ruwN source/sapi/fpm/fpm/fpm_status.c source-new/sapi/fpm/fpm/fpm_status.c ---- source/sapi/fpm/fpm/fpm_status.c 2026-01-14 00:17:10.000000000 +0700 -+++ source-new/sapi/fpm/fpm/fpm_status.c 2026-01-16 15:57:37.781307156 +0700 +--- source/sapi/fpm/fpm/fpm_status.c 2026-10-19 14:38:59.000000000 +0000 ++++ source-new/sapi/fpm/fpm/fpm_status.c 2026-11-02 11:06:50.269448713 +0000 @@ -84,6 +84,7 @@ continue; } @@ -73,7 +73,7 @@ diff -ruwN source/sapi/fpm/fpm/fpm_status.c source-new/sapi/fpm/fpm/fpm_status.c array_init(&fpm_proc_stat); add_assoc_long(&fpm_proc_stat, "pid", proc_p->pid); -@@ -573,11 +577,15 @@ +@@ -596,11 +600,15 @@ } /* prevent NaN */ diff --git a/recipes/dev/python312/recipe.toml b/recipes/dev/python312/recipe.toml index ca87ce269..e39e424f2 100644 --- a/recipes/dev/python312/recipe.toml +++ b/recipes/dev/python312/recipe.toml @@ -1,6 +1,6 @@ [source] -tar = "https://www.python.org/ftp/python/3.12.12/Python-3.12.12.tar.xz" -blake3 = "29636fdae3e0ee8d0fe585e528c9376fe43876f5f3f0f7892140567946fd907b" +tar = "https://www.python.org/ftp/python/3.12.16/Python-3.12.16.tar.xz" +blake3 = "64f6bad790874696e4b6cbcf02d5e1d6ec668044857fca97e82d9f894abc1817" patches = [ "redox.patch" ] diff --git a/recipes/dev/python312/redox.patch b/recipes/dev/python312/redox.patch index 60bf30819..a56b13e44 100644 --- a/recipes/dev/python312/redox.patch +++ b/recipes/dev/python312/redox.patch @@ -1,6 +1,6 @@ diff -ruwN source/configure source-new/configure ---- source/configure 2025-10-09 18:07:00.000000000 +0700 -+++ source-new/configure 2025-12-09 22:14:30.781035339 +0700 +--- source/configure 2026-10-25 18:24:37.000000000 +0000 ++++ source-new/configure 2026-11-02 11:01:28.809597992 +0000 @@ -4283,6 +4283,9 @@ *-*-wasi) ac_sys_system=WASI @@ -92,8 +92,8 @@ diff -ruwN source/configure source-new/configure Darwin/*) LINKFORSHARED="$extra_undefs -framework CoreFoundation" diff -ruwN source/Include/pyport.h source-new/Include/pyport.h ---- source/Include/pyport.h 2025-10-09 18:07:00.000000000 +0700 -+++ source-new/Include/pyport.h 2025-12-09 22:14:30.781035339 +0700 +--- source/Include/pyport.h 2026-10-25 18:24:37.000000000 +0000 ++++ source-new/Include/pyport.h 2026-11-02 11:01:28.809597992 +0000 @@ -684,7 +684,7 @@ # error "Py_TRACE_REFS ABI is not compatible with release and debug ABI" #endif @@ -104,8 +104,8 @@ diff -ruwN source/Include/pyport.h source-new/Include/pyport.h // See _Py_GetLocaleEncoding(), PyUnicode_DecodeLocale() // and PyUnicode_EncodeLocale(). diff -ruwN source/Modules/_cryptmodule.c source-new/Modules/_cryptmodule.c ---- source/Modules/_cryptmodule.c 2025-10-09 18:07:00.000000000 +0700 -+++ source-new/Modules/_cryptmodule.c 2025-12-09 22:14:30.781035339 +0700 +--- source/Modules/_cryptmodule.c 2026-10-25 18:24:37.000000000 +0000 ++++ source-new/Modules/_cryptmodule.c 2026-11-02 11:01:28.810598051 +0000 @@ -38,13 +38,7 @@ /*[clinic end generated code: output=0512284a03d2803c input=0e8edec9c364352b]*/ { @@ -121,8 +121,8 @@ diff -ruwN source/Modules/_cryptmodule.c source-new/Modules/_cryptmodule.c return PyErr_SetFromErrno(PyExc_OSError); } diff -ruwN source/Modules/fcntlmodule.c source-new/Modules/fcntlmodule.c ---- source/Modules/fcntlmodule.c 2025-10-09 11:07:00.000000000 +0000 -+++ source-new/Modules/fcntlmodule.c 2026-10-15 10:21:56.351900218 +0000 +--- source/Modules/fcntlmodule.c 2026-10-25 18:24:37.000000000 +0000 ++++ source-new/Modules/fcntlmodule.c 2026-11-02 11:01:28.810598051 +0000 @@ -159,7 +159,7 @@ in their unsigned long ioctl codes this will break and need special casing based on the platform being built on. @@ -133,8 +133,8 @@ diff -ruwN source/Modules/fcntlmodule.c source-new/Modules/fcntlmodule.c Py_buffer pstr; char *str; diff -ruwN source/Modules/resource.c source-new/Modules/resource.c ---- source/Modules/resource.c 2025-10-09 18:07:00.000000000 +0700 -+++ source-new/Modules/resource.c 2025-12-09 22:14:30.781035339 +0700 +--- source/Modules/resource.c 2026-10-25 18:24:37.000000000 +0000 ++++ source-new/Modules/resource.c 2026-11-02 11:01:28.810598051 +0000 @@ -216,7 +216,7 @@ { struct rlimit rl; diff --git a/recipes/wip/libs/other/libbrotli/recipe.toml b/recipes/libs/libbrotli/recipe.toml similarity index 62% rename from recipes/wip/libs/other/libbrotli/recipe.toml rename to recipes/libs/libbrotli/recipe.toml index 9e15547ac..e7155e075 100644 --- a/recipes/wip/libs/other/libbrotli/recipe.toml +++ b/recipes/libs/libbrotli/recipe.toml @@ -1,10 +1,9 @@ -#TODO not compiled or tested -# build instructions: https://github.com/google/brotli#cmake [source] git = "https://github.com/google/brotli" patches = [ "redox.patch" ] -branch = "v1.2" +rev = "v1.2.1" shallow_clone = true + [build] template = "cmake" cmakeflags = [ diff --git a/recipes/wip/libs/other/libbrotli/redox.patch b/recipes/libs/libbrotli/redox.patch similarity index 100% rename from recipes/wip/libs/other/libbrotli/redox.patch rename to recipes/libs/libbrotli/redox.patch