Date: Sunday, April 30, 2023 @ 18:55:58 Author: foutrelis Revision: 1455477
upgpkg: php-memcache 8.2-1 Modified: php-memcache/trunk/PKGBUILD Deleted: php-memcache/trunk/php-8.2.patch ---------------+ PKGBUILD | 13 +++-------- php-8.2.patch | 64 -------------------------------------------------------- 2 files changed, 4 insertions(+), 73 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-04-30 15:26:00 UTC (rev 1455476) +++ PKGBUILD 2023-04-30 18:55:58 UTC (rev 1455477) @@ -1,8 +1,8 @@ # Maintainer: Evangelos Foutras <[email protected]> pkgname=('php-memcache' 'php-legacy-memcache') -pkgver=8.0 -pkgrel=4 +pkgver=8.2 +pkgrel=1 pkgdesc="Memcache module for PHP" arch=('x86_64') url="https://pecl.php.net/package/memcache"; @@ -9,15 +9,10 @@ license=('PHP') makedepends=('php' 'php-legacy') checkdepends=('memcached') -source=(https://pecl.php.net/get/memcache-$pkgver.tgz - 'php-8.2.patch') -sha256sums=('defe33e6f7831d82b7283b95e14a531070531acbf21278f3f0d7050505cf3395' - 'faa23fc8fca696264b5e1159e44cfda772adca0b97ce43c9b6ee2b57d7e0ea4e') +source=(https://pecl.php.net/get/memcache-$pkgver.tgz) +sha256sums=('b3f0640eacdeb9046c6c86a1546d7fb8a4e9f219e5d9a36a287e59b2dd8208e5') prepare() { - # Fix test: https://github.com/websupport-sk/pecl-memcache/issues/91 - sed -i 's/memcache_connect(\$domainsocket, null)/memcache_connect(\$domainsocket, 0)/' memcache-$pkgver/tests/035.phpt - patch -p1 -d memcache-$pkgver -i "$srcdir/php-8.2.patch" cp -a memcache-$pkgver{,-php-legacy} } Deleted: php-8.2.patch =================================================================== --- php-8.2.patch 2023-04-30 15:26:00 UTC (rev 1455476) +++ php-8.2.patch 2023-04-30 18:55:58 UTC (rev 1455477) @@ -1,64 +0,0 @@ -From 26c0f5130050649762c550e0dac07d4f371e68d5 Mon Sep 17 00:00:00 2001 -From: Remi Collet <[email protected]> -Date: Tue, 25 Oct 2022 11:54:24 +0200 -Subject: [PATCH] trivial/minimal fix for PHP 8.2 (#104) - ---- - src/memcache.c | 6 ++++++ - tests/029.phpt | 2 +- - tests/045.phpt | 4 +++- - 3 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/src/memcache.c b/src/memcache.c -index c05105a..c43e48f 100644 ---- a/src/memcache.c -+++ b/src/memcache.c -@@ -733,9 +733,15 @@ PHP_MINIT_FUNCTION(memcache) - - INIT_CLASS_ENTRY(ce, "MemcachePool", php_memcache_pool_class_functions); - memcache_pool_ce = zend_register_internal_class(&ce); -+#if PHP_VERSION_ID >= 80200 -+ memcache_pool_ce->ce_flags |= ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES; -+#endif - - INIT_CLASS_ENTRY(ce, "Memcache", php_memcache_class_functions); - memcache_ce = zend_register_internal_class_ex(&ce, memcache_pool_ce); -+#if PHP_VERSION_ID >= 80200 -+ memcache_ce->ce_flags |= ZEND_ACC_ALLOW_DYNAMIC_PROPERTIES; -+#endif - - le_memcache_pool = zend_register_list_destructors_ex(_mmc_pool_list_dtor, NULL, "memcache connection", module_number); - le_memcache_server = zend_register_list_destructors_ex(NULL, _mmc_server_list_dtor, "persistent memcache connection", module_number); -diff --git a/tests/029.phpt b/tests/029.phpt -index bcacf33..4427948 100644 ---- a/tests/029.phpt -+++ b/tests/029.phpt -@@ -44,7 +44,7 @@ if (is_array($result)) - sort($result); - var_dump($result); - --$result = ini_set('memcache.allow_failover', "abc"); -+$result = @ini_set('memcache.allow_failover', "abc"); - var_dump($result); - - ?> -diff --git a/tests/045.phpt b/tests/045.phpt -index e1c10ec..ddc5531 100644 ---- a/tests/045.phpt -+++ b/tests/045.phpt -@@ -8,6 +8,8 @@ Nested get's in __wakeup() - include 'connect.inc'; - - class testclass { -+ public $result = null; -+ - function __wakeup() { - global $memcache; - $this->result = $memcache->get('_test_key3'); -@@ -48,4 +50,4 @@ array(2) { - [0]=> - int(123) - } --} -\ No newline at end of file -+}
