From 6efe2631501b12ae18c4900b8c422d744fd05066 Mon Sep 17 00:00:00 2001
From: Laurent Laville <laurent.laville@gmail.com>
Date: Sat, 10 Jul 2021 07:03:33 +0200
Subject: [PATCH 1/5] fix typo error in comment

---
 install-php-extensions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install-php-extensions b/install-php-extensions
index 2e74eca..0ddec5c 100755
--- a/install-php-extensions
+++ b/install-php-extensions
@@ -1593,7 +1593,7 @@ installRemoteModule() {
 				if test $PHP_MAJMIN_VERSION -ge 800; then
 					installRemoteModule_version=beta
 				elif test "$DISTRO_VERSION" = debian@8; then
-					# in Debian Jessie we have librammitmq version 0.5.2
+					# in Debian Jessie we have librabbitmq version 0.5.2
 					installRemoteModule_version=1.9.3
 				elif test $PHP_MAJMIN_VERSION -le 505; then
 					installRemoteModule_version=1.9.4

From 9f17f4d27704907658343903b2071cf82a95b4c1 Mon Sep 17 00:00:00 2001
From: Laurent Laville <laurent.laville@gmail.com>
Date: Sat, 10 Jul 2021 08:59:08 +0200
Subject: [PATCH 2/5] add new xmldiff extension

---
 data/supported-extensions |  1 +
 install-php-extensions    | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/data/supported-extensions b/data/supported-extensions
index 6d81c9c..6fa8e1c 100644
--- a/data/supported-extensions
+++ b/data/supported-extensions
@@ -96,6 +96,7 @@ wddx 5.5 5.6 7.0 7.1 7.2 7.3
 xdebug 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1
 xhprof 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1
 xlswriter 7.0 7.1 7.2 7.3 7.4 8.0
+xmldiff 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1
 xmlrpc 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1
 xsl 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1
 yaml 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1
diff --git a/install-php-extensions b/install-php-extensions
index 0ddec5c..1d35852 100755
--- a/install-php-extensions
+++ b/install-php-extensions
@@ -926,6 +926,12 @@ buildRequiredPackageLists() {
 			xlswriter@debian)
 				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile zlib1g-dev"
 				;;
+			xmldiff@alpine)
+				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libxml2-dev"
+				;;
+			xmldiff@debian)
+				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libxml2-dev"
+				;;
 			xmlrpc@alpine)
 				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libxml2-dev"
 				;;
@@ -2238,6 +2244,10 @@ installRemoteModule() {
 				fi
 			fi
 			;;
+		xmldiff)
+			# whether to use system diffmark library
+			addConfigureOption 'with-libdiffmark' 'yes'
+			;;
 		xlswriter)
 			if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" 1.2.7) -ge 0; then
 				# enable reader supports?

From fefe3c4fd5dd296bb5724dedec86805a6a58d988 Mon Sep 17 00:00:00 2001
From: Laurent Laville <laurent.laville@gmail.com>
Date: Sun, 11 Jul 2021 08:31:03 +0200
Subject: [PATCH 3/5] add library libstdc++ for alpine distro missing to load
 xmldiff extension

---
 install-php-extensions | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install-php-extensions b/install-php-extensions
index 1d35852..8073322 100755
--- a/install-php-extensions
+++ b/install-php-extensions
@@ -927,6 +927,7 @@ buildRequiredPackageLists() {
 				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile zlib1g-dev"
 				;;
 			xmldiff@alpine)
+				buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libstdc++"
 				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libxml2-dev"
 				;;
 			xmldiff@debian)

From b9f5049d92fe244dd3b5492dfce5fbf42914ebe8 Mon Sep 17 00:00:00 2001
From: Laurent Laville <laurent.laville@gmail.com>
Date: Sun, 11 Jul 2021 08:49:56 +0200
Subject: [PATCH 4/5] do not use diffmark with PHP 8.x (not yet supported)

---
 install-php-extensions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install-php-extensions b/install-php-extensions
index 8073322..9f7e401 100755
--- a/install-php-extensions
+++ b/install-php-extensions
@@ -2246,8 +2246,8 @@ installRemoteModule() {
 			fi
 			;;
 		xmldiff)
-			# whether to use system diffmark library
-			addConfigureOption 'with-libdiffmark' 'yes'
+			# whether to use system diffmark library (not yet supported with PHP 8.x)
+			addConfigureOption 'with-libdiffmark' 'no'
 			;;
 		xlswriter)
 			if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" 1.2.7) -ge 0; then

From 9be30b99b5bf9f0ea45421eae77ce67e2893a485 Mon Sep 17 00:00:00 2001
From: Michele Locati <michele@locati.it>
Date: Mon, 12 Jul 2021 09:05:25 +0200
Subject: [PATCH 5/5] Remove with-libdiffmark configure option

It's not defined in package.xml, so pecl won't be able to set it
---
 install-php-extensions | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/install-php-extensions b/install-php-extensions
index 9f7e401..2d8ec5b 100755
--- a/install-php-extensions
+++ b/install-php-extensions
@@ -2245,10 +2245,6 @@ installRemoteModule() {
 				fi
 			fi
 			;;
-		xmldiff)
-			# whether to use system diffmark library (not yet supported with PHP 8.x)
-			addConfigureOption 'with-libdiffmark' 'no'
-			;;
 		xlswriter)
 			if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" 1.2.7) -ge 0; then
 				# enable reader supports?