Re: [PR PATCH] [Updated] PHP updates and virtual package support

[TinfoilSubmarine <TinfoilSubmarine@users.noreply.github.com>]

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

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages maint/php-updates
https://github.com/void-linux/void-packages/pull/45493

PHP updates and virtual package support
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

Supersedes https://github.com/void-linux/void-packages/pull/44946

I need some help testing this as I don't use ampache or phpMyAdmin.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/php-updates-45493.patch --]
[-- Type: text/x-diff, Size: 9916 bytes --]

From 51edb9083a6eb5328c1b34f347ac45041eb734af Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:32 -0400
Subject: [PATCH 1/7] php8.2: update to 8.2.10, provide php-runtime vpkg.

---
 etc/defaults.virtual                          |  1 +
 srcpkgs/php8.2/patches/php-cross-config.patch | 14 +++++++-------
 srcpkgs/php8.2/template                       |  7 ++++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index f399b12998405..d99b416b041f5 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -28,6 +28,7 @@ nodejs-runtime nodejs
 ntp-daemon chrony
 phonon-backend phonon-backend-gstreamer
 phonon-qt5-backend phonon-qt5-backend-gstreamer
+php-runtime php8.2
 pipewire-session-manager pipewire-session-manager-bootstrap
 rkt-stage1 rkt-stage1-coreos
 smtp-server opensmtpd
diff --git a/srcpkgs/php8.2/patches/php-cross-config.patch b/srcpkgs/php8.2/patches/php-cross-config.patch
index 169c43f1df932..50d2cbba245cd 100644
--- a/srcpkgs/php8.2/patches/php-cross-config.patch
+++ b/srcpkgs/php8.2/patches/php-cross-config.patch
@@ -1,22 +1,22 @@
 diff --git a/configure b/configure
-index e4b82d1..1a8678f 100755
+index 3263d08..e5bdc2b 100755
 --- a/configure
 +++ b/configure
-@@ -62424,7 +62424,7 @@ printf %s "checking for pg_config... " >&6; }
+@@ -61090,7 +61090,7 @@ $as_echo_n "checking for pg_config... " >&6; }
      fi
    done
  
 -  if test -n "$PG_CONFIG"; then
 +  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
- printf "%s\n" "$PG_CONFIG" >&6; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ $as_echo "$PG_CONFIG" >&6; }
      PGSQL_INCLUDE=`$PG_CONFIG --includedir`
-@@ -63948,7 +63948,7 @@ printf %s "checking for pg_config... " >&6; }
+@@ -62616,7 +62616,7 @@ $as_echo_n "checking for pg_config... " >&6; }
      fi
    done
  
 -  if test -n "$PG_CONFIG"; then
 +  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
- printf "%s\n" "$PG_CONFIG" >&6; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ $as_echo "$PG_CONFIG" >&6; }
      PGSQL_INCLUDE=`$PG_CONFIG --includedir`
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index add04b4d3d562..16450e0a27362 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.2'
 pkgname=php8.2
-version=8.2.8
-revision=3
+version=8.2.10
+revision=1
 _php_version=8.2
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -17,7 +17,8 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
 # this is the source where the www.php.net code pulls the tarballs it serves
 # at https://www.php.net/distributions/
 distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=6419b74e9b675c8d5a1afd2788c4d7996a19bbe2be409716ccb2067897af9df1
+checksum=7e3e277d6eab652616f90bc7c75991179c0512953933ceba27496fb5514f7e78
+provides="php-runtime-${version}_1"
 
 conf_files="/etc/php${_php_version}/php.ini"
 

From 3af474197144b05a3b3d0953ace6b7ca20c08423 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:29 -0400
Subject: [PATCH 2/7] php8.1: update to 8.1.23, provide php-runtime vpkg.

---
 srcpkgs/php8.1/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 9e4cbfef1d4b9..1518ec7275668 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1'
 pkgname=php8.1
-version=8.1.21
-revision=3
+version=8.1.23
+revision=1
 _php_version=8.1
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -17,7 +17,8 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
 # this is the source where the www.php.net code pulls the tarballs it serves
 # at https://www.php.net/distributions/
 distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=a95f8d35924aa5705ad07a70dc994bf41b5d45126ecdec7aaad6edfbe5e1c37f
+checksum=ec5330b3978edc8fe2f78830720505bf69d12542622b5cddccee63ae3a0e5b58
+provides="php-runtime-${version}_1"
 
 conf_files="/etc/php${_php_version}/php.ini"
 

From c79d1d5f495234e1401a550e979ec2ebeaa7920b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:39 -0400
Subject: [PATCH 3/7] xdebug8.1: update to 3.2.2.

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

diff --git a/srcpkgs/xdebug8.1/template b/srcpkgs/xdebug8.1/template
index 31e615b5ccb5b..d8d13c0349040 100644
--- a/srcpkgs/xdebug8.1/template
+++ b/srcpkgs/xdebug8.1/template
@@ -1,6 +1,6 @@
 # Template file for 'xdebug8.1'
 pkgname=xdebug8.1
