[PR PATCH] xdebug: update to 3.0.4, remove php-pear in favour of pear (we bootstrapping now folks)

[the-eater <the-eater@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 821 bytes --]

There is a new pull request by the-eater against master on the void-packages repository

https://github.com/the-eater/neo-void-packages php/xdebug-pear-update
https://github.com/void-linux/void-packages/pull/31679

xdebug: update to 3.0.4, remove php-pear in favour of pear (we bootstrapping now folks)
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

A patch file from https://github.com/void-linux/void-packages/pull/31679.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-php/xdebug-pear-update-31679.patch --]
[-- Type: text/x-diff, Size: 6485 bytes --]

From 79142db7524be1fbabaa70a6b68d3de650141310 Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Thu, 3 Dec 2020 21:25:18 +0100
Subject: [PATCH 1/3] xdebug: update to 3.0.4

---
 srcpkgs/xdebug/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xdebug/template b/srcpkgs/xdebug/template
index c9b33a8fb79b..9e1e2b897132 100644
--- a/srcpkgs/xdebug/template
+++ b/srcpkgs/xdebug/template
@@ -1,6 +1,6 @@
 # Template file for 'xdebug'
 pkgname=xdebug
-version=2.9.3
+version=3.0.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf"
@@ -10,7 +10,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="PHP-3.0"
 homepage="http://xdebug.org"
 distfiles="http://xdebug.org/files/${pkgname}-${version,,}.tgz"
-checksum=a63f567f2238d75a2244c2a4bd6f5abee817280b3567f9006c99481488dc977c
+checksum=b27290491f4634b0cd3badfc3a2be98fb1e3c0c3710a706724d8b195baad72af
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" php-devel"

From aa8a0029376e44247a85e10f0d31c74d30ead498 Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Sun, 27 Jun 2021 00:34:08 +0200
Subject: [PATCH 2/3] New package: pear-1.10.12

---
 srcpkgs/pear/template | 91 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 srcpkgs/pear/template

