Update to latest version

2 files changed, 34 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 964fd178f0c4..f483020fc83e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
 pkgbase = nautilus-git
 	pkgdesc = Default file manager for GNOME
-	pkgver = 3.30.0.r165.g20339a8bb
+	pkgver = 3.37.1.1.r10.g23a2a67b1
 	pkgrel = 1
-	url = https://wiki.gnome.org/Apps/Nautilus
+	url = https://wiki.gnome.org/Apps/Files
 	arch = i686
 	arch = x86_64
-	arch = armv6h
 	arch = armv7h
+	arch = aarch64
 	license = GPL
 	makedepends = gobject-introspection
-	makedepends = packagekit
 	makedepends = git
 	makedepends = gtk-doc
 	makedepends = meson
@@ -19,8 +18,9 @@ pkgbase = nautilus-git
 	depends = gvfs
 	depends = dconf
 	depends = tracker
-	depends = nautilus-sendto
 	depends = gnome-autoar
+	depends = gst-plugins-base-libs
+	depends = tracker-miners
 	options = !emptydirs
 	source = git+https://gitlab.gnome.org/GNOME/nautilus.git
 	source = git+https://gitlab.gnome.org/GNOME/libgd.git
@@ -34,15 +34,18 @@ pkgname = nautilus-git
 	depends = gvfs
 	depends = dconf
 	depends = tracker
-	depends = nautilus-sendto
 	depends = gnome-autoar
+	depends = gst-plugins-base-libs
+	depends = tracker-miners
 	depends = libnautilus-extension
+	optdepends = nautilus-sendto: Send files via mail extension
 	provides = nautilus
 	conflicts = nautilus
 
 pkgname = libnautilus-extension-git
-	pkgdesc = Library for extending the Default file manager for GNOME
+	pkgdesc = Library for extending GNOME Files
 	depends = gtk3
 	provides = libnautilus-extension
+	provides = libnautilus-extension.so
 	conflicts = libnautilus-extension
 
diff --git a/PKGBUILD b/PKGBUILD
index 87003670e87f..6feccd7c02fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,14 +5,14 @@
 
 pkgbase=nautilus-git
 pkgname=(nautilus-git libnautilus-extension-git)
-pkgver=3.30.0.r165.g20339a8bb
+pkgver=3.37.1.1.r10.g23a2a67b1
 pkgrel=1
 pkgdesc="Default file manager for GNOME"
-url="https://wiki.gnome.org/Apps/Nautilus"
-arch=(i686 x86_64 armv6h armv7h)
+url="https://wiki.gnome.org/Apps/Files"
+arch=(i686 x86_64 armv7h aarch64)
 license=(GPL)
-depends=(libgexiv2 gnome-desktop gvfs dconf tracker nautilus-sendto gnome-autoar)
-makedepends=(gobject-introspection packagekit git gtk-doc meson appstream-glib)
+depends=(libgexiv2 gnome-desktop gvfs dconf tracker gnome-autoar gst-plugins-base-libs tracker-miners)
+makedepends=(gobject-introspection git gtk-doc meson appstream-glib)
 options=(!emptydirs)
 source=("git+https://gitlab.gnome.org/GNOME/nautilus.git"
         "git+https://gitlab.gnome.org/GNOME/libgd.git")
@@ -33,35 +33,45 @@ pkgver() {
 }
 
 build() {
-  arch-meson nautilus build -D docs=true
+  arch-meson nautilus build -D docs=true -D packagekit=false
   ninja -C build
 }
 
 check() {
-  meson test -C build
+  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-git() {
   depends+=(libnautilus-extension)
   provides=(nautilus)
   conflicts=(nautilus)
+  optdepends=('nautilus-sendto: Send files via mail extension')
   groups=(gnome)
 
   DESTDIR="$pkgdir" meson install -C build
 
 ### Split libnautilus-extension
 
-  mkdir -p libne/{lib,share}
-  mv "$pkgdir"/usr/include libne
-  mv "$pkgdir"/usr/lib/{girepository-1.0,libnautilus-extension*,pkgconfig} libne/lib
-  mv "$pkgdir"/usr/share/{gir-1.0,gtk-doc} libne/share
+  _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-git() {
-  pkgdesc="Library for extending the $pkgdesc"
+  pkgdesc="Library for extending GNOME Files"
   depends=(gtk3)
-  provides=(libnautilus-extension)
+  provides=(libnautilus-extension libnautilus-extension.so)
   conflicts=(libnautilus-extension)
   
-  mv libne "$pkgdir/usr"
+  mv libne/* "$pkgdir"
 }