Release 3.36.0

2 files changed, 21 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1205cf404173..3a43a07c98d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nautilus-typeahead
 	pkgdesc = Default file manager for GNOME - Patched to bring back the 'typeahead find' feature
-	pkgver = 3.34.2
+	pkgver = 3.36.0
 	pkgrel = 1
 	url = https://wiki.gnome.org/Apps/Nautilus
 	arch = x86_64
@@ -22,8 +22,7 @@ pkgbase = nautilus-typeahead
 	depends = gst-plugins-base-libs
 	depends = tracker-miners
 	optdepends = nautilus-sendto: right click to send files
-	options = !emptydirs
-	source = git+https://gitlab.gnome.org/GNOME/nautilus.git#commit=85e891e5faff4c72dc14ef54569a8f09a3f9ed79
+	source = git+https://gitlab.gnome.org/GNOME/nautilus.git#commit=e11034204be70a8535c8eff0010a2881991f17eb
 	source = nautilus-restore-typeahead.patch
 	sha256sums = SKIP
 	sha256sums = d3e1a3df1042a412aa23d0a1710c490c117239cd4d9ae9bae2ee32e190c8c03f
@@ -45,6 +44,6 @@ pkgname = nautilus-typeahead
 pkgname = libnautilus-extension-typeahead
 	pkgdesc = Library for extending the Default file manager for GNOME - Patched to bring back the 'typeahead find' feature
 	depends = gtk3
-	provides = libnautilus-extension
+	provides = libnautilus-extension.so
 	conflicts = libnautilus-extension
 
diff --git a/PKGBUILD b/PKGBUILD
index d282f40cd898..bd1ab2eea189 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _pkgbase=nautilus
 pkgbase=nautilus-typeahead
 pkgname=(nautilus-typeahead libnautilus-extension-typeahead)
 packager="Albert Vaca Cintora <albertvaka@gmail.com>"
-pkgver=3.34.2
+pkgver=3.36.0
 pkgrel=1
 pkgdesc="Default file manager for GNOME - Patched to bring back the 'typeahead find' feature"
 url="https://wiki.gnome.org/Apps/Nautilus"
@@ -17,8 +17,7 @@ depends=(libgexiv2 gnome-desktop gvfs dconf tracker gnome-autoar
          gst-plugins-base-libs tracker-miners)
 makedepends=(gobject-introspection packagekit git gtk-doc meson appstream-glib 'meson>=0.44.1' ninja)
 optdepends=('nautilus-sendto: right click to send files')
-options=(!emptydirs)
-_commit=85e891e5faff4c72dc14ef54569a8f09a3f9ed79  # tags/3.34.2^0
+_commit=e11034204be70a8535c8eff0010a2881991f17eb  # tags/3.36.0^0
 source=("git+https://gitlab.gnome.org/GNOME/nautilus.git#commit=$_commit"
         nautilus-restore-typeahead.patch)
 sha256sums=('SKIP'
@@ -28,6 +27,7 @@ prepare() {
   cd $_pkgbase
 
   git submodule init
+  git submodule set-url subprojects/libgd "$srcdir/libgd"
   git submodule update
 
   patch -p1 -i ../nautilus-restore-typeahead.patch
@@ -47,6 +47,16 @@ 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-typeahead() {
   depends+=(libnautilus-extension-typeahead)
   conflicts=(nautilus)
@@ -57,16 +67,16 @@ package_nautilus-typeahead() {
 
 ### 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-typeahead() {
   pkgdesc="Library for extending the $pkgdesc"
   conflicts=(libnautilus-extension)
   provides=(libnautilus-extension)
+  provides=(libnautilus-extension.so)
   depends=(gtk3)
-  mv libne "$pkgdir/usr"
+  mv libne/* "$pkgdir"
 }