add patch for PHP 8.2 from

  https://git.osgeo.org/gitea/geos/php-geos/issues/27

7 files changed, 22 insertions, 40 deletions

diff --git a/.gitignore b/.gitignore
index 1ab5c4f..01f0400 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
+clog
 package-*.xml
 *.tgz
+*.tar.bz2
 *.tar.gz
 *.tar.xz
 *.tar.xz.asc
diff --git a/0001-fix-test-for-7.3-int-vs-integer.patch b/0001-fix-test-for-7.3-int-vs-integer.patch
index e08f1b7..f7dc02f 100644
--- a/0001-fix-test-for-7.3-int-vs-integer.patch
+++ b/0001-fix-test-for-7.3-int-vs-integer.patch
@@ -1,7 +1,7 @@
 From d9eb2378092d39678d1e2cf834c555f83d85b1a1 Mon Sep 17 00:00:00 2001
 From: Remi Collet <remi@remirepo.net>
 Date: Fri, 22 Jun 2018 11:43:23 +0200
-Subject: [PATCH 1/2] fix test for 7.3 (int vs integer)
+Subject: [PATCH 1/6] fix test for 7.3 (int vs integer)
 
 ---
  tests/004_WKBWriter.phpt | 4 ++--
@@ -30,5 +30,5 @@ index d2b3c85..3a72e2d 100644
      }
  }
 -- 
-2.14.4
+2.37.2
 
diff --git a/0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch b/0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch
index 78509b7..cf0c83b 100644
--- a/0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch
+++ b/0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch
@@ -1,7 +1,7 @@
 From f881f614f11472090394538d4424f408cb61d581 Mon Sep 17 00:00:00 2001
 From: Remi Collet <remi@remirepo.net>
 Date: Fri, 22 Jun 2018 11:44:27 +0200
-Subject: [PATCH 2/2] fix error message with php 7+ (-Wformat warnings raised
+Subject: [PATCH 2/6] fix error message with php 7+ (-Wformat warnings raised
  by 7.3)
 
 ---
@@ -33,5 +33,5 @@ index 2c81428..fc679e8 100755
      return proxy->relay;
  }
 -- 
-2.14.4
+2.37.2
 
diff --git a/0003-add-all-arginfo-and-fix-build-with-PHP-8.patch b/0003-add-all-arginfo-and-fix-build-with-PHP-8.patch
index 8d498f9..1b2a1f5 100644
--- a/0003-add-all-arginfo-and-fix-build-with-PHP-8.patch
+++ b/0003-add-all-arginfo-and-fix-build-with-PHP-8.patch
@@ -1,7 +1,7 @@
 From bfef69aca744295719dc8f859005ff83e17ac48c Mon Sep 17 00:00:00 2001
 From: Remi Collet <remi@remirepo.net>
 Date: Fri, 28 Aug 2020 15:21:36 +0200
-Subject: [PATCH] add all arginfo and fix build with PHP 8
+Subject: [PATCH 3/6] add all arginfo and fix build with PHP 8
 
 ---
  arginfo.h                | 319 +++++++++++++++++++++++++++++++++++++++
@@ -743,5 +743,5 @@ index 3a72e2d..3c13644 100644
  }
  
 -- 
-2.25.4
+2.37.2
 
diff --git a/0004-fix-all-zend_parse_parameters-call-to-use-zend_long.patch b/0004-fix-all-zend_parse_parameters-call-to-use-zend_long.patch
index 14eae9d..1452445 100644
--- a/0004-fix-all-zend_parse_parameters-call-to-use-zend_long.patch
+++ b/0004-fix-all-zend_parse_parameters-call-to-use-zend_long.patch
@@ -1,7 +1,7 @@
 From fcd7a35c1a9ca109fd50ee2660053423916b491b Mon Sep 17 00:00:00 2001
 From: Remi Collet <remi@remirepo.net>
 Date: Fri, 28 Aug 2020 15:36:40 +0200
-Subject: [PATCH 2/2] fix all zend_parse_parameters call to use zend_long
+Subject: [PATCH 4/6] fix all zend_parse_parameters call to use zend_long
 
 ---
  geos.c | 23 ++++++++++++-----------
@@ -119,5 +119,5 @@ index ffa27b8..0437523 100755
      writer = (GEOSWKBWriter*)getRelay(getThis(), WKBWriter_ce_ptr);
  
 -- 
