applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

info: Use new helper to fetch GL/GLES renderers

Browse source
This commit is contained in:
Bastien Nocera 2019-11-05 16:30:49 +01:00 • committed by Robert Ancell
parent 5f6d5b77ac
commit 2007a5b240
4 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
meson.build
View file

@ -234,13 +234,6 @@ config_h.set('HAVE_WACOM', host_is_linux_not_s390,
config_h.set('BUILD_THUNDERBOLT', host_is_linux_not_s390, config_h.set('BUILD_THUNDERBOLT', host_is_linux_not_s390,
description: 'Define to 1 to build the Thunderbolt panel') description: 'Define to 1 to build the Thunderbolt panel')
# Check for info panel
gnome_session_libexecdir = get_option('gnome_session_libexecdir')
if gnome_session_libexecdir == ''
gnome_session_libexecdir = control_center_libexecdir
endif
gnome = import('gnome') gnome = import('gnome')
i18n = import('i18n') i18n = import('i18n')
pkg = import('pkgconfig') pkg = import('pkgconfig')
@ -286,7 +279,6 @@ output += ' Options \n'
output += ' Documentation .............................. ' + get_option('documentation').to_string() + '\n' output += ' Documentation .............................. ' + get_option('documentation').to_string() + '\n'
output += ' Build Tests ................................ ' + get_option('tests').to_string() + '\n' output += ' Build Tests ................................ ' + get_option('tests').to_string() + '\n'
output += ' Tracing .................................... ' + enable_tracing.to_string() + '\n' output += ' Tracing .................................... ' + enable_tracing.to_string() + '\n'
output += ' gnome-session libexecdir ................... ' + gnome_session_libexecdir + '\n'
output += ' Optimized .................................. ' + control_center_optimized.to_string() + '\n' output += ' Optimized .................................. ' + control_center_optimized.to_string() + '\n'
output += ' Panels \n' output += ' Panels \n'
output += ' GNOME Bluetooth (Bluetooth panel) .......... ' + host_is_linux_not_s390.to_string() + '\n' output += ' GNOME Bluetooth (Bluetooth panel) .......... ' + host_is_linux_not_s390.to_string() + '\n'

1
meson_options.txt
View file

@ -1,6 +1,5 @@
option('cheese', type: 'boolean', value: true, description: 'build with cheese webcam support') option('cheese', type: 'boolean', value: true, description: 'build with cheese webcam support')
option('documentation', type: 'boolean', value: false, description: 'build documentation') option('documentation', type: 'boolean', value: false, description: 'build documentation')
option('gnome_session_libexecdir', type: 'string', value: '', description: 'Directory for gnome-session\'s libexecdir')
option('ibus', type: 'boolean', value: true, description: 'build with IBus support') option('ibus', type: 'boolean', value: true, description: 'build with IBus support')
option('privileged_group', type: 'string', value: 'wheel', description: 'name of group that has elevated permissions') option('privileged_group', type: 'string', value: 'wheel', description: 'name of group that has elevated permissions')
option('tests', type: 'boolean', value: true, description: 'build tests') option('tests', type: 'boolean', value: true, description: 'build tests')

2
panels/info-overview/cc-info-overview-panel.c
View file

@ -238,7 +238,7 @@ static char *
get_renderer_from_helper (const char **env) get_renderer_from_helper (const char **env)
{ {
int status; int status;
char *argv[] = { GNOME_SESSION_DIR "/gnome-session-check-accelerated", NULL }; char *argv[] = { LIBEXECDIR "/gnome-control-center-print-renderer", NULL };
g_auto(GStrv) envp = NULL; g_auto(GStrv) envp = NULL;
g_autofree char *renderer = NULL; g_autofree char *renderer = NULL;
g_autoptr(GError) error = NULL; g_autoptr(GError) error = NULL;

2
panels/info-overview/meson.build
View file

@ -20,7 +20,7 @@ i18n.merge_file(
cflags += [ cflags += [
'-DBINDIR="@0@"'.format(control_center_bindir), '-DBINDIR="@0@"'.format(control_center_bindir),
'-DDATADIR="@0@"'.format(control_center_datadir), '-DDATADIR="@0@"'.format(control_center_datadir),
'-DGNOME_SESSION_DIR="@0@"'.format(gnome_session_libexecdir) '-DLIBEXECDIR="@0@"'.format(control_center_libexecdir),
] ]
sources = files( sources = files(