[Pkg-mediawiki-commits] [wikidiff2] 03/06: Remove php7 patch, included in upstream version

[Kunal Mehta]

This is an automated email from the git hooks/post-receive script.

legoktm-guest pushed a commit to branch master
in repository wikidiff2.

commit 0d370a516c9848c602aeabf1a847eff96bf6dc5d
Author: Kunal Mehta <legoktm at member.fsf.org>
Date:   Tue Aug 30 18:00:11 2016 -0700

    Remove php7 patch, included in upstream version
---
 debian/patches/php7.diff | 72 ------------------------------------------------
 debian/patches/series    |  1 -
 2 files changed, 73 deletions(-)

diff --git a/debian/patches/php7.diff b/debian/patches/php7.diff
deleted file mode 100644
index 22ec651..0000000
--- a/debian/patches/php7.diff
+++ /dev/null
@@ -1,72 +0,0 @@
-Index: wikidiff2-1.2+git03ea59f/php_wikidiff2.cpp
-===================================================================
---- wikidiff2-1.2+git03ea59f.orig/php_wikidiff2.cpp	2016-06-14 14:19:09.000000000 -0700
-+++ wikidiff2-1.2+git03ea59f/php_wikidiff2.cpp	2016-06-14 14:19:58.236052141 -0700
-@@ -12,6 +12,13 @@
- #include "TableDiff.h"
- #include "InlineDiff.h"
- 
-+
-+#if PHP_MAJOR_VERSION >= 7
-+#define COMPAT_RETURN_STRINGL(s, l) { RETURN_STRINGL(s, l); return; }
-+#else
-+#define COMPAT_RETURN_STRINGL(s, l) { RETURN_STRINGL(s, l, 1); return; }
-+#endif
-+
- static int le_wikidiff2;
- 
- zend_function_entry wikidiff2_functions[] = {
-@@ -81,9 +88,15 @@
- 	char *text1 = NULL;
- 	char *text2 = NULL;
- 	int argc = ZEND_NUM_ARGS();
-+#if PHP_MAJOR_VERSION >= 7
-+	size_t text1_len;
-+	size_t text2_len;
-+	zend_long numContextLines;
-+#else
- 	int text1_len;
- 	int text2_len;
- 	long numContextLines;
-+#endif
- 
- 	if (zend_parse_parameters(argc TSRMLS_CC, "ssl", &text1, &text1_len, &text2,
- 		&text2_len, &numContextLines) == FAILURE)
-@@ -96,8 +109,8 @@
- 		TableDiff wikidiff2;
- 		Wikidiff2::String text1String(text1, text1_len);
- 		Wikidiff2::String text2String(text2, text2_len);
--		const Wikidiff2::String & ret = wikidiff2.execute(text1String, text2String, numContextLines);
--		RETURN_STRINGL( const_cast<char*>(ret.data()), ret.size(), 1);
-+		const Wikidiff2::String & ret = wikidiff2.execute(text1String, text2String, (int)numContextLines);
-+		COMPAT_RETURN_STRINGL( const_cast<char*>(ret.data()), ret.size());
- 	} catch (std::bad_alloc &e) {
- 		zend_error(E_WARNING, "Out of memory in wikidiff2_do_diff().");
- 	} catch (...) {
-@@ -115,9 +128,15 @@
- 	char *text1 = NULL;
- 	char *text2 = NULL;
- 	int argc = ZEND_NUM_ARGS();
-+#if PHP_MAJOR_VERSION >= 7
-+	size_t text1_len;
-+	size_t text2_len;
-+	zend_long numContextLines;
-+#else
- 	int text1_len;
- 	int text2_len;
- 	long numContextLines;
-+#endif
- 
- 	if (zend_parse_parameters(argc TSRMLS_CC, "ssl", &text1, &text1_len, &text2,
- 		&text2_len, &numContextLines) == FAILURE)
-@@ -130,8 +149,8 @@
- 		InlineDiff wikidiff2;
- 		Wikidiff2::String text1String(text1, text1_len);
- 		Wikidiff2::String text2String(text2, text2_len);
--		const Wikidiff2::String& ret = wikidiff2.execute(text1String, text2String, numContextLines);
--		RETURN_STRINGL( const_cast<char*>(ret.data()), ret.size(), 1);
-+		const Wikidiff2::String& ret = wikidiff2.execute(text1String, text2String, (int)numContextLines);
-+		COMPAT_RETURN_STRINGL( const_cast<char*>(ret.data()), ret.size());
- 	} catch (std::bad_alloc &e) {
- 		zend_error(E_WARNING, "Out of memory in wikidiff2_inline_diff().");
- 	} catch (...) {
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index feb2158..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-php7.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/wikidiff2.git