-2.25.4
+2.37.2
 
diff --git a/0005-fix-for-8.0.0RC1.patch b/0005-fix-for-8.0.0RC1.patch
index 9759290..face6f8 100644
--- a/0005-fix-for-8.0.0RC1.patch
+++ b/0005-fix-for-8.0.0RC1.patch
@@ -1,7 +1,7 @@
 From 37ede013e720aed2ab4e7ce33699a86dd0ef3730 Mon Sep 17 00:00:00 2001
 From: Remi Collet <remi@remirepo.net>
 Date: Wed, 30 Sep 2020 09:17:54 +0200
-Subject: [PATCH 5/5] fix for 8.0.0RC1
+Subject: [PATCH 5/6] fix for 8.0.0RC1
 
 ---
  tests/003_WKTReader.phpt | 2 +-
@@ -21,5 +21,5 @@ index fbd4fb1..e02d1c8 100644
      }
  }
 -- 
-2.25.4
+2.37.2
 
diff --git a/php-geos.spec b/php-geos.spec
index 4ea528f..db30d68 100644
--- a/php-geos.spec
+++ b/php-geos.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-geos
 #
-# Copyright (c) 2016-2020 Remi Collet
+# Copyright (c) 2016-2022 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -10,7 +10,6 @@
 %bcond_without tests
 
 %if 0%{?scl:1}
-%global sub_prefix %{scl_prefix}
 %scl_package         php-geos
 %else
 %global pkg_name     php-geos
@@ -24,9 +23,9 @@
 %global ini_name   40-%{pecl_name}.ini
 %endif
 
-Name:           %{?sub_prefix}php-%{pecl_name}
+Name:           %{?scl_prefix}php-%{pecl_name}
 Version:        1.0.0
-Release:        23%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        24%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 
 Summary:        PHP module for GEOS
 
@@ -44,6 +43,8 @@ Patch2:         0003-add-all-arginfo-and-fix-build-with-PHP-8.patch
 Patch4:         0005-fix-for-8.0.0RC1.patch
 # https://git.osgeo.org/gitea/geos/php-geos/issues/25
 Patch3:         0004-fix-all-zend_parse_parameters-call-to-use-zend_long.patch
+# https://git.osgeo.org/gitea/geos/php-geos/issues/27
+Patch5:         0006-fix-__toString-with-8.2.patch
 
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel
@@ -55,37 +56,11 @@ Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
 %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
 
-%if "%{?scl_prefix}" != "%{?sub_prefix}"
-Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}-%{release}
-Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}-%{release}
-%endif
 # Dropped from geos
 Obsoletes:      %{?scl_prefix}geos-php        <= 3.5.0
 Provides:       %{?scl_prefix}geos-php         = 1:%{version}-%{release}
 Provides:       %{?scl_prefix}geos-php%{?_isa} = 1:%{version}-%{release}
 
-%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-# Other third party repo stuff
-%if "%{php_version}" > "7.2"
-Obsoletes:     php72u-%{pecl_name}      <= %{version}
-%endif
-%if "%{php_version}" > "7.3"
-Obsoletes:      php73-%{pecl_name}      <= %{version}
-%endif
-%if "%{php_version}" > "7.4"
-Obsoletes:      php74-%{pecl_name}      <= %{version}
-%endif
-%if "%{php_version}" > "8.0"
-Obsoletes:      php80-%{pecl_name}      <= %{version}
-%endif
-%endif
-
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# Filter private shared
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
-%endif
-
 
 %description
 PHP module for GEOS.
@@ -104,6 +79,7 @@ chmod -x *.c
 %patch2 -p1 -b .arginfo
 %patch3 -p1 -b .zendlong
 %patch4 -p1 -b .arg
+%patch5 -p1 -b .php82
 
 sed -e '/PHP_GEOS_VERSION/s/"0.0"/"%{version}%{?prever}"/' -i php_geos.h
 
@@ -214,6 +190,10 @@ exit $ret
 
 
 %changelog
+* Fri Sep  9 2022 Remi Collet <remi@remirepo.net> - 1.0.0-24
+- add patch for PHP 8.2 from
+  https://git.osgeo.org/gitea/geos/php-geos/issues/27
+
 * Fri Nov  5 2021 Remi Collet <remi@remirepo.net> - 1.0.0-23
 - EL-9 build