From: the-eater <the-eater@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] xdebug: update to 3.0.4, remove php-pear in favour of pear (we bootstrapping now folks)
Date: Sun, 27 Jun 2021 15:19:28 +0200 [thread overview]
Message-ID: <20210627131928.6baJdyAd-m6JM-wsZlAPx8EpSgOztqS1pNtiqRZ7v08@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31679@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 826 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 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: 7297 bytes --]
From a47fc879bdab5066c03e4aed693fdbf61fbf75f5 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 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xdebug/template b/srcpkgs/xdebug/template
index c9b33a8fb79b..e80af2e45c01 100644
--- a/srcpkgs/xdebug/template
+++ b/srcpkgs/xdebug/template
@@ -1,16 +1,16 @@
# Template file for 'xdebug'
pkgname=xdebug
-version=2.9.3
+version=3.0.4
revision=1
build_style=gnu-configure
hostmakedepends="autoconf"
makedepends="php-devel"
short_desc="PHP debugging extension"
-maintainer="Alexander Mamay <alexander@mamay.su>"
+maintainer="eater <=@eater.me>"
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 33b251ad09b06ccd2bfac5849beb5e36102f3d29 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 02813850aae66fe4225ef21a1d239499eabb0db6 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-pear | 1 -
srcpkgs/php/template | 23 +++--------------------
2 files changed, 3 insertions(+), 21 deletions(-)
delete mode 120000 srcpkgs/php-pear
diff --git a/srcpkgs/php-pear b/srcpkgs/php-pear
deleted file mode 120000
index fa557ad95d0a..000000000000
--- a/srcpkgs/php-pear
+++ /dev/null
@@ -1 +0,0 @@
-php
\ No newline at end of file
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index bdc35ee2d846..a3ebec6e273b 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
@@ -9,7 +9,7 @@ makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel
libffi-devel oniguruma-devel gd-devel"
short_desc="HTML-embedded scripting language"
-maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
+maintainer="eater <=@eater.me>"
license="PHP-3.01"
homepage="https://www.php.net"
distfiles="http://www.php.net/distributions/php-${version}.tar.xz"
@@ -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}"
next prev parent reply other threads:[~2021-06-27 13:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-27 11:57 [PR PATCH] " the-eater
2021-06-27 13:01 ` [PR PATCH] [Updated] " the-eater
2021-06-27 13:19 ` the-eater [this message]
2021-06-27 13:22 ` the-eater
2021-06-27 14:40 ` [PR PATCH] [Updated] " the-eater
2021-07-04 3:27 ` [PR REVIEW] " ericonr
2021-07-04 3:27 ` ericonr
2021-07-04 3:27 ` ericonr
2021-07-04 3:27 ` ericonr
2022-05-24 2:13 ` github-actions
2022-06-08 2:11 ` [PR PATCH] [Closed]: " github-actions
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=20210627131928.6baJdyAd-m6JM-wsZlAPx8EpSgOztqS1pNtiqRZ7v08@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).