[arch-commits] Commit in php-memcache/trunk (PKGBUILD php73.patch)

[Evangelos Foutras via arch-commits]

    Date: Saturday, December 8, 2018 @ 12:58:50
  Author: foutrelis
Revision: 412331

PHP 7.3 rebuild

Added:
  php-memcache/trunk/php73.patch
Modified:
  php-memcache/trunk/PKGBUILD

-------------+
 PKGBUILD    |   11 ++++++++---
 php73.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2018-12-08 12:58:03 UTC (rev 412330)
+++ PKGBUILD    2018-12-08 12:58:50 UTC (rev 412331)
@@ -2,7 +2,7 @@
 
 pkgname=php-memcache
 pkgver=3.0.8
-pkgrel=6
+pkgrel=7
 _commit=fdbd46bbc6f53ed6e024521895e142cbfc9b3340
 pkgdesc="Memcache module for PHP"
 arch=('x86_64')
@@ -14,12 +14,17 @@
 backup=('etc/php/conf.d/memcache.ini')
 install=php-memcache.install
 #source=(https://pecl.php.net/get/memcache-$pkgver.tgz)
-source=("git+https://github.com/websupport-sk/pecl-memcache.git#commit=$_commit";)
-sha256sums=('SKIP')
+source=("git+https://github.com/websupport-sk/pecl-memcache.git#commit=$_commit";
+        php73.patch)
+sha256sums=('SKIP'
+            '4192de8fde7e69ce8d14053d1e0842d61239da4ca9a1317a9451075c4188be0f')
 
 prepare() {
   cd "$srcdir/pecl-memcache"
 
+  # 
https://github.com/php/php-src/blob/php-7.3.0RC1/UPGRADING.INTERNALS#L90-L96
+  patch -Np1 -i ../php73.patch
+
   # Disable UDP tests
   sed -i "s|^\(\$udpPort2\? =\) .*|\1 0;|" tests/connect.inc
 

Added: php73.patch
===================================================================
--- php73.patch                         (rev 0)
+++ php73.patch 2018-12-08 12:58:50 UTC (rev 412331)
@@ -0,0 +1,31 @@
+diff --git a/php7/memcache.c b/php7/memcache.c
+index c7d4e0a..1818db4 100644
+--- a/php7/memcache.c
++++ b/php7/memcache.c
+@@ -721,7 +721,7 @@ mmc_t *mmc_find_persistent(const char *host, int host_len, 
unsigned short port,
+               mmc = mmc_server_new(host, host_len, port, udp_port, 1, 
timeout, retry_interval);
+               le->type = le_memcache_server;
+               le->ptr  = mmc;
+-              GC_REFCOUNT(le) = 1;
++              GC_SET_REFCOUNT(le, 1);
+ 
+               /* register new persistent connection */
+               if (zend_hash_str_update_mem(&EG(persistent_list), key, 
key_len, le, sizeof(*le)) == NULL) {
+@@ -779,7 +779,7 @@ static mmc_t *php_mmc_pool_addserver(
+               pool->failure_callback = &php_mmc_failure_callback;
+               list_res = zend_register_resource(pool, le_memcache_pool);
+               add_property_resource(mmc_object, "connection", list_res);
+-              GC_REFCOUNT(list_res)++;
++              GC_ADDREF(list_res);
+       }
+       else {
+               pool = zend_fetch_resource_ex(connection, "connection", 
le_memcache_pool);
+@@ -863,7 +863,7 @@ static void php_mmc_connect(INTERNAL_FUNCTION_PARAMETERS, 
zend_bool persistent)
+               mmc_object = return_value;
+               object_init_ex(mmc_object, memcache_ce);
+               add_property_resource(mmc_object, "connection", list_res);
+-              GC_REFCOUNT(list_res)++;
++              GC_ADDREF(list_res);
+       } else {
+               RETVAL_TRUE;
+       }