Projects
home:rottame:vhosts-ng:php80
php8
Log In
Username
Password
Problem getting expanded diff: bad link: conflict in file php8.spec
×
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 11
View file
php8.changes
Changed
@@ -4,6 +4,12 @@ - set session.save_path to /tmp ------------------------------------------------------------------- +Thu May 30 19:18:43 UTC 2024 - Arjen de Korte <suse+build@de-korte.org> + +- Fix check for newer versions of ICU + + php-fix-newer-versions-icu.patch + +------------------------------------------------------------------- Thu Aug 17 20:28:32 UTC 2023 - Arjen de Korte <suse+build@de-korte.org> - version update to 8.0.30
View file
php8.spec
Changed
@@ -98,6 +98,8 @@ Patch19: php-build-reproducible-phar.patch # https://github.com/php/php-src/commit/b3646440b1808abf0874b6f89027ce53ec5da03f Patch23: php8-gd-removed-unused-constants.patch +# PATCH-FIX-UPSTREAM https://github.com/php/php-src/pull/14186 +Patch24: php-fix-newer-versions-icu.patch Patch1000: session-save-path.patch BuildRequires: apache-rpm-macros BuildRequires: autoconf
View file
php-fix-newer-versions-icu.patch
Added
@@ -0,0 +1,36 @@ +diff -purN a/build/php.m4 b/build/php.m4 +--- a/build/php.m4 2023-08-03 19:13:08.000000000 +0200 ++++ b/build/php.m4 2024-05-30 21:50:19.455364516 +0200 +@@ -1890,9 +1890,8 @@ AC_DEFUN(PHP_SETUP_ICU, + ICU_CFLAGS="$ICU_CFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1" + ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit" + +- if test "$PKG_CONFIG icu-io --atleast-version=60"; then +- ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1" +- fi ++ AS_IF($PKG_CONFIG icu-io --atleast-version=60, ++ ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1") + ) + + dnl +diff -purN a/ext/intl/config.m4 b/ext/intl/config.m4 +--- a/ext/intl/config.m4 2023-08-03 19:13:08.000000000 +0200 ++++ b/ext/intl/config.m4 2024-05-30 21:51:34.928855975 +0200 +@@ -83,7 +83,16 @@ if test "$PHP_INTL" != "no"; then + breakiterator/codepointiterator_methods.cpp" + + PHP_REQUIRE_CXX() +- PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX) ++ ++ AC_MSG_CHECKING(if intl requires -std=gnu++17) ++ AS_IF($PKG_CONFIG icu-uc --atleast-version=74, ++ AC_MSG_RESULT(yes) ++ PHP_CXX_COMPILE_STDCXX(17, mandatory, PHP_INTL_STDCXX) ++ , ++ AC_MSG_RESULT(no) ++ PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX) ++ ) ++ + PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $PHP_INTL_STDCXX $ICU_CXXFLAGS" + case $host_alias in + *cygwin*) PHP_INTL_CXX_FLAGS="$PHP_INTL_CXX_FLAGS -D_POSIX_C_SOURCE=200809L"
View file
_link
Changed
@@ -1,4 +1,4 @@ -<link project="openSUSE.org:devel:languages:php:php80" baserev="81b385e73a504a2554a46facca0049eb"> +<link project="openSUSE.org:devel:languages:php:php80" baserev="97ded67277280d956725d18c0ce0f6ca"> <patches> <branch/> </patches>
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.