Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Jun 2023 07:18:39 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 264b6a90fe15 - main - databases/pecl-couchbase: Fix build with PHP 8.3
Message-ID:  <202306300718.35U7IdSC065306@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=264b6a90fe1599315d67057727a03e5c01ac13f6

commit 264b6a90fe1599315d67057727a03e5c01ac13f6
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-06-30 07:02:51 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-06-30 07:02:51 +0000

    databases/pecl-couchbase: Fix build with PHP 8.3
---
 databases/pecl-couchbase/Makefile          |  1 -
 databases/pecl-couchbase/files/patch-php83 | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/databases/pecl-couchbase/Makefile b/databases/pecl-couchbase/Makefile
index e2f672e955aa..b40b80f2d960 100644
--- a/databases/pecl-couchbase/Makefile
+++ b/databases/pecl-couchbase/Makefile
@@ -13,7 +13,6 @@ LICENSE=	APACHE20
 BUILD_DEPENDS=	cmake:devel/cmake-core
 
 USES=		compiler:c++17-lang php:build,pecl
-IGNORE_WITH_PHP=	83
 
 CONFIGURE_ARGS=	COUCHBASE_CMAKE_EXTRA="-DCOUCHBASE_CXX_CLIENT_EMBED_MOZILLA_CA_BUNDLE=OFF"
 
diff --git a/databases/pecl-couchbase/files/patch-php83 b/databases/pecl-couchbase/files/patch-php83
new file mode 100644
index 000000000000..22bee7ae9cae
--- /dev/null
+++ b/databases/pecl-couchbase/files/patch-php83
@@ -0,0 +1,18 @@
+--- src/wrapper/common.hxx.orig	2023-05-26 07:56:45 UTC
++++ src/wrapper/common.hxx
+@@ -31,12 +31,12 @@ ZEND_BEGIN_MODULE_GLOBALS(couchbase)
+ /* INI settings */
+ char* log_level{ nullptr };
+ char* log_path{ nullptr };
+-zend_bool log_php_log_err{ 1 };
+-zend_bool log_stderr{ 0 };
++bool log_php_log_err{ 1 };
++bool log_stderr{ 0 };
+ zend_long max_persistent{ -1 };     /* maximum number of persistent connections per process */
+ zend_long persistent_timeout{ -1 }; /* time period after which idle persistent connection is considered expired */
+ /* module variables */
+-zend_bool initialized{ 0 };
++bool initialized{ 0 };
+ zend_long num_persistent{ 0 }; /* number of existing persistent connections */
+ ZEND_END_MODULE_GLOBALS(couchbase)
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306300718.35U7IdSC065306>