commit: e1df0e6bebfefc3201442e0da922a81689cb28bd Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed May 18 02:45:09 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed May 18 02:47:09 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1df0e6b
gnome-base/gnome-shell: revbump for Polkit patch As Matt points out, we might end up installing gnome-shell w/ an older polkit, then upgrading polkit, and then nobody provides the autoref bits. Given it can go both ways, depend on a newer Polkit which always has the autoref bits, and add the patch to said new version. (Also, revbump -r1 -> r2 with no patch, for consistency, as people will have likely merged the -r1 w/ the polkit build fix, but in theory could (but unlikely!) downgrade polkit at some point, and it's just a lot easier to handle bugs this way if we know everything is in a sane state.) Bit annoyed I didn't think it through fully as I went back and forth a few times and decided on not, wrongly. Bug: https://bugs.gentoo.org/844919 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{gnome-shell-42.1-r1.ebuild => gnome-shell-42.1-r2.ebuild} | 3 --- .../{gnome-shell-42.1-r1.ebuild => gnome-shell-42.1-r3.ebuild} | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-42.1-r2.ebuild similarity index 98% copy from gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild copy to gnome-base/gnome-shell/gnome-shell-42.1-r2.ebuild index 7a1cc841e4f9..db6f1390fcef 100644 --- a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-42.1-r2.ebuild @@ -140,9 +140,6 @@ PATCHES=( "${FILESDIR}"/42.0-optional-bluetooth.patch # Change favorites defaults, bug #479918 "${FILESDIR}"/40.0-defaults.patch - - # Upstream backport, bug #844919 - "${FILESDIR}"/42.1-polkit-g_autoptr.patch ) src_prepare() { diff --git a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild similarity index 99% rename from gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild rename to gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild index 7a1cc841e4f9..3bc4781371bb 100644 --- a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild @@ -29,7 +29,7 @@ DEPEND=" >=dev-libs/gjs-1.71.1 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-42.0:0/10[introspection,test?] - >=sys-auth/polkit-0.100[introspection] + >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19
