From f47a1efa49aebcbd619979ac12904b18c926ef98 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 29 May 2018 15:36:48 +0200
Subject: update to 2.4.0 drop patches merged upstream

---
 19.patch | 44 --------------------------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 19.patch

(limited to '19.patch')

diff --git a/19.patch b/19.patch
deleted file mode 100644
index 8173a74..0000000
--- a/19.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 72f8c65cb52859762d792eb80bde32129011bc09 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Thu, 22 Mar 2018 13:16:14 +0100
-Subject: [PATCH] add dependency on json extension
-
----
- .gitignore | 1 +
- config.m4  | 1 +
- nsq.c      | 9 ++++++++-
- 3 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/config.m4 b/config.m4
-index 9af9b72..c9227a9 100644
---- a/config.m4
-+++ b/config.m4
-@@ -112,4 +112,5 @@ echo "libevent-path:$LIBEVENT_DIR";
-   PHP_SUBST(NSQ_SHARED_LIBADD)
- 
-   PHP_NEW_EXTENSION(nsq, nsq.c pub.c nsq_lookupd.c message.c sub.c command.c common.c, $ext_shared)
-+  PHP_ADD_EXTENSION_DEP(nsq, json, true)
- fi
-diff --git a/nsq.c b/nsq.c
-index df15306..1b43bae 100644
---- a/nsq.c
-+++ b/nsq.c
-@@ -493,10 +493,17 @@ PHP_MINFO_FUNCTION (nsq)
- }
- /* }}} */
- 
-+static const zend_module_dep nsq_deps[] = {
-+    ZEND_MOD_REQUIRED("json")
-+    ZEND_MOD_END
-+};
-+
- /* {{{ nsq_module_entry
-  */
- zend_module_entry nsq_module_entry = {
--    STANDARD_MODULE_HEADER,
-+    STANDARD_MODULE_HEADER_EX,
-+    NULL,
-+    nsq_deps,
-     "nsq",
-     NULL, //nsq_functions,
-     PHP_MINIT(nsq),
-- 
cgit