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