diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-05-05 23:32:29 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-05 23:32:29 +0100 |
| commit | 930b5a700c6f4093c4b63eec7395c080ab639311 (patch) | |
| tree | 314e43df83fe12b5fa743c5aa37d0c7ae26260fc /sys-apps/accountsservice | |
| parent | 8b5a92f1e1eccecfa61db8a4744e1b9d449522b6 (diff) | |
gentoo auto-resync : 05:05:2023 - 23:32:28
Diffstat (limited to 'sys-apps/accountsservice')
3 files changed, 33 insertions, 1 deletions
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest index 7680738aaf55..823f240e65cc 100644 --- a/sys-apps/accountsservice/Manifest +++ b/sys-apps/accountsservice/Manifest @@ -1,7 +1,8 @@ AUX accountsservice-22.04.62-gentoo-system-users.patch 1318 BLAKE2B 69c74ad620cebd6864efff7ad87401a72ea5f644a773a682653b45584e34755aaf12a0e79ba816c990b0af2784d01fec5e8b657699ecfc7c38343330a36fda57 SHA512 a85a6ca785a3863d96eae39bc3eee5fe89bedd0bdae40cd6bc2e077bb88f72d73d0be63dcf0e0a788f0f5d69ed39801c9ede623afe8ed08c94372314b1fddd09 AUX accountsservice-22.08.8-configure-clang16.patch 1247 BLAKE2B 2a4a99498f9ae1b6e6e84824918f0961719ef4ea9e2b18171e12b263a51953dcd1be055dfc0b3824821eebd863b33a9ac29b3f619be179d529901e117ca69b88 SHA512 08b409cb8b2a5301a98ca9986b3f33c9cd46ca98a24f273c6d495967a69af447c85bdfd25e5de28adcefc99b8141b9dd77d393bb92d758bf6c7fff1e1ad982ce +AUX accountsservice-23.13.9-generate-version.patch 1156 BLAKE2B e5b464ac3a15f089dbaa2b687a91126af002370b8be30e5b5f77a2528620c100569bb96bc75be86b69753a161d09c4d6ba803352047343cf454f79798d302fa1 SHA512 b288368df675bb82a083c9ea94df53e3789ca824d174b10dccd50a3996983f7284b059ea646e42a00b03723ea13c54a67ef032112ac4f61d0b6740698fbed790 DIST accountsservice-22.08.8.tar.xz 102672 BLAKE2B 7c9436d3845fc1883772b434c4f9e2fba934d17e6d4452a6be65e1d790a23b331eaaa64b0e6eff6fefe79587a40cf1749a0f3de09f323b10740046bd9d145c9d SHA512 2ca3ceb1b44338d9924b86788256d4eef7ec10e0c2197bfb8cc6c31ae224fab3051f03cb406a526f90057684965bef4ba0f2cc01b26198ec1fc6baec36ad3ff8 DIST accountsservice-23.13.9.tar.xz 636064 BLAKE2B 74dbbe816937e626ba0f6524b4293466ac2905f474396f5d23633e966d46e013de110671abcbfe2911fffa1e98872e2525b61594a967f917975ebf18d39b8547 SHA512 c6eb543ce2e07b61bbdfa454e388949bc688517be0536b14f30c66383ed105b15d3fab8b6c62b1eaa08f67d9bdc29b928729d9f7c704f47de4decf0de8e12f89 EBUILD accountsservice-22.08.8-r1.ebuild 2093 BLAKE2B aef50eeec0f7500936836141024054eceb407e7e5e5ccb6a501d9958ec9236c62fe15dc00a96372b5ac7b27edf299f37f32d1ff7a62c88e8038a7e53fd175193 SHA512 b930685ec21e1344411c139499f271011ca1a92b71248f720aa4149727cfe82eff8ffc7e3602ff0d11d1ad359a9cba8d4b55f30d941ae2a082417b5bd223f170 -EBUILD accountsservice-23.13.9.ebuild 2157 BLAKE2B 723f71ab9401ba1c978a55814270349c72795a534d34752ba044f06abb70701ae2ef26d4611eb043ed94af668f60127ce5d52ea83509773c1904ac0c47d89f51 SHA512 cc298bbb3464782d391869db2239932f74344b4c95770811ba9f82b9b91bd588c8213c2a5c0e9d30ae18caab25552db3669cbd6c34b64f4d50c7a48283ea57bb +EBUILD accountsservice-23.13.9.ebuild 2217 BLAKE2B dddff066c0f66a5afbafdb7d249c8984ce410db6b0d0e3697e95f7ab389cabfcd3732209add5aab38f263addcbfddf54b088f93a9eccfa3037997b41db718ae2 SHA512 84b8ddc8289027ec3ff77b8ed7f27ba35182ef8fbfc68863e6fe9b455942531eba8632a49452f4bd1a19b238a4e7771f718a972d80e574e7b2c8ff9a97f8289e MISC metadata.xml 559 BLAKE2B c43012a95ec8ddd3ce687f69b4dc1889c82f31828f8e1f53bded7723b82c2a8faff594674fbd819370078dc13f48f51df45a3a280563c6a00080e5332128498c SHA512 6c1e1e291bcd11a06fe4e7b73031accdf0fe839cb7372f96d1cc52e5c1a1a1b032adcf0da7dde016331fefcb1ae1402386ba3ab2713b4256e9e60dd2b73f76f5 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 <orbea@riseup.net> +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 |