[arch-commits] Commit in nautilus/trunk (PKGBUILD)

[Jan Steffens]

    Date: Sunday, March 8, 2020 @ 01:32:38
  Author: heftig
Revision: 376939

3.36.0-1

Modified:
  nautilus/trunk/PKGBUILD

----------+
 PKGBUILD |   27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-08 01:23:48 UTC (rev 376938)
+++ PKGBUILD	2020-03-08 01:32:38 UTC (rev 376939)
@@ -3,7 +3,7 @@
 
 pkgbase=nautilus
 pkgname=(nautilus libnautilus-extension)
-pkgver=3.34.2
+pkgver=3.36.0
 pkgrel=1
 pkgdesc="Default file manager for GNOME"
 url="https://wiki.gnome.org/Apps/Files"
@@ -12,8 +12,7 @@
 depends=(libgexiv2 gnome-desktop gvfs dconf tracker nautilus-sendto gnome-autoar
          gst-plugins-base-libs tracker-miners)
 makedepends=(gobject-introspection git gtk-doc meson appstream-glib)
-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"
         "git+https://gitlab.gnome.org/GNOME/libgd.git")
 sha256sums=('SKIP'
@@ -23,7 +22,7 @@
   cd $pkgbase
 
   git submodule init
-  git config --local submodule.subprojects/libgd.url "$srcdir/libgd"
+  git submodule set-url subprojects/libgd "$srcdir/libgd"
   git submodule update
 }
 
@@ -43,6 +42,16 @@
   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)
   groups=(gnome)
@@ -51,16 +60,16 @@
 
 ### 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() {
   pkgdesc="Library for extending the $pkgdesc"
   depends=(gtk3)
-  mv libne "$pkgdir/usr"
+  provides=(libnautilus-extension.so)
+  mv libne/* "$pkgdir"
 }
 
 # vim:set sw=2 et: