new snapshot

enchant: use libenchant-2 instead of libenchant

3 files changed, 9 insertions, 79 deletions

diff --git a/failed.txt b/failed.txt
index ff2baf8..641c7ef 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.8.0-dev (2020-04-28)
+===== 7.8.0-dev (2020-05-04)
 
 $ grep -ar 'Tests failed' /var/lib/mock/scl80*/build.log
 
diff --git a/php-8.0.0-static.patch b/php-8.0.0-static.patch
deleted file mode 100644
index 30f7557..0000000
--- a/php-8.0.0-static.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 5fe723c92da05d9a2d7763fd9d54d223f4381571 Mon Sep 17 00:00:00 2001
-From: Dmitry Stogov <dmitry@zend.com>
-Date: Mon, 27 Apr 2020 23:31:54 +0300
-Subject: [PATCH] Fix libtool to provide a simple way to generate only "shared"
- object files or libraries.
-
-- Support for "-shared" option is taken from libtool-2.0 that is already at lease 15 years old.
-- Change PHP build system to use "-shared" instead of "--tag=disable-static".
----
- build/Makefile.global |  2 +-
- build/ltmain.sh       | 13 +++++++++++++
- build/php.m4          |  2 +-
- 3 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/build/Makefile.global b/build/Makefile.global
-index 237308d26597..17482043f9c5 100644
---- a/build/Makefile.global
-+++ b/build/Makefile.global
-@@ -16,7 +16,7 @@ build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)
- build-binaries: $(PHP_BINARIES)
- 
- libphp.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
--	$(LIBTOOL) --mode=link --tag=disable-static $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
-+	$(LIBTOOL) --mode=link $(CC) -shared $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
- 	-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
- 
- libs/libphp.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-diff --git a/build/ltmain.sh b/build/ltmain.sh
-index 7e2240e980e0..2f1c8c9dc80f 100755
---- a/build/ltmain.sh
-+++ b/build/ltmain.sh
-@@ -811,6 +811,13 @@ if test -z "$show_help"; then
- 
-     for arg in $later; do
-       case $arg in
-+      -shared)
-+	test yes = "$build_libtool_libs" \
-+	  || func_fatal_configuration "cannot build a shared library"
-+	build_old_libs=no
-+	continue
-+	;;
-+
-       -static)
- 	build_old_libs=yes
- 	continue
-@@ -1177,6 +1184,12 @@ EOF
-     for arg
-     do
-       case $arg in
-+      -shared)
-+	test yes != "$build_libtool_libs" \
-+	  && func_fatal_configuration "cannot build a shared library"
-+	build_old_libs=no
-+	break
-+	;;
-       -all-static | -static | -static-libtool-libs)
- 	case $arg in
- 	-all-static)
-diff --git a/build/php.m4 b/build/php.m4
-index 1b9940147e16..c5ce38026462 100644
---- a/build/php.m4
-+++ b/build/php.m4
-@@ -851,7 +851,7 @@ AC_DEFUN([PHP_SHARED_MODULE],[
- 	\$(LIBTOOL) --mode=install cp $3/$1.$suffix \$(phplibdir)
- 
- $3/$1.$suffix: \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_DEPENDENCIES)
--	\$(LIBTOOL) --mode=link --tag=disable-static ifelse($4,,[\$(CC)],[\$(CXX)]) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o [\$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)
-+	\$(LIBTOOL) --mode=link ifelse($4,,[\$(CC)],[\$(CXX)]) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o [\$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)
- 
- EOF
- ])
diff --git a/php.spec b/php.spec
index c8b4ab0..dccb911 100644
--- a/php.spec
+++ b/php.spec
@@ -97,9 +97,9 @@
 
 %global with_zip       0
 
-%global gh_commit    d906eb23f6cc86c69f7edc2732d7a46901b992a3
+%global gh_commit    342754575237da912874f781a24eefe76434ce5a
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_date      20200427
+%global gh_date      20200504
 %global gh_owner     php
 %global gh_project   php-src
 %global upver        8.0.0
@@ -109,7 +109,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 7%{?dist}
+Release: 8%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -151,8 +151,6 @@ Patch5: php-7.2.0-includedir.patch
 Patch6: php-7.4.0-embed.patch
 Patch8: php-7.4.0-libdb.patch
 Patch9: php-7.0.7-curl.patch
-# revert changes (already reverted upstream in 7.4)
-Patch10: php-8.0.0-static.patch
 
 # Functional changes
 Patch42: php-7.3.3-systzdata-v18.patch
@@ -841,7 +839,7 @@ Summary: Enchant spelling extension for PHP applications
 License: PHP
 Group: System Environment/Libraries
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
-BuildRequires: pkgconfig(enchant)
+BuildRequires: pkgconfig(enchant-2)
 
 %description enchant
 The %{?scl_prefix}php-enchant package contains a dynamic shared object that will add
@@ -932,7 +930,6 @@ in pure PHP.
 %if 0%{?rhel}
 %patch9 -p1 -b .curltls
 %endif
-%patch10 -p1 -b .revert
 
 %if 0%{?fedora} >= 28 || 0%{?rhel} >= 6
 %patch42 -p1 -b .systzdata
@@ -1817,6 +1814,10 @@ fi
 
 
 %changelog
+* Mon May  4 2020 Remi Collet <remi@remirepo.net> - 8.0.0~DEV.20200504-8
+- new snapshot
+- enchant: use libenchant-2 instead of libenchant
+
 * Tue Apr 28 2020 Remi Collet <remi@remirepo.net> - 8.0.0~DEV.20200428-7
 - new snapshot
 - test build for https://github.com/php/php-src/pull/5480