diff --git a/srcpkgs/pear/template b/srcpkgs/pear/template
new file mode 100644
index 000000000000..07b651e9acea
--- /dev/null
+++ b/srcpkgs/pear/template
@@ -0,0 +1,91 @@
+# Template file for 'pear'
+pkgname=pear
+version=1.10.12
+revision=1
+_version_xml_util=1.4.5
+_version_console_getopt=1.4.3
+_version_archive_tar=1.4.13
+_version_structures_graph=1.1.1
+_version_php_archive=0.14.0
+wrksrc="pear-core-${version}"
+hostmakedepends="php tar"
+depends="php"
+conf_files="/etc/php/pear.conf"
+short_desc="PEAR - PHP Extension and Application Repository"
+maintainer="eater <=@eater.me>"
+license="BSD-2-Clause"
+homepage="https://pear.php.net/"
+distfiles="
+	https://github.com/pear/pear-core/archive/refs/tags/v${version}.tar.gz
+	http://download.pear.php.net/package/PEAR-${version}.tgz
+	http://download.pear.php.net/package/XML_Util-${_version_xml_util}.tgz
+	http://download.pear.php.net/package/Console_Getopt-${_version_console_getopt}.tgz
+	http://download.pear.php.net/package/Archive_Tar-${_version_archive_tar}.tgz
+	http://download.pear.php.net/package/Structures_Graph-${_version_structures_graph}.tgz
+	http://download.pear.php.net/package/PHP_Archive-${_version_php_archive}.tgz"
+checksum="775e04b3897531852454638aa24c2a38627241c97884faf10ad9bf7ca9faf65a
+	df363c5e6091334c43f560eec2f220be2f8044eb5d422204a715adc4663ba923
+	e0f8736cb47ce9dd32814de45425ff03ad55a72ba8bb757e42c456f861feedf6
+	54bdfb7c2c958cbd7e1e8f1b964b95c3bfbf3b2779052523011b4ee49d7dfacd
+	2752e19121573a9e17be9514f855785df9d56768ebdeade85588913e502e829e
+	3b19abac379883f095c11fe2e5550cb61691b868f3d96573f6ed564be82fa08e
+	59fd3aead80bdd9fec6c232710754b92516a36c2845e0745b96c4aea9d2d5768"
+skip_extraction="PEAR-${version}.tgz
+	XML_Util-${_version_xml_util}.tgz
+	Console_Getopt-${_version_console_getopt}.tgz
+	Archive_Tar-${_version_archive_tar}.tgz
+	Structures_Graph-${_version_structures_graph}.tgz
+	PHP_Archive-${_version_php_archive}.tgz"
+replaces="php-pear>=0"
+
+post_extract() {
+	mkdir -p go-pear-tarballs/src;
+	for pear in ${XBPS_SRCDISTDIR}/${pkgname}-${version}/*.tgz; do
+		# PHP_Archive is only needed for creation
+		if [[ "$pear" = *'PHP_Archive'* ]]; then
+			tar -C go-pear-tarballs/src -xf "${pear}"
+			continue
+		else
+			tar --strip-components=1 -C go-pear-tarballs/src -xf "${pear}"
+		fi
+
+		pearname="$(basename "${pear}")"
+		pearname="${pearname//tgz/tar.gz}"
+
+		cp "${pear}" "go-pear-tarballs/${pearname}"
+		# the phar needs naked tar's
+		gunzip "go-pear-tarballs/${pearname}"
+	done
+
+	# PHP_Archive classes are expected to be at PHP/Archive but it is not
+	mv "go-pear-tarballs/src/PHP_Archive-${_version_php_archive}" go-pear-tarballs/src/PHP
+}
+
+post_patch() {
+	# PEAR would normally replace these, but we're pearless at this point
+	vsed -i 's:\(.\)@data_dir@/PHP_Archive/:__DIR__ . \1/../:;s:@API-VER@:1.1.0:' \
+		go-pear-tarballs/src/PHP/Archive/Creator.php
+}
+
+do_build() {
+	php -d include_path=".:${wrksrc}/go-pear-tarballs/src" make-installpear-nozlib-phar.php
+}
+
+do_install() {
+	mkdir -p ${DESTDIR}/usr/share/pear
+	INSTALL_ROOT="${DESTDIR}" php \
+		-n \
+		-dshort_open_tag=0 \
+		-dopen_basedir= \
+		-derror_reporting=1803 \
+		-dmemory_limit=-1 \
+		-ddetect_unicode=0 \
+		-dextension=phar \
+		install-pear-nozlib.phar -d /usr/share/pear -b /usr/bin
+
+	# clean up created database files
+	rm -r ${DESTDIR}/.{channels,depdb,depdblock,filemap,lock,registry}
+	rm -r ${DESTDIR}/usr/share/pear/.{channels,filemap,lock,registry}
+
+	vlicense LICENSE
+}

From 951c1869c0528e5db068e3c86882b78b17c93036 Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Sun, 27 Jun 2021 13:56:23 +0200
Subject: [PATCH 3/3] php: remove php-pear (replaced by pear)

---
 srcpkgs/php/template | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index bdc35ee2d846..9b81006faba7 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.14
-revision=3
+revision=4
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
@@ -38,7 +38,7 @@ do_build() {
 		--with-config-file-scan-dir=/etc/php/conf.d \
 		--disable-rpath \
 		--mandir=/usr/share/man \
-		--with-pear=/usr/share/pear \
+		--without-pear \
 		"
 
 	local _phpextensions="--enable-bcmath=shared \
@@ -208,23 +208,6 @@ php-embed_package() {
 	}
 }
 
-php-pear_package() {
-	lib32disabled=yes
-	depends="php-${version}_${revision}"
-	short_desc+=' - PHP Extension and Application Repository'
-	conf_files="/etc/php/pear.conf"
-	pkg_install() {
-		cd ${wrksrc}/build
-		local _env="INSTALL_ROOT=${PKGDESTDIR}"
-		if [ -n "$CROSS_BUILD" ]; then
-			_env+=" PEAR_PHP=/usr/bin/php"
-		fi
-		make install-pear ${_env}
-		rm -rf ${PKGDESTDIR}/.{channels,depdb,depdblock,filemap,lock,registry}
-		rm -rf ${PKGDESTDIR}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry}
-	}
-}
-
 php-enchant_package() {
 	lib32disabled=yes
 	depends="php-${version}_${revision}"