[arch-commits] Commit in nautilus/repos/extra-x86_64 (3 files)
Jan Steffens
heftig at archlinux.org
Fri Jun 4 18:20:31 UTC 2021
Date: Friday, June 4, 2021 @ 18:20:31
Author: heftig
Revision: 417114
archrelease: copy trunk to extra-x86_64
Added:
nautilus/repos/extra-x86_64/0001-test-Fix-declaration-of-test-environment.patch
(from rev 417113, nautilus/trunk/0001-test-Fix-declaration-of-test-environment.patch)
nautilus/repos/extra-x86_64/PKGBUILD
(from rev 417113, nautilus/trunk/PKGBUILD)
Deleted:
nautilus/repos/extra-x86_64/PKGBUILD
-----------------------------------------------------+
0001-test-Fix-declaration-of-test-environment.patch | 76 ++++++++
PKGBUILD | 158 +++++++++---------
2 files changed, 157 insertions(+), 77 deletions(-)
Copied: nautilus/repos/extra-x86_64/0001-test-Fix-declaration-of-test-environment.patch (from rev 417113, nautilus/trunk/0001-test-Fix-declaration-of-test-environment.patch)
===================================================================
--- 0001-test-Fix-declaration-of-test-environment.patch (rev 0)
+++ 0001-test-Fix-declaration-of-test-environment.patch 2021-06-04 18:20:31 UTC (rev 417114)
@@ -0,0 +1,76 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+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())
+ # ]
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-06-04 18:20:24 UTC (rev 417113)
+++ PKGBUILD 2021-06-04 18:20:31 UTC (rev 417114)
@@ -1,77 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=nautilus
-pkgname=(nautilus libnautilus-extension)
-pkgver=40.1
-pkgrel=1
-pkgdesc="Default file manager for GNOME"
-url="https://wiki.gnome.org/Apps/Files"
-arch=(x86_64)
-license=(GPL)
-depends=(libgexiv2 gnome-desktop gvfs dconf tracker3 tracker3-miners
- gnome-autoar gst-plugins-base-libs libhandy libportal)
-makedepends=(gobject-introspection git gtk-doc meson appstream-glib)
-checkdepends=(python-gobject)
-_commit=4f9ddd632f555bdfe06abd6a339aa2bd7781b2bc # tags/40.1^0
-source=("git+https://gitlab.gnome.org/GNOME/nautilus.git#commit=$_commit"
- "git+https://gitlab.gnome.org/GNOME/libgd.git")
-sha256sums=('SKIP'
- 'SKIP')
-
-prepare() {
- cd $pkgbase
-
- git submodule init
- git submodule set-url subprojects/libgd "$srcdir/libgd"
- git submodule update
-}
-
-pkgver() {
- cd $pkgbase
- git describe --tags | sed 's/-/+/g'
-}
-
-build() {
- arch-meson $pkgbase build \
- -D docs=true \
- -D packagekit=false
- meson compile -C build
-}
-
-check() {
- meson test -C build --print-errorlogs
-}
-
-_pick() {
- local p="$1" f d; shift
- for f; do
- d="$srcdir/$p/${f#$pkgdir/}"
- mkdir -p "$(dirname "$d")"
- mv "$f" "$d"
- rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
- done
-}
-
-package_nautilus() {
- depends+=(libnautilus-extension)
- optdepends=('nautilus-sendto: Send files via mail extension')
- groups=(gnome)
-
- DESTDIR="$pkgdir" meson install -C build
-
-### Split libnautilus-extension
-
- _pick libne "$pkgdir"/usr/include
- _pick libne "$pkgdir"/usr/lib/{girepository-1.0,libnautilus-extension*,pkgconfig}
- _pick libne "$pkgdir"/usr/share/{gir-1.0,gtk-doc}
-}
-
-package_libnautilus-extension() {
- pkgdesc="Library for extending the $pkgdesc"
- depends=(gtk3)
- provides=(libnautilus-extension.so)
- mv libne/* "$pkgdir"
-}
-
-# vim:set sw=2 et:
Copied: nautilus/repos/extra-x86_64/PKGBUILD (from rev 417113, nautilus/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-06-04 18:20:31 UTC (rev 417114)
@@ -0,0 +1,81 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=nautilus
+pkgname=(nautilus libnautilus-extension)
+pkgver=40.2
+pkgrel=1
+pkgdesc="Default file manager for GNOME"
+url="https://wiki.gnome.org/Apps/Files"
+arch=(x86_64)
+license=(GPL)
+depends=(libgexiv2 gnome-desktop gvfs dconf tracker3 tracker3-miners
+ 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
+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)
+sha256sums=('SKIP'
+ 'SKIP'
+ 'cac844c1bc565f7d1c7f83bd5b688e9b6a8b680fdd7c0566c3434d808c7121a3')
+
+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
+}
+
+pkgver() {
+ cd $pkgbase
+ git describe --tags | sed 's/-/+/g'
+}
+
+build() {
+ arch-meson $pkgbase build \
+ -D docs=true \
+ -D packagekit=false
+ meson compile -C build
+}
+
+check() {
+ meson test -C build --print-errorlogs
+}
+
+_pick() {
+ local p="$1" f d; shift
+ for f; do
+ d="$srcdir/$p/${f#$pkgdir/}"
+ mkdir -p "$(dirname "$d")"
+ mv "$f" "$d"
+ rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+ done
+}
+
+package_nautilus() {
+ depends+=(libnautilus-extension)
+ optdepends=('nautilus-sendto: Send files via mail extension')
+ groups=(gnome)
+
+ meson install -C build --destdir "$pkgdir"
+
+### Split libnautilus-extension
+
+ _pick libne "$pkgdir"/usr/include
+ _pick libne "$pkgdir"/usr/lib/{girepository-1.0,libnautilus-extension*,pkgconfig}
+ _pick libne "$pkgdir"/usr/share/{gir-1.0,gtk-doc}
+}
+
+package_libnautilus-extension() {
+ pkgdesc="Library for extending the $pkgdesc"
+ depends=(gtk3)
+ provides=(libnautilus-extension.so)
+ mv libne/* "$pkgdir"
+}
+
+# vim:set sw=2 et:
More information about the arch-commits
mailing list