| 1 | This reverts commit 2007a5b2, which broke installation of the package.
|
| 2 | See: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1579.
|
| 3 |
|
| 4 | diff --git a/meson.build b/meson.build
|
| 5 | index 734810d01..b4a45c60d 100644
|
| 6 | |
| 7 | |
| 8 | @@ -259,6 +259,13 @@ config_h.set('HAVE_WACOM', host_is_linux_not_s390,
|
| 9 | config_h.set('BUILD_THUNDERBOLT', host_is_linux_not_s390,
|
| 10 | description: 'Define to 1 to build the Thunderbolt panel')
|
| 11 |
|
| 12 | +# Check for info panel
|
| 13 | +gnome_session_libexecdir = get_option('gnome_session_libexecdir')
|
| 14 | +if gnome_session_libexecdir == ''
|
| 15 | + gnome_session_libexecdir = control_center_libexecdir
|
| 16 | +endif
|
| 17 | +
|
| 18 | +
|
| 19 | gnome = import('gnome')
|
| 20 | i18n = import('i18n')
|
| 21 | pkg = import('pkgconfig')
|
| 22 | diff --git a/meson_options.txt b/meson_options.txt
|
| 23 | index 1b7b54810..910226c56 100644
|
| 24 | |
| 25 | |
| 26 | @@ -1,5 +1,6 @@
|
| 27 | option('cheese', type: 'boolean', value: true, description: 'build with cheese webcam support')
|
| 28 | option('documentation', type: 'boolean', value: false, description: 'build documentation')
|
| 29 | +option('gnome_session_libexecdir', type: 'string', value: '', description: 'Directory for gnome-session\'s libexecdir')
|
| 30 | option('ibus', type: 'boolean', value: true, description: 'build with IBus support')
|
| 31 | option('privileged_group', type: 'string', value: 'wheel', description: 'name of group that has elevated permissions')
|
| 32 | option('snap', type: 'boolean', value: false, description: 'build with Snap support')
|
| 33 | diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c
|
| 34 | index 6e832eb35..b34030c8c 100644
|
| 35 | |
| 36 | |
| 37 | @@ -236,7 +236,7 @@ static char *
|
| 38 | get_renderer_from_helper (const char **env)
|
| 39 | {
|
| 40 | int status;
|
| 41 | - char *argv[] = { LIBEXECDIR "/gnome-control-center-print-renderer", NULL };
|
| 42 | + char *argv[] = { GNOME_SESSION_DIR "/gnome-session-check-accelerated", NULL };
|
| 43 | g_auto(GStrv) envp = NULL;
|
| 44 | g_autofree char *renderer = NULL;
|
| 45 | g_autoptr(GError) error = NULL;
|
| 46 | diff --git a/panels/info-overview/meson.build b/panels/info-overview/meson.build
|
| 47 | index 2fe10b32c..506b7274e 100644
|
| 48 | |
| 49 | |
| 50 | @@ -19,7 +19,7 @@ i18n.merge_file(
|
| 51 |
|
| 52 | cflags += [
|
| 53 | '-DDATADIR="@0@"'.format(control_center_datadir),
|
| 54 | - '-DLIBEXECDIR="@0@"'.format(control_center_libexecdir),
|
| 55 | + '-DGNOME_SESSION_DIR="@0@"'.format(gnome_session_libexecdir)
|
| 56 | ]
|
| 57 |
|
| 58 | sources = files(
|