From 5ed472c443993e651ddbf1cc07e157c1aabd5754 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 8 Aug 2023 09:38:32 -0400 Subject: [PATCH 1/9] php8.2: provide php-runtime vpkg. --- etc/defaults.virtual | 1 + srcpkgs/php8.2/template | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) 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/template b/srcpkgs/php8.2/template index 4efa06f503cac..5361112f81c10 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=1 +revision=2 _php_version=8.2 hostmakedepends="bison pkg-config apache-devel" makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel @@ -18,6 +18,7 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS" # at https://www.php.net/distributions/ distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz" checksum=6419b74e9b675c8d5a1afd2788c4d7996a19bbe2be409716ccb2067897af9df1 +provides="php-runtime-${version}_1" conf_files="/etc/php${_php_version}/php.ini" From 65391a0516031a10f5d93461a37a59a753b83e43 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 8 Aug 2023 09:38:26 -0400 Subject: [PATCH 2/9] php8.0: update to 8.0.30, provide php-runtime vpkg. --- srcpkgs/php8.0/patches/php-cross-config.patch | 8 ++++---- srcpkgs/php8.0/patches/php-opcache-cross.patch | 16 ++++++++-------- srcpkgs/php8.0/template | 5 +++-- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/srcpkgs/php8.0/patches/php-cross-config.patch b/srcpkgs/php8.0/patches/php-cross-config.patch index 24de8c58cbddb..10a6527ec3985 100644 --- a/srcpkgs/php8.0/patches/php-cross-config.patch +++ b/srcpkgs/php8.0/patches/php-cross-config.patch @@ -27,8 +27,8 @@ - if test -n "$PG_CONFIG"; then + if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5 - $as_echo "$PG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5 + printf "%s\n" "$PG_CONFIG" >&6; } PGSQL_INCLUDE=`$PG_CONFIG --includedir` @@ -58821,7 +58824,7 @@ $as_echo_n "checking for pg_config... " fi @@ -36,6 +36,6 @@ - if test -n "$PG_CONFIG"; then + if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5 - $as_echo "$PG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5 + printf "%s\n" "$PG_CONFIG" >&6; } PGSQL_INCLUDE=`$PG_CONFIG --includedir` diff --git a/srcpkgs/php8.0/patches/php-opcache-cross.patch b/srcpkgs/php8.0/patches/php-opcache-cross.patch index 5d8a8c5ceed51..37ae0cab3d90c 100644 --- a/srcpkgs/php8.0/patches/php-opcache-cross.patch +++ b/srcpkgs/php8.0/patches/php-opcache-cross.patch @@ -1,14 +1,14 @@ -diff --git a/configure b/configure.new -index 1159224b4c..29f763aa05 100755 +diff --git a/configure b/configure +index 7bfa593..a213fb2 100755 --- a/configure -+++ b/configure.new -@@ -51689,7 +51689,8 @@ $as_echo "$have_shm_ipc" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mmap() using MAP_ANON shared memory support" >&5 - $as_echo_n "checking for mmap() using MAP_ANON shared memory support... " >&6; } - if test "$cross_compiling" = yes; then : ++++ b/configure +@@ -54086,7 +54086,8 @@ printf "%s\n" "$have_shm_ipc" >&6; } + printf %s "checking for mmap() using MAP_ANON shared memory support... " >&6; } + if test "$cross_compiling" = yes + then : - have_shm_mmap_anon=no +$as_echo "#define HAVE_SHM_MMAP_ANON 1" >>confdefs.h + have_shm_mmap_anon=yes - else + else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template index c8c0045252290..f5ac76ab56694 100644 --- a/srcpkgs/php8.0/template +++ b/srcpkgs/php8.0/template @@ -1,6 +1,6 @@ # Template file for 'php8.0' pkgname=php8.0 -version=8.0.29 +version=8.0.30 revision=1 _php_version=8.0 hostmakedepends="bison pkg-config apache-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=db6ee08df5706365f624cde1cffb20ad6de1effe59d7e886337213a09f2e2684 +checksum=449d2048fcb20a314d8c218097c6d1047a9f1c5bb72aa54d5d3eba0a27a4c80c +provides="php-runtime-${version}_1" conf_files="/etc/php${_php_version}/php.ini" From 702fe2b9053b2200fc2f1aac3abb1fba010eb4fb Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 8 Aug 2023 09:38:29 -0400 Subject: [PATCH 3/9] php8.1: update to 8.1.22, provide php-runtime vpkg. --- srcpkgs/php8.1/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template index ccd5ead2dcafd..e01937ed7b434 100644 --- a/srcpkgs/php8.1/template +++ b/srcpkgs/php8.1/template @@ -1,6 +1,6 @@ # Template file for 'php8.1' pkgname=php8.1 -version=8.1.21 +version=8.1.22 revision=1 _php_version=8.1 hostmakedepends="bison pkg-config apache-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=f5140e94b139b4adec4b29c337537b7b6f1ef023197eb32be909e724e3da157a +provides="php-runtime-${version}_1" conf_files="/etc/php${_php_version}/php.ini" From 623a82e161787922d1854626fcd1f7bc0586fa13 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 8 Aug 2023 09:38:38 -0400 Subject: [PATCH 4/9] xdebug8.0: update to 3.2.2. --- srcpkgs/xdebug8.0/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xdebug8.0/template b/srcpkgs/xdebug8.0/template index 3f985f3ab75a6..500d05ee9869c 100644 --- a/srcpkgs/xdebug8.0/template +++ b/srcpkgs/xdebug8.0/template @@ -1,6 +1,6 @@ # Template file for 'xdebug8.0' pkgname=xdebug8.0 -version=3.2.1 +version=3.2.2 revision=1 build_style=gnu-configure configure_args="--with-php-config=/usr/bin/php-config8.0" @@ -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.0 From 95bd8f43eabeae9d97d37b7fd89ac003d4ee6990 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 8 Aug 2023 09:38:39 -0400 Subject: [PATCH 5/9] 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 5534a776ad6b0..ce32b6048d231 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 61e8315ea7b63543239f2a9722b39ce0db687d52 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 8 Aug 2023 09:38:41 -0400 Subject: [PATCH 6/9] 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 ce8bb81e83ca6..987802cbfa782 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 ec97089a121ee7b0a60d1d06ade341746f86c425 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 8 Aug 2023 09:38:50 -0400 Subject: [PATCH 7/9] 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 " 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 a04ea5124dfe82b65a0db69f974092829a6f974b Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 8 Aug 2023 09:38:55 -0400 Subject: [PATCH 8/9] 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 " license="GPL-3.0-or-later" From f1d480c91e47be49a634076d503864a6ff9f5754 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 8 Aug 2023 09:38:59 -0400 Subject: [PATCH 9/9] 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 " 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() {