commit: 5e850fa723a5ed727bc209b633aa6838e162b129 Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> AuthorDate: Thu Mar 25 18:53:14 2021 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Thu Mar 25 18:53:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e850fa7
app-misc/jq-1.7_pre20201109: Add patch for git bdep (bug #776385) Closes: https://bugs.gentoo.org/776385 Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch | 13 +++++++++++++ app-misc/jq/jq-1.7_pre20201109.ebuild | 2 ++ 2 files changed, 15 insertions(+) diff --git a/app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch b/app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch new file mode 100644 index 00000000000..726624df13d --- /dev/null +++ b/app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 0441d4a..592ceb9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,8 +1,3 @@ +-m4_define([jq_version], +- m4_esyscmd_s([(git rev-parse --verify -q jq-1.0 > /dev/null && +- (git describe --tags --dirty --match 'jq-*'|sed 's/^jq-//')) || +- echo `git rev-parse --abbrev-ref HEAD`-`git describe --always --dirty`]))) +- + AC_INIT([jq], [jq_version], [https://github.com/stedolan/jq/issues], + [jq], [https://stedolan.github.io/jq]) + diff --git a/app-misc/jq/jq-1.7_pre20201109.ebuild b/app-misc/jq/jq-1.7_pre20201109.ebuild index 41e4b14e2af..22f1f4f05b5 100644 --- a/app-misc/jq/jq-1.7_pre20201109.ebuild +++ b/app-misc/jq/jq-1.7_pre20201109.ebuild @@ -34,6 +34,8 @@ PATCHES=( "${FILESDIR}"/jq-1.7-runpath.patch "${FILESDIR}"/jq-1.7-warnings.patch "${FILESDIR}"/jq-1.7-visible-null.patch + # https://bugs.gentoo.org/776385 + "${FILESDIR}"/jq-1.7_pre20201109-no-git-bdep.patch ) RESTRICT="!test? ( test )"
