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( 0'>2023-06-09tests: Ensure 'elpa' test does not access the network....Previously it would try to access the real elpa.gnu.org. This would succeed when network is available because "taxy-magit-section" is an existing package. * guix/import/elpa.scm (elpa-repository) (package-from-elpa-repository?): Recognize 'gnu/http. * tests/elpa.scm ("package-latest-release"): Use 'http' instead of 'https'. Change "taxy-magit-section" to "fake-taxy-magit-section". Ludovic Courtès 2023-05-31tests: Use quasiquoted 'match' patterns for package sexps....Turns out it's easier to read. * tests/cpan.scm ("cpan->guix-package"): Use a quasiquoted pattern. * tests/elpa.scm (eval-test-with-elpa): Likewise. * tests/gem.scm ("gem->guix-package") ("gem->guix-package with a specific version") ("gem-recursive-import") ("gem-recursive-import with a specific version"): Likewise. * tests/hexpm.scm ("hexpm-recursive-import"): Likewise. * tests/opam.scm ("opam->guix-package"): Likewise. * tests/pypi.scm ("pypi->guix-package, no wheel") ("pypi->guix-package, wheels") ("pypi->guix-package, no usable requirement file.") ("pypi->guix-package, package name contains \"-\" followed by digits"): Likewise. * tests/texlive.scm ("texlive->guix-package"): Likewise. Ludovic Courtès 2023-05-31import: elpa: Updater provides input list....* guix/import/elpa.scm (elpa-dependency->upstream-input): New procedure. (latest-release): Add 'inputs' field. * tests/elpa.scm ("package-latest-release"): New test. Ludovic Courtès 2021-12-18import: elpa: Support ‘upstream-name’ property....* guix/import/elpa.scm: (guix-package->elpa-name): New procedure. (latest-release): Use it. * tests/elpa.scm ("guix-package->elpa-name: without 'upstream-name' property") ("guix-package->elpa-name: with 'upstream-name' property"): Test it. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Xinglu Chen 2021-03-06tests: do not hard code HTTP ports...Previously, test cases could fail if some process was listening at a hard-coded port. This patch eliminates most of these potential failures, by automatically assigning an unbound port. This should allow for building multiple guix trees in parallel outside a build container, though this is currently untested. The test "home-page: Connection refused" in tests/lint.scm still hardcodes port 9999, however. * guix/tests/http.scm (http-server-can-listen?): remove now unused procedure. (%http-server-port): default to port 0, meaning the OS will automatically choose a port. (open-http-server-socket): remove the false statement claiming this procedure is exported and also return the allocated port number. (%local-url): raise an error if the port is obviously unbound. (call-with-http-server): set %http-server-port to the allocated port while the thunk is called. * tests/derivations.scm: adjust test cases to use automatically assign a port. As there is no risk of a port conflict now, do not make any tests conditional upon 'http-server-can-listen?' anymore. * tests/elpa.scm: likewise. * tests/lint.scm: likewise, and add a TODO comment about a port that is still hard-coded. * tests/texlive.scm: likewise. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Maxime Devos