commit: 20e7a9908e2d0a64163d077c2bc3842b634fff40 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Fri May 5 15:15:38 2023 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Fri May 5 16:24:05 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20e7a990
sys-apps/accountsservice: fix generate-version.sh When configuring accountsservice inside of a tarball the generate-version.sh script fails because of the missing .git directory. Closes: https://bugs.gentoo.org/905770 Upstream-PR: https://gitlab.freedesktop.org/accountsservice/accountsservice/-/merge_requests/136 Upstream-Commit: https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/c9c16b3c47e13e90bb2213141f6f309e2d474396 Signed-off-by: orbea <orbea <AT> riseup.net> Closes: https://github.com/gentoo/gentoo/pull/30881 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> .../accountsservice/accountsservice-23.13.9.ebuild | 1 + .../accountsservice-23.13.9-generate-version.patch | 30 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/sys-apps/accountsservice/accountsservice-23.13.9.ebuild b/sys-apps/accountsservice/accountsservice-23.13.9.ebuild index 3493cd098504..c53af7eb9bda 100644 --- a/sys-apps/accountsservice/accountsservice-23.13.9.ebuild +++ b/sys-apps/accountsservice/accountsservice-23.13.9.ebuild @@ -52,6 +52,7 @@ RDEPEND="${CDEPEND} PATCHES=( "${FILESDIR}"/${PN}-22.04.62-gentoo-system-users.patch + "${FILESDIR}"/${PN}-23.13.9-generate-version.patch #905770 ) python_check_deps() { diff --git a/sys-apps/accountsservice/files/accountsservice-23.13.9-generate-version.patch b/sys-apps/accountsservice/files/accountsservice-23.13.9-generate-version.patch new file mode 100644 index 000000000000..162b914b1828 --- /dev/null +++ b/sys-apps/accountsservice/files/accountsservice-23.13.9-generate-version.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/905770 +https://gitlab.freedesktop.org/accountsservice/accountsservice/-/merge_requests/136 +https://gitlab.freedesktop.org/accountsservice/accountsservice/-/commit/c9c16b3c47e13e90bb2213141f6f309e2d474396 + +From c9c16b3c47e13e90bb2213141f6f309e2d474396 Mon Sep 17 00:00:00 2001 +From: orbea <[email protected]> +Date: Fri, 5 May 2023 07:43:48 -0700 +Subject: [PATCH] generate-version.sh: fix script inside of a tarball + +--- + generate-version.sh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/generate-version.sh b/generate-version.sh +index 3f88bff..8375c86 100755 +--- a/generate-version.sh ++++ b/generate-version.sh +@@ -4,11 +4,10 @@ exec 3>&2 2> /dev/null + SRCDIR=$(dirname "$0") + cd "$SRCDIR" + CWD=$(realpath "$PWD") +-TOPLEVEL_WORKING_DIR=$(realpath "$(git rev-parse --show-toplevel)") + exec 2>&3 + + # If it's not from a git checkout, assume it's from a tarball +-if [ "$TOPLEVEL_WORKING_DIR" != "$CWD" ]; then ++if ! git rev-parse --is-inside-git-dir > /dev/null 2>&1; then + VERSION_FROM_DIR_NAME=$(basename "$CWD" | sed -n 's/^accountsservice-\([^-]*\)$/\1/p') + + if [ -n "$VERSION_FROM_DIR_NAME" ]; then
