From c8482f9c6b5368fbb207f90600eb60214fbd01fd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 29 Jan 2024 10:53:08 +0100 Subject: fix incompatible pointer types using patch from https://git.osgeo.org/gitea/geos/php-geos/issues/32 --- php-geos.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'php-geos.spec') diff --git a/php-geos.spec b/php-geos.spec index 0a42fab..797267a 100644 --- a/php-geos.spec +++ b/php-geos.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-geos # -# Copyright (c) 2016-2023 Remi Collet +# Copyright (c) 2016-2024 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -33,7 +33,7 @@ Name: %{?scl_prefix}php-%{pecl_name} Version: 1.0.0 -Release: 26%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 31%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: PHP module for GEOS @@ -53,6 +53,8 @@ Patch4: 0005-fix-for-8.0.0RC1.patch 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 +# https://git.osgeo.org/gitea/geos/php-geos/issues/32 +Patch6: 0001-Fix-incompatible-pointer-types.patch BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel @@ -86,6 +88,7 @@ chmod -x *.c %patch -P3 -p1 -b .zendlong %patch -P4 -p1 -b .arg %patch -P5 -p1 -b .php82 +%patch -P6 -p1 -b .pointers sed -e '/PHP_GEOS_VERSION/s/"0.0"/"%{version}%{?prever}"/' -i php_geos.h @@ -207,6 +210,10 @@ exit $ret %changelog +* Mon Jan 29 2024 Remi Collet - 1.0.0-31 +- fix incompatible pointer types + using patch from https://git.osgeo.org/gitea/geos/php-geos/issues/32 + * Wed Aug 30 2023 Remi Collet - 1.0.0-26 - rebuild for PHP 8.3.0RC1 -- cgit