brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Do not redefine polkit autocleanup

Browse Source 
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>
This commit is contained in:
Florian Müllner 2022-05-17 15:36:43 +02:00 committed by Marge Bot
parent eb538abc98
commit 1d0a08b5e2
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.h.meson
View File

@ -33,3 +33,6 @@
/* Define if fdwalk is available in libc */ /* Define if fdwalk is available in libc */
#mesondefine HAVE_FDWALK #mesondefine HAVE_FDWALK
/* Define if polkit defines autocleanup functions */
#mesondefine HAVE_POLKIT_AUTOCLEANUP

7
meson.build
View File

@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
cc.has_function('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') buildtype = get_option('buildtype')
if buildtype != 'plain' if buildtype != 'plain'
all_warnings = [ all_warnings = [

2
src/shell-polkit-authentication-agent.h
View File

@ -14,8 +14,10 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#ifndef HAVE_POLKIT_AUTOCLEANUP
/* Polkit doesn't have g_autoptr support, thus we have to manually set the autoptr function here */ /* 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) G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
#endif
#define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT (shell_polkit_authentication_agent_get_type()) #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT (shell_polkit_authentication_agent_get_type())