Date: Tuesday, September 21, 2021 @ 16:37:27 Author: heftig Revision: 424470
40.2+7+g67c7bdbf8-1: libgexiv2 rebuild Modified: nautilus/trunk/PKGBUILD Deleted: nautilus/trunk/0001-test-Fix-declaration-of-test-environment.patch -----------------------------------------------------+ 0001-test-Fix-declaration-of-test-environment.patch | 76 ------------------ PKGBUILD | 12 -- 2 files changed, 4 insertions(+), 84 deletions(-) Deleted: 0001-test-Fix-declaration-of-test-environment.patch =================================================================== --- 0001-test-Fix-declaration-of-test-environment.patch 2021-09-21 16:30:55 UTC (rev 424469) +++ 0001-test-Fix-declaration-of-test-environment.patch 2021-09-21 16:37:27 UTC (rev 424470) @@ -1,76 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <[email protected]> -Date: Fri, 4 Jun 2021 18:14:17 +0000 -Subject: [PATCH] test: Fix declaration of test environment - -meson 0.58.0 fails with: - - ERROR: List item must be one of <class 'str'>, not <class 'list'> ---- - test/automated/display/meson.build | 3 +-- - test/automated/displayless/meson.build | 6 ++---- - test/meson.build | 3 +-- - 3 files changed, 4 insertions(+), 8 deletions(-) - -diff --git a/test/automated/display/meson.build b/test/automated/display/meson.build -index a7e2e0be2..ce0276ad9 100644 ---- a/test/automated/display/meson.build -+++ b/test/automated/display/meson.build -@@ -13,8 +13,7 @@ foreach t: tests - test( - t[0], - executable(t[0], t[1], dependencies: libnautilus_dep), -- env: [ -- test_env, -+ env: test_env + [ - 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), - 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()) - ], -diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build -index 64b23bd2a..02f4f3309 100644 ---- a/test/automated/displayless/meson.build -+++ b/test/automated/displayless/meson.build -@@ -45,27 +45,25 @@ foreach t: tests - test( - t[0], - executable(t[0], t[1], files('test-utilities.c'), dependencies: libnautilus_dep), -- env: [ -- test_env, -+ 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, -+ env: test_env + [ - 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), - 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()) - ], -diff --git a/test/meson.build b/test/meson.build -index ab588efd3..9f238aaad 100644 ---- a/test/meson.build -+++ b/test/meson.build -@@ -4,8 +4,7 @@ - # test( - # name, - # executable, --# env: [ --# test_env, -+# env: test_env + [ - # 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), - # 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()) - # ] Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-09-21 16:30:55 UTC (rev 424469) +++ PKGBUILD 2021-09-21 16:37:27 UTC (rev 424470) @@ -3,7 +3,7 @@ pkgbase=nautilus pkgname=(nautilus libnautilus-extension) -pkgver=40.2 +pkgver=40.2+7+g67c7bdbf8 pkgrel=1 pkgdesc="Default file manager for GNOME" url="https://wiki.gnome.org/Apps/Files"; @@ -13,19 +13,15 @@ gnome-autoar gst-plugins-base-libs libhandy libportal) makedepends=(gobject-introspection git gtk-doc meson appstream-glib) checkdepends=(python-gobject) -_commit=acd0ceee27495a2e4c552490aed49146cb2476e6 # tags/40.2^0 +_commit=67c7bdbf8757c51d3b1bc1f5c40eaeddef9e3a89 # gnome-40 source=("git+https://gitlab.gnome.org/GNOME/nautilus.git#commit=$_commit"; - "git+https://gitlab.gnome.org/GNOME/libgd.git"; - 0001-test-Fix-declaration-of-test-environment.patch) + "git+https://gitlab.gnome.org/GNOME/libgd.git";) sha256sums=('SKIP' - 'SKIP' - 'cac844c1bc565f7d1c7f83bd5b688e9b6a8b680fdd7c0566c3434d808c7121a3') + 'SKIP') prepare() { cd $pkgbase - git apply -3 ../0001-test-Fix-declaration-of-test-environment.patch - git submodule init git submodule set-url subprojects/libgd "$srcdir/libgd" git submodule update
