From 87c5dd8ea5535df93f3705177cff1c19800999c5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 10 Sep 2022 01:18:17 -0400 Subject: gnu: nautilus: Update to 42.2 and enable tests. * gnu/packages/gnome.scm (nautilus): Update to 42.2. [patches]: Replace nautilus-add-libportal-gtk3.patch with nautilus-disable-tracker-tests.patch. [tests?]: Delete argument. [phases]: Use gexps. {check}: Move after install. {pre-check}: New phase. [native-inputs]: Replace intltool with gettext-minimal. Add python-pygobject. [inputs]: Remove libsoup-minimal-2. * gnu/packages/patches/nautilus-add-libportal-gtk3.patch: Delete file. * gnu/packages/patches/nautilus-disable-tracker-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- .../patches/nautilus-add-libportal-gtk3.patch | 61 ---------------------- .../patches/nautilus-disable-tracker-tests.patch | 47 +++++++++++++++++ 2 files changed, 47 insertions(+), 61 deletions(-) delete mode 100644 gnu/packages/patches/nautilus-add-libportal-gtk3.patch create mode 100644 gnu/packages/patches/nautilus-disable-tracker-tests.patch (limited to 'gnu/packages/patches') diff --git a/gnu/packages/patches/nautilus-add-libportal-gtk3.patch b/gnu/packages/patches/nautilus-add-libportal-gtk3.patch deleted file mode 100644 index cefa47cc64..0000000000 --- a/gnu/packages/patches/nautilus-add-libportal-gtk3.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 55cfd66ccca391fc144f5863ff6bfc1f3b137e2d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= -Date: Tue, 21 Dec 2021 17:42:27 +0000 -Subject: [PATCH] general: Add libportal-gtk3 dependency - -The portal-gtk3.h header has been moved into a separate library which -binds gtk3 explicitly. - -https://github.com/flatpak/libportal/pull/53 ---- - build-aux/flatpak/org.gnome.Nautilus.json | 5 +++-- ;; Changes removed in Guix - build-aux/flatpak/org.gnome.Nautilus.yml | 3 ++- ;; Changes removed in Guix - meson.build | 4 +++- - src/meson.build | 1 + - src/nautilus-files-view.c | 2 +- - 5 files changed, 10 insertions(+), 5 deletions(-) - -diff --git a/meson.build b/meson.build -index 927216636..4626fa0bb 100644 ---- a/meson.build -+++ b/meson.build -@@ -122,8 +122,10 @@ gnome_desktop = dependency('gnome-desktop-3.0', version: '>= 3.0.0') - gtk = dependency('gtk+-3.0', version: '>= 3.22.27') - libhandy = dependency('libhandy-1', version: '>= 1.1.90') - libportal = [] -+libportal_gtk3 = [] - if get_option('libportal') -- libportal = dependency('libportal', version: '>= 0.3') -+ libportal = dependency('libportal', version: '>= 0.5') -+ libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5') - endif - selinux = [] - if get_option('selinux') -diff --git a/src/meson.build b/src/meson.build -index 682d6f3a3..d7fb76d53 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -285,6 +285,7 @@ nautilus_deps = [ - libgd_dep, - libhandy, - libportal, -+ libportal_gtk3, - nautilus_extension, - selinux, - tracker_sparql, -diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c -index dfb7fb26c..a24005a11 100644 ---- a/src/nautilus-files-view.c -+++ b/src/nautilus-files-view.c -@@ -93,7 +93,7 @@ - - #ifdef HAVE_LIBPORTAL - #include --#include -+#include - #endif - - /* Minimum starting update inverval */ --- -GitLab - diff --git a/gnu/packages/patches/nautilus-disable-tracker-tests.patch b/gnu/packages/patches/nautilus-disable-tracker-tests.patch new file mode 100644 index 0000000000..bcc7b38f33 --- /dev/null +++ b/gnu/packages/patches/nautilus-disable-tracker-tests.patch @@ -0,0 +1,47 @@ +The tracker test hangs in the build container (see: +https://gitlab.gnome.org/GNOME/nautilus/-/issues/2486). + +--- a/test/automated/displayless/meson.build 2022-09-10 00:52:50.348405729 -0400 ++++ b/test/automated/displayless/meson.build 2022-09-10 00:53:07.267907525 -0400 +@@ -34,41 +34,3 @@ + 'test-file-operations-trash-or-delete.c' + ]] + ] +- +-tracker_tests = [ +- ['test-nautilus-search-engine-tracker', [ +- 'test-nautilus-search-engine-tracker.c', +- ]], +-] +- +-foreach t: tests +- test( +- t[0], +- executable(t[0], t[1], files('test-utilities.c'), dependencies: libnautilus_dep), +- env: [ +- test_env, +- 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), +- 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()) +- ], +- timeout: 480 +- ) +-endforeach +- +- +- +-# Tests that read and write from the Tracker index are run using 'tracker-sandbox' +-# script to use a temporary instance of tracker-miner-fs instead of the session one. +-foreach t: tracker_tests +- test_exe = executable(t[0], t[1], files('test-utilities.c'), dependencies: libnautilus_dep) +- test( +- t[0], +- tracker_sandbox, +- args: ['--store-tmpdir', '--index-recursive-tmpdir', test_exe], +- env: [ +- test_env, +- 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), +- 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()) +- ], +- timeout: 480 +- ) +-endforeach -- cgit v1.2.3