From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] grep: update to 3.8.
Date: Sun, 18 Sep 2022 13:38:54 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39340@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1222 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages grep-3.8
https://github.com/void-linux/void-packages/pull/39340
grep: update to 3.8.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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, x86_64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- ppc-musl (cross)
- mips-musl (cross)
A patch file from https://github.com/void-linux/void-packages/pull/39340.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-grep-3.8-39340.patch --]
[-- Type: text/x-diff, Size: 2124 bytes --]
From 39bb9281bc1c0d70de95b1c9f3476176f0d2e0b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 18 Sep 2022 13:30:30 +0200
Subject: [PATCH] grep: update to 3.8.
---
srcpkgs/grep/patches/ppc-musl.patch | 14 --------------
srcpkgs/grep/template | 8 ++++----
2 files changed, 4 insertions(+), 18 deletions(-)
delete mode 100644 srcpkgs/grep/patches/ppc-musl.patch
diff --git a/srcpkgs/grep/patches/ppc-musl.patch b/srcpkgs/grep/patches/ppc-musl.patch
deleted file mode 100644
index 6ba37f233591..000000000000
--- a/srcpkgs/grep/patches/ppc-musl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/lib/sigsegv.c
-+++ b/lib/sigsegv.c
-@@ -221,8 +221,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
- /* both should be equivalent */
- # if 0
- # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
--# else
-+# elif defined(__GLIBC__)
- # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
-+# else
-+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1]
- # endif
- # endif
-
diff --git a/srcpkgs/grep/template b/srcpkgs/grep/template
index 7bab5c9c28e6..04b2f7c56ac0 100644
--- a/srcpkgs/grep/template
+++ b/srcpkgs/grep/template
@@ -1,22 +1,22 @@
# Template file for 'grep'
pkgname=grep
-version=3.7
+version=3.8
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
-makedepends="pcre-devel"
+makedepends="pcre2-devel"
checkdepends="perl"
short_desc="GNU grep utility"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/grep/"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
+checksum=498d7cc1b4fb081904d87343febb73475cf771e424fb7e6141aff66013abc382
pre_check() {
case "$XBPS_TARGET_MACHINE" in
*-musl)
# Disable locale tests that fail on musl
- sed -i '/test-localename$(EXEEXT)/d' gnulib-tests/Makefile
+ vsed -i '/test-localename$(OBJEXT)/d' gnulib-tests/Makefile
esac
}
next reply other threads:[~2022-09-18 11:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-18 11:38 paper42 [this message]
2022-09-18 11:53 ` [PR PATCH] [Updated] " paper42
2022-09-18 18:28 ` loreb
2022-09-18 19:04 ` [PR PATCH] [Updated] " paper42
2022-09-18 19:05 ` paper42
2022-09-21 17:24 ` [PR PATCH] [Merged]: " leahneukirchen
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39340@inbox.vuxu.org \
--to=paper42@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).