summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2025-08-13 06:31:55 +0200
committerRemi Collet <remi@php.net>2025-08-13 06:31:55 +0200
commitd06dd9337d67178f3b7e81198cd3156c9affe913 (patch)
treea8143b2e78e3294e3894e3fb2ed88a3fe78e5d0c
parent609abe4b140b564dd79b3edfd63c7ae73632ff68 (diff)
update to 8.5.0beta1
-rw-r--r--failed.txt2
-rw-r--r--php-8.5.0-systzdata-v24.patch6
-rw-r--r--php.spec10
3 files changed, 12 insertions, 6 deletions
diff --git a/failed.txt b/failed.txt
index 2706656..c3721b1 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.5.0alpha4 (2025-07-31)
+===== 8.5.0beta1 (2025-08-14)
$ grep -ar 'Tests failed' /var/lib/mock/*/build.log
diff --git a/php-8.5.0-systzdata-v24.patch b/php-8.5.0-systzdata-v24.patch
index d8d54ce..75a73d3 100644
--- a/php-8.5.0-systzdata-v24.patch
+++ b/php-8.5.0-systzdata-v24.patch
@@ -39,9 +39,9 @@ r1: initial revision
diff -up ./ext/date/config0.m4.systzdata ./ext/date/config0.m4
--- ./ext/date/config0.m4.systzdata 2025-06-30 15:46:30.352141304 +0200
+++ ./ext/date/config0.m4 2025-06-30 15:47:33.855594597 +0200
-@@ -8,6 +8,18 @@ AX_CHECK_COMPILE_FLAG([-Wno-implicit-fal
- [PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough"],,
- [-Werror])
+@@ -7,6 +7,18 @@
+ AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough],
+ [PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough"])
+PHP_ARG_WITH(system-tzdata, for use of system timezone data,
+ [AS_HELP_STRING([--with-system-tzdata[=DIR]],[to specify use of system timezone data])], no, no)
diff --git a/php.spec b/php.spec
index c40617e..7349ac4 100644
--- a/php.spec
+++ b/php.spec
@@ -94,8 +94,8 @@
%global gh_owner php
%global gh_project php-src
%global upver 8.5.0
-%global rcver alpha4
-%global lowrc alpha4
+%global rcver beta1
+%global lowrc beta1
# TODO set PHP_EXTRA_VERSION for EOL version
Summary: PHP scripting language for creating dynamic web sites
@@ -902,6 +902,9 @@ rm ext/openssl/tests/ecc_custom_params.phpt
# Failing when build with PHP installed
rm ext/opcache/tests/zzz_basic_logging.phpt
+# TEMP
+sed -e 's/-dev/beta1/' -i main/php_version.h
+
# Safety check for API version change.
pver=$(sed -n '/#define PHP_VERSION /{s/.* "//;s/".*$//;p}' main/php_version.h)
if test "x${pver}" != "x%{upver}%{?rcver}%{!?rcver:%{?gh_date:-dev}}"; then
@@ -1638,6 +1641,9 @@ fi
%changelog
+* Wed Aug 13 2025 Remi Collet <remi@remirepo.net> - 8.5.0~beta1-1
+- update to 8.5.0beta1
+
* Thu Jul 31 2025 Remi Collet <remi@remirepo.net> - 8.5.0~alpha4-1
- update to 8.5.0alpha4
- drop patch merged upstream