[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/27: gnu: QPDF: Fix build with grep 3.8.
From: |
guix-commits |
Subject: |
01/27: gnu: QPDF: Fix build with grep 3.8. |
Date: |
Fri, 9 Sep 2022 11:08:12 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit fc398e1a741f0074b6043f8f525b695dd0f071ee
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Fri Sep 9 02:12:20 2022 +0200
gnu: QPDF: Fix build with grep 3.8.
This fixes a regression from commit
c527b0ce23c5d9228d29c5f90892aa5f05e77347.
* gnu/packages/pdf.scm (qpdf)[source](modules, snippet): New fields.
---
gnu/packages/pdf.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index cf4d9c872f..09ecd252bc 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -833,7 +833,18 @@ line tools for batch rendering @command{pdfdraw},
rewriting files
"/qpdf-" version ".tar.gz"))
(sha256
(base32
- "049q94rzlcbdr09rvl8xfj3924mk7rfm35x8cg4nisl4lnr27z78"))))
+ "049q94rzlcbdr09rvl8xfj3924mk7rfm35x8cg4nisl4lnr27z78"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin
+ ;; grep 3.8 emits a warning about 'egrep' being deprecated
+ ;; which breaks some tests. Adjust accordingly.
+ ;; Try removing this for QPDF >= 11.
+ (substitute* '("build-scripts/build-doc"
+ "qpdf/qtest/qpdf/diff-encrypted"
+ "qpdf/qtest/qpdf/diff-ignore-ID-version")
+ (("egrep")
+ "grep -E"))))))
(build-system gnu-build-system)
(arguments
(list
- branch core-updates updated (8ea970a945 -> 5fcbbe37c0), guix-commits, 2022/09/09
- 01/27: gnu: QPDF: Fix build with grep 3.8.,
guix-commits <=
- 02/27: gnu: inkscape: Fix build with Poppler 22.9.0., guix-commits, 2022/09/09
- 09/27: gnu: python-exceptiongroup: Disable tests., guix-commits, 2022/09/09
- 10/27: gnu: python-hypothesis: Update to 6.54.5., guix-commits, 2022/09/09
- 13/27: gnu: python-coverage: Update to 6.4.3., guix-commits, 2022/09/09
- 12/27: gnu: python-pytest: Use G-expression., guix-commits, 2022/09/09
- 03/27: gnu: gjs: Update to 1.73.2., guix-commits, 2022/09/09
- 04/27: gnu: serf: Build with the default scons., guix-commits, 2022/09/09
- 18/27: gnu: Remove python-pytest-forked-next., guix-commits, 2022/09/09
- 21/27: gnu: python-pytest-mock: Update to 3.8.2., guix-commits, 2022/09/09
- 07/27: gnu: python-pytest: Update to 7.1.3., guix-commits, 2022/09/09