This reverts commit 2007a5b2, which broke installation of the package. See: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1579. diff --git a/meson.build b/meson.build index 734810d01..b4a45c60d 100644 --- a/meson.build +++ b/meson.build @@ -259,6 +259,13 @@ config_h.set('HAVE_WACOM', host_is_linux_not_s390, config_h.set('BUILD_THUNDERBOLT', host_is_linux_not_s390, 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') i18n = import('i18n') pkg = import('pkgconfig') diff --git a/meson_options.txt b/meson_options.txt index 1b7b54810..910226c56 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,5 +1,6 @@ option('cheese', type: 'boolean', value: true, description: 'build with cheese webcam support') 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('privileged_group', type: 'string', value: 'wheel', description: 'name of group that has elevated permissions') option('snap', type: 'boolean', value: false, description: 'build with Snap support') diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c index 6e832eb35..b34030c8c 100644 --- a/panels/info-overview/cc-info-overview-panel.c +++ b/panels/info-overview/cc-info-overview-panel.c @@ -236,7 +236,7 @@ static char * get_renderer_from_helper (const char **env) { int status; - char *argv[] = { LIBEXECDIR "/gnome-control-center-print-renderer", NULL }; + char *argv[] = { GNOME_SESSION_DIR "/gnome-session-check-accelerated", NULL }; g_auto(GStrv) envp = NULL; g_autofree char *renderer = NULL; g_autoptr(GError) error = NULL; diff --git a/panels/info-overview/meson.build b/panels/info-overview/meson.build index 2fe10b32c..506b7274e 100644 --- a/panels/info-overview/meson.build +++ b/panels/info-overview/meson.build @@ -19,7 +19,7 @@ i18n.merge_file( cflags += [ '-DDATADIR="@0@"'.format(control_center_datadir), - '-DLIBEXECDIR="@0@"'.format(control_center_libexecdir), + '-DGNOME_SESSION_DIR="@0@"'.format(gnome_session_libexecdir) ] sources = files( showmsg=1'>Expand)Author 2018-06-01bootloader: grub: Use 'with-extensions'....* gnu/bootloader/grub.scm (svg->png): Use 'with-extensions'. Remove 'add-to-load-path' calls. * gnu/build/svg.scm: Use (rsvg) and (cairo) the normal way. Remove 'module-autoload!' calls. Ludovic Courtès 2017-07-02gnu: Switch guile-cairo and dependents to Guile 2.2 again....Fixes <https://bugs.gnu.org/27551>. Reported by Leo Famulari <leo@famulari.name>. This reinstates the following commits: e3ddb1e83 * gnu: guile-cairo: Switch to Guile 2.2. ae5c6ef39 * gnu: guile-gnome: Update to 2.16.5. 0fd8013fc * gnu: guile-rsvg: Update to commit 05c6a2fd. 66b9183c4 * gnu: guile-lib: Switch to Guile 2.2. and adds the following changes: * gnu/bootloader/grub.scm (svg->png): Add 'package->derivation' call for GUILE-2.2. Pass #:guile-for-build to 'gexp->derivation'. * gnu/build/svg.scm (svg->png): Add 'em' and 'ex' to the 'let-values' form to account for all the values returned by 'rsvg-handle-get-dimensions', which Guile 2.2 does not truncate. Ludovic Courtès