From: the-eater <the-eater@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] php: update to 8.0.7 & xdebug: update to 3.0.4
Date: Sat, 26 Jun 2021 19:49:51 +0200 [thread overview]
Message-ID: <20210626174951.fL7OVeRxIqqOX3R1ZXmo_jhTbR59m0Sf3lyBoV7G0BE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31668@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 831 bytes --]
There is an updated pull request by the-eater against master on the void-packages repository
https://github.com/the-eater/neo-void-packages pkg/php/8.0.0
https://github.com/void-linux/void-packages/pull/31668
php: update to 8.0.7 & xdebug: update to 3.0.4
<!-- Mark items with [x] where applicable -->
#### 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/31668.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/php/8.0.0-31668.patch --]
[-- Type: text/x-diff, Size: 7380 bytes --]
From 0e76259d7bad11aef103fd92b81d33e7f2e131bb Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Thu, 3 Dec 2020 20:22:08 +0100
Subject: [PATCH 1/2] php: update to 8.0.7
---
srcpkgs/php/patches/php-cross-config.patch | 4 +--
srcpkgs/php/patches/php-opcache-cross.patch | 14 +++++++++
srcpkgs/php/template | 34 ++++++++++++---------
3 files changed, 35 insertions(+), 17 deletions(-)
create mode 100644 srcpkgs/php/patches/php-opcache-cross.patch
diff --git a/srcpkgs/php/patches/php-cross-config.patch b/srcpkgs/php/patches/php-cross-config.patch
index d6af2c58cb25..24de8c58cbdd 100644
--- a/srcpkgs/php/patches/php-cross-config.patch
+++ b/srcpkgs/php/patches/php-cross-config.patch
@@ -10,7 +10,7 @@
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+ -S PREFIX='$APXS_PREFIX' \
- -i -n php7"
+ -i -n php"
else
APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
@@ -6385,6 +6387,7 @@ IFS="- /.
@@ -18,7 +18,7 @@
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
+ -S PREFIX='$APXS_PREFIX' \
- -i -a -n php7"
+ -i -a -n php"
fi
@@ -57170,7 +57173,7 @@ $as_echo_n "checking for pg_config... "
diff --git a/srcpkgs/php/patches/php-opcache-cross.patch b/srcpkgs/php/patches/php-opcache-cross.patch
new file mode 100644
index 000000000000..5d8a8c5ceed5
--- /dev/null
+++ b/srcpkgs/php/patches/php-opcache-cross.patch
@@ -0,0 +1,14 @@
+diff --git a/configure b/configure.new
+index 1159224b4c..29f763aa05 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 :
+- have_shm_mmap_anon=no
++$as_echo "#define HAVE_SHM_MMAP_ANON 1" >>confdefs.h
++ have_shm_mmap_anon=yes
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index bdc35ee2d846..53ed33a29806 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,9 +1,9 @@
# Template file for 'php'
pkgname=php
-version=7.4.14
-revision=3
+version=8.0.7
+revision=1
hostmakedepends="bison pkg-config apache-devel"
-makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
+makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel
@@ -13,7 +13,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="PHP-3.01"
homepage="https://www.php.net"
distfiles="http://www.php.net/distributions/php-${version}.tar.xz"
-checksum=f9f3c37969fcd9006c1dbb1dd76ab53f28c698a1646fa2dde8547c3f45e02886
+checksum=d5fc2e4fc780a32404d88c360e3e0009bc725d936459668e9c2ac992f2d83654
conf_files="/etc/php/php.ini"
@@ -38,7 +38,6 @@ do_build() {
--with-config-file-scan-dir=/etc/php/conf.d \
--disable-rpath \
--mandir=/usr/share/man \
- --with-pear=/usr/share/pear \
"
local _phpextensions="--enable-bcmath=shared \
@@ -60,40 +59,36 @@ do_build() {
--enable-mysqlnd \
--enable-gd=shared \
--with-external-gd \
- --with-zip=shared \
--with-ffi=shared \
--with-bz2=shared,$XBPS_CROSS_BASE/usr/ \
--with-curl=shared \
--with-db4=$XBPS_CROSS_BASE/usr \
--with-enchant=shared,$XBPS_CROSS_BASE/usr \
- --with-freetype-dir=$XBPS_CROSS_BASE/usr \
--with-gdbm=$XBPS_CROSS_BASE/usr \
--with-gettext=shared \
--with-gmp=shared \
--with-iconv=shared \
- --with-icu-dir=$XBPS_CROSS_BASE/usr \
- --with-jpeg-dir=$XBPS_CROSS_BASE/usr \
--with-ldap=shared,$XBPS_CROSS_BASE/usr \
--with-ldap-sasl \
- --with-libzip \
--with-sodium=shared \
--with-mhash \
--with-mysql-sock=/run/mysqld/mysqld.sock \
--with-mysqli=shared,mysqlnd \
--with-openssl=shared \
- --with-pcre-regex=$XBPS_CROSS_BASE/usr \
+ --with-external-pcre \
+ --with-pear \
--with-pdo-mysql=shared,mysqlnd \
--with-pdo-odbc=shared,unixODBC,$XBPS_CROSS_BASE/usr \
--with-pdo-pgsql=shared,$XBPS_CROSS_BASE/usr \
--with-pdo-sqlite=shared,$XBPS_CROSS_BASE/usr \
--with-pgsql=shared,$XBPS_CROSS_BASE/usr \
- --with-png-dir=$XBPS_CROSS_BASE/usr \
--with-readline=$XBPS_CROSS_BASE/usr \
--with-snmp=shared,$XBPS_CROSS_BASE/usr \
--with-sqlite3=shared,$XBPS_CROSS_BASE/usr \
--with-unixODBC=shared,$XBPS_CROSS_BASE/usr \
--with-xsl=shared,$XBPS_CROSS_BASE/usr \
--with-tidy=shared,$XBPS_CROSS_BASE/usr \
+ --with-zip=shared \
--with-zlib \
${configure_args} \
"
@@ -180,10 +175,10 @@ php-cgi_package() {
php-apache_package() {
short_desc+=' - Apache SAPI'
depends="php-${version}_${revision}"
- conf_files="/etc/apache/extra/php7_module.conf"
+ conf_files="/etc/apache/extra/php8_module.conf"
pkg_install() {
- vinstall ${wrksrc}/build-apache/libs/libphp7.so 755 usr/libexec/httpd/modules
- vinstall ${FILESDIR}/apache.conf 644 etc/apache/extra php7_module.conf
+ vinstall ${wrksrc}/build-apache/libs/libphp.so 755 usr/libexec/httpd/modules
+ vinstall ${FILESDIR}/apache.conf 644 etc/apache/extra php8_module.conf
}
}
@@ -219,6 +214,15 @@ php-pear_package() {
if [ -n "$CROSS_BUILD" ]; then
_env+=" PEAR_PHP=/usr/bin/php"
fi
+ # Open bug since July, hacky fix
+ # Bug: https://bugs.php.net/bug.php?id=79869
+ # Proposed fix: https://github.com/pear/PHP_Archive/pull/4
+
+ # This will download the pear installer but ultimately fail because of syntax errors
+ make install-pear ${_env} || true;
+ # Patch the syntax error and remove some spaces to keep the length the same and the zip valid
+ sed -i 's: \$flags \& 0x00010000:\$flags[1]\&0x00010000:' pear/install-pear-nozlib.phar
+
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}
From 1787552613b4a3b2ca219549001aba2daf17cc07 Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Thu, 3 Dec 2020 21:25:18 +0100
Subject: [PATCH 2/2] 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"
next prev parent reply other threads:[~2021-06-26 17:49 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-26 17:30 [PR PATCH] " the-eater
2021-06-26 17:49 ` the-eater [this message]
2021-06-26 19:56 ` [PR REVIEW] " ericonr
2021-06-26 19:56 ` ericonr
2021-06-26 19:56 ` ericonr
2021-06-26 19:59 ` the-eater
2021-06-26 22:30 ` the-eater
2021-06-26 22:38 ` [PR PATCH] [Updated] " the-eater
2021-06-26 22:53 ` [PR REVIEW] " the-eater
2021-06-27 4:05 ` ericonr
2021-06-27 4:05 ` ericonr
2021-06-27 4:05 ` ericonr
2021-06-27 4:05 ` ericonr
2021-06-27 4:05 ` ericonr
2021-06-27 4:05 ` ericonr
2021-06-27 8:15 ` paper42
2021-06-27 9:04 ` [PR REVIEW] " the-eater
2021-06-27 9:08 ` the-eater
2021-06-27 11:37 ` the-eater
2021-06-27 11:41 ` [PR PATCH] [Updated] " the-eater
2021-06-27 11:58 ` [PR PATCH] [Closed]: " the-eater
2021-06-27 14:22 ` [PR REVIEW] " ericonr
2021-06-27 14:48 ` the-eater
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210626174951.fL7OVeRxIqqOX3R1ZXmo_jhTbR59m0Sf3lyBoV7G0BE@z \
--to=the-eater@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).