diff options
| author |   Sam James <sam@gentoo.org> | 2022-05-17 21:58:52 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-05-17 21:58:52 +0000 |
| commit | 042dabffb96f3b8fd74e0cbb14c524c81e7304df (patch) | |
| tree | f99f9f89f0c5f7d5e3fb7b81ac9d7f34eeb5104a /gnome-base | |
| parent | sys-cluster/ceph: Don't allow system-boost and py310 in 16.2.8 (diff) | |
| download | gentoo-042dabffb96f3b8fd74e0cbb14c524c81e7304df.tar.gz gentoo-042dabffb96f3b8fd74e0cbb14c524c81e7304df.tar.bz2 gentoo-042dabffb96f3b8fd74e0cbb14c524c81e7304df.zip | |
gnome-base/gnome-shell: backport new Polkit patch (g_autoptr)
Closes: https://bugs.gentoo.org/844919
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch | 53 | ||||
| -rw-r--r-- | gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild | 3 |
2 files changed, 56 insertions, 0 deletions
diff --git a/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch new file mode 100644 index 000000000000..78d3de086260 --- /dev/null +++ b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch @@ -0,0 +1,53 @@ +https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75 +https://bugs.gentoo.org/844919 + +From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org> +Date: Tue, 17 May 2022 15:36:43 +0200 +Subject: [PATCH] build: Do not redefine polkit autocleanup + +PolkitAgent recently added autocleanup functions itself, so check +for their existence at configure time and only define our own when +they don't exist upstream. + +https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490 + +Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2296> +--- a/config.h.meson ++++ b/config.h.meson +@@ -33,3 +33,6 @@ + + /* Define if fdwalk is available in libc */ + #mesondefine HAVE_FDWALK ++ ++/* Define if polkit defines autocleanup functions */ ++#mesondefine HAVE_POLKIT_AUTOCLEANUP +--- a/meson.build ++++ b/meson.build +@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK', + cc.has_function('fdwalk') + ) + ++polkit_has_autocleanup = cc.compiles( ++ '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE ++ #include <polkitagent/polkitagent.h> ++ void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }', ++ dependencies: polkit_dep) ++cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup) ++ + buildtype = get_option('buildtype') + if buildtype != 'plain' + all_warnings = [ +--- a/src/shell-polkit-authentication-agent.h ++++ b/src/shell-polkit-authentication-agent.h +@@ -14,8 +14,10 @@ + + G_BEGIN_DECLS + ++#ifndef HAVE_POLKIT_AUTOCLEANUP + /* Polkit doesn't have g_autoptr support, thus we have to manually set the autoptr function here */ + G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref) ++#endif + + #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT (shell_polkit_authentication_agent_get_type()) + +GitLab diff --git a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild index db6f1390fcef..7a1cc841e4f9 100644 --- a/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-42.1-r1.ebuild @@ -140,6 +140,9 @@ 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() { |