Github messages for voidlinux
 help / color / mirror / Atom feed
From: subnut <subnut@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] php8.1: update to 8.1.8, add changelog URL, fix man pages
Date: Sun, 10 Jul 2022 11:09:54 +0200	[thread overview]
Message-ID: <20220710090954.JSYe4QaktDBEb2yYh2wgCia2PBjbFCWRBCHuCDmnKPM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37949@inbox.vuxu.org>

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

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

https://github.com/subnut/void-packages php8.1
https://github.com/void-linux/void-packages/pull/37949

php8.1: update to 8.1.8, add changelog URL, fix man pages
The changelog URL points to the changelog for $version because the
changelog in the master branch contains the details of many alpha and RC
releases, which makes it difficult to find the changelog corresponding
to the current pkgver.


Replace man pages containing only a single `.so` directive with
symlinks to the intended man page.


<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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, (x86_64-glibc)
<!--
- 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/37949.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-php8.1-37949.patch --]
[-- Type: text/x-diff, Size: 2565 bytes --]

From 3ecaa4d42c72be2b4cdf5884911d71b41b68a580 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 10 Jul 2022 00:08:58 +0530
Subject: [PATCH 1/2] php8.1: fix man pages

---
 srcpkgs/php8.1/template | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index e2f1ed0807d2..2d603568a9ca 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.7
-revision=2
+revision=3
 _php_version=8.1
 wrksrc="php-${version}"
 hostmakedepends="bison pkg-config apache-devel"
@@ -34,6 +34,18 @@ if [ -n "$CROSS_BUILD" ]; then
 		 -DHAVE_SHM_MMAP_FILE"
 fi
 
+post_extract() {
+	# Fix .so links in man pages
+	#
+	# This is needed because of the configure option -
+	#     --program-suffix=${_php_version}
+	#
+	_regexp='^[[:space:]]*\.so[[:space:]]'
+	for file in $(grep -l -e "$_regexp" -R .); do
+		vsed -i "$file" -e "/$_regexp/"'s=^[[:space:]]*\.[^.]*=&'${_php_version}=
+	done
+}
+
 do_build() {
 	local _phpconfig="--srcdir=.. \
 		--config-cache \

From 8eaaa0ddf4bede923550ea778ad7a4e22ecff031 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 10 Jul 2022 01:05:39 +0530
Subject: [PATCH 2/2] php8.1: update to 8.1.8, add changelog URL

The changelog URL points to the changelog for $version because the
changelog in the master branch contains the details of many alpha and RC
releases, which makes it difficult to find the changelog corresponding
to the current pkgver.
---
 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 2d603568a9ca..fac320d8ca1c 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.7
-revision=3
+version=8.1.8
+revision=1
 _php_version=8.1
 wrksrc="php-${version}"
 hostmakedepends="bison pkg-config apache-devel"
@@ -14,8 +14,9 @@ short_desc="HTML-embedded scripting language"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="PHP-3.01"
 homepage="https://www.php.net"
+changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
 distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=5f0b422a117633c86d48d028934b8dc078309d4247e7565ea34b2686189abdd8
+checksum=889d910558d2492f7f2236921b9bcde620674c8b684ec02d126060f8ca45dc8d
 
 conf_files="/etc/php${_php_version}/php.ini"
 

  parent reply	other threads:[~2022-07-10  9:09 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-09 18:47 [PR PATCH] php8.1: update to 8.1.8, add changelog URL, fix manpages subnut
2022-07-09 18:47 ` [PR PATCH] [Updated] " subnut
2022-07-09 18:50 ` subnut
2022-07-09 19:36 ` [PR PATCH] [Updated] php8.1: update to 8.1.8, add changelog URL subnut
2022-07-10  5:58 ` subnut
2022-07-10  6:27 ` [PR PATCH] [Updated] php8.1: update to 8.1.8, add changelog URL, fix man pages subnut
2022-07-10  7:15 ` meator
2022-07-10  9:09 ` subnut [this message]
2022-07-10  9:13 ` subnut
2022-07-19 10:44 ` subnut
2022-07-19 13:06 ` [PR REVIEW] " TinfoilSubmarine
2022-07-19 14:57 ` subnut
2022-07-19 15:01 ` subnut
2022-07-19 15:07 ` subnut
2022-07-19 15:29 ` classabbyamp
2022-07-19 15:30 ` classabbyamp
2022-07-20 11:56 ` [PR PATCH] [Updated] " subnut
2022-07-20 12:15 ` [PR REVIEW] " subnut
2022-07-20 12:16 ` subnut
2022-07-20 12:16 ` subnut
2022-07-21  3:44 ` classabbyamp
2022-07-21 10:09 ` subnut
2022-08-03 22:52 ` [PR PATCH] [Merged]: " paper42

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=20220710090954.JSYe4QaktDBEb2yYh2wgCia2PBjbFCWRBCHuCDmnKPM@z \
    --to=subnut@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).