-version=3.2.1
+version=3.2.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-php-config=/usr/bin/php-config8.1"
@@ -12,7 +12,7 @@ license="PHP-3.0"
 homepage="http://xdebug.org"
 changelog="https://xdebug.org/updates"
 distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
-checksum=ef4cb3c228192798874e4530cccceee76840cc80821909740088a1e1a8f00445
+checksum=f48777371f90cbb315ea4ea082a1ede6765bcfb35d7d6356ab8f71fd6dfcc157
 
 pre_configure() {
 	phpize8.1

From 493bb84431d4e4d4fab872fc2cf49772aae66e2f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:41 -0400
Subject: [PATCH 4/7] xdebug8.2: update to 3.2.2.

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

diff --git a/srcpkgs/xdebug8.2/template b/srcpkgs/xdebug8.2/template
index c8c480b0317a6..94d61346db1eb 100644
--- a/srcpkgs/xdebug8.2/template
+++ b/srcpkgs/xdebug8.2/template
@@ -1,6 +1,6 @@
 # Template file for 'xdebug8.2'
 pkgname=xdebug8.2
-version=3.2.1
+version=3.2.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-php-config=/usr/bin/php-config8.2"
@@ -12,7 +12,7 @@ license="PHP-3.0"
 homepage="http://xdebug.org"
 changelog="https://xdebug.org/updates"
 distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
-checksum=ef4cb3c228192798874e4530cccceee76840cc80821909740088a1e1a8f00445
+checksum=f48777371f90cbb315ea4ea082a1ede6765bcfb35d7d6356ab8f71fd6dfcc157
 
 pre_configure() {
 	phpize8.2

From dd98a812dec68f8cd27c891e820b9c7f9d91c5ca Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:50 -0400
Subject: [PATCH 5/7] phpMyAdmin: update to 5.2.1, depend on php-runtime
 virtual package.

---
 srcpkgs/phpMyAdmin/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/phpMyAdmin/template b/srcpkgs/phpMyAdmin/template
index 7f0b5f024df54..dc9f179f89451 100644
--- a/srcpkgs/phpMyAdmin/template
+++ b/srcpkgs/phpMyAdmin/template
@@ -1,15 +1,15 @@
 # Template file for 'phpMyAdmin'
 pkgname=phpMyAdmin
-version=5.2.0
-revision=2
+version=5.2.1
+revision=1
 conf_files="/etc/webapps/phpMyAdmin/config.inc.php"
-depends="php8.1 mariadb"
+depends="virtual?php-runtime"
 short_desc="Web interface for MySQL and MariaDB"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="GPL-2.0-only"
 homepage="https://www.phpmyadmin.net"
 distfiles="https://files.phpmyadmin.net/phpMyAdmin/${version}/phpMyAdmin-${version}-all-languages.tar.xz"
-checksum=66da31ca295f06182ac3f2e6e96057dc824c459baedf4b29de6ed0d3be039230
+checksum=373f9599dfbd96d6fe75316d5dad189e68c305f297edf42377db9dd6b41b2557
 
 do_install() {
 	vmkdir usr/share/webapps/

From 463ae8968c810e3a75555328030067ac12cb652e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:55 -0400
Subject: [PATCH 6/7] phoronix-test-suite: depend on php-runtime virtual
 package.

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

diff --git a/srcpkgs/phoronix-test-suite/template b/srcpkgs/phoronix-test-suite/template
index 16b4034bec27b..341d406258426 100644
--- a/srcpkgs/phoronix-test-suite/template
+++ b/srcpkgs/phoronix-test-suite/template
@@ -1,8 +1,8 @@
 # Template file for 'phoronix-test-suite'
 pkgname=phoronix-test-suite
 version=10.8.4
-revision=2
-depends="php8.1"
+revision=3
+depends="virtual?php-runtime"
 short_desc="Comprehensive testing and benchmarking platform for Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 56994993ea196c5ab77fae78e218f5be67a452d2 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Aug 2023 09:38:59 -0400
Subject: [PATCH 7/7] ampache: update to 5.6.2, depend on php-runtime virtual
 package.

---
 srcpkgs/ampache/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ampache/template b/srcpkgs/ampache/template
index d820e758f355e..2587dc4ec6adf 100644
--- a/srcpkgs/ampache/template
+++ b/srcpkgs/ampache/template
@@ -1,16 +1,16 @@
 # Template file for 'ampache'
 pkgname=ampache
-version=5.5.1
+version=5.6.2
 revision=1
 create_wrksrc=yes
 hostmakedepends="unzip"
-depends="php8.1 mariadb"
+depends="virtual?php-runtime"
 short_desc="Web-based tool for managing your audio/video files"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later"
 homepage="https://ampache.org"
 distfiles="https://github.com/ampache/ampache/releases/download/${version}/${pkgname}-${version}_all.zip"
-checksum=3e37839058c263be990915759eecab9b5da3ec324638a7ff7d8094516f56a85c
+checksum=e406ff9de1537c3854ed9fad2ffdf854e193908617f8f409fa5de9036fed0927
 python_version=3
 
 do_install() {