From owner-svn-ports-all@freebsd.org Fri Nov 6 11:25:54 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 089B12EB1EC; Fri, 6 Nov 2020 11:25:54 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CSJ3j5bhZz3JL8; Fri, 6 Nov 2020 11:25:53 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B1BFD243C1; Fri, 6 Nov 2020 11:25:53 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0A6BPrtp095205; Fri, 6 Nov 2020 11:25:53 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A6BPrZQ095204; Fri, 6 Nov 2020 11:25:53 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202011061125.0A6BPrZQ095204@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Fri, 6 Nov 2020 11:25:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554224 - head/graphics/php-geos/files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: head/graphics/php-geos/files X-SVN-Commit-Revision: 554224 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Nov 2020 11:25:54 -0000 Author: sunpoet Date: Fri Nov 6 11:25:53 2020 New Revision: 554224 URL: https://svnweb.freebsd.org/changeset/ports/554224 Log: Fix build with PHP 8.0 Modified: head/graphics/php-geos/files/patch-geos.c Modified: head/graphics/php-geos/files/patch-geos.c ============================================================================== --- head/graphics/php-geos/files/patch-geos.c Fri Nov 6 11:25:47 2020 (r554223) +++ head/graphics/php-geos/files/patch-geos.c Fri Nov 6 11:25:53 2020 (r554224) @@ -1,6 +1,20 @@ --- geos.c.orig 2016-12-24 10:53:24 UTC +++ geos.c -@@ -863,7 +863,7 @@ PHP_METHOD(Geometry, buffer) +@@ -33,6 +33,13 @@ + /* Own stuff */ + #include "php_geos.h" + ++#if PHP_MAJOR_VERSION >= 8 ++#define TSRMLS_C ++#define TSRMLS_CC ++#define TSRMLS_DC ++#define TSRMLS_FETCH() ++#endif ++ + static ZEND_DECLARE_MODULE_GLOBALS(geos); + static PHP_GINIT_FUNCTION(geos); + +@@ -863,7 +870,7 @@ PHP_METHOD(Geometry, buffer) GEOS_PHP_ZVAL data; HashTable *style; zend_string *key; @@ -9,7 +23,7 @@ this = (GEOSGeometry*)getRelay(getThis(), Geometry_ce_ptr); -@@ -956,7 +956,7 @@ PHP_METHOD(Geometry, offsetCurve) +@@ -956,7 +963,7 @@ PHP_METHOD(Geometry, offsetCurve) GEOS_PHP_ZVAL data; HashTable *style; zend_string *key;