[arch-commits] Commit in nautilus/repos/extra-x86_64 (PKGBUILD PKGBUILD sushi.diff)

[Jan Steffens]

    Date: Monday, September 23, 2019 @ 18:12:33
  Author: heftig
Revision: 363277

archrelease: copy trunk to extra-x86_64

Added:
  nautilus/repos/extra-x86_64/PKGBUILD
    (from rev 363275, nautilus/trunk/PKGBUILD)
  nautilus/repos/extra-x86_64/sushi.diff
    (from rev 363275, nautilus/trunk/sushi.diff)
Deleted:
  nautilus/repos/extra-x86_64/PKGBUILD

------------+
 PKGBUILD   |  137 ++++++++++++++++++++++++++++++-----------------------------
 sushi.diff |   13 +++++
 2 files changed, 84 insertions(+), 66 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-23 18:12:33 UTC (rev 363276)
+++ PKGBUILD	2019-09-23 18:12:33 UTC (rev 363277)
@@ -1,66 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=nautilus
-pkgname=(nautilus libnautilus-extension)
-pkgver=3.34.0
-pkgrel=1
-pkgdesc="Default file manager for GNOME"
-url="https://wiki.gnome.org/Apps/Nautilus"
-arch=(x86_64)
-license=(GPL)
-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=6a55af66aff937e6e654759f1d6f84b0e07aaa2f  # tags/3.34.0^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 config --local submodule.subprojects/libgd.url "$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
-  ninja -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-package_nautilus() {
-  depends+=(libnautilus-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
-}
-
-package_libnautilus-extension() {
-  pkgdesc="Library for extending the $pkgdesc"
-  depends=(gtk3)
-  mv libne "$pkgdir/usr"
-}
-
-# vim:set sw=2 et:

Copied: nautilus/repos/extra-x86_64/PKGBUILD (from rev 363275, nautilus/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-09-23 18:12:33 UTC (rev 363277)
@@ -0,0 +1,71 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=nautilus
+pkgname=(nautilus libnautilus-extension)
+pkgver=3.34.0+3+ge3d7846c4
+pkgrel=1
+pkgdesc="Default file manager for GNOME"
+url="https://wiki.gnome.org/Apps/Nautilus"
+arch=(x86_64)
+license=(GPL)
+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=e3d7846c4ea43e1cc7c170a5753b4bd58881e07e  # master
+source=("git+https://gitlab.gnome.org/GNOME/nautilus.git#commit=$_commit"
+        "git+https://gitlab.gnome.org/GNOME/libgd.git"
+        sushi.diff)
+sha256sums=('SKIP'
+            'SKIP'
+            '4c987be3b2d2d1ddec6889dc4434308acf9f41dfd6e60f350da9d8616e89385c')
+
+prepare() {
+  cd $pkgbase
+
+  # https://gitlab.gnome.org/GNOME/nautilus/issues/1229
+  git apply -3 ../sushi.diff
+
+  git submodule init
+  git config --local submodule.subprojects/libgd.url "$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
+  ninja -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package_nautilus() {
+  depends+=(libnautilus-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
+}
+
+package_libnautilus-extension() {
+  pkgdesc="Library for extending the $pkgdesc"
+  depends=(gtk3)
+  mv libne "$pkgdir/usr"
+}
+
+# vim:set sw=2 et:

Copied: nautilus/repos/extra-x86_64/sushi.diff (from rev 363275, nautilus/trunk/sushi.diff)
===================================================================
--- sushi.diff	                        (rev 0)
+++ sushi.diff	2019-09-23 18:12:33 UTC (rev 363277)
@@ -0,0 +1,13 @@
+diff --git i/src/nautilus-previewer.c w/src/nautilus-previewer.c
+index 0511dc991..40a02522e 100644
+--- i/src/nautilus-previewer.c
++++ w/src/nautilus-previewer.c
+@@ -48,7 +48,7 @@ ensure_previewer_v2_proxy (void)
+         GDBusConnection *connection = g_application_get_dbus_connection (g_application_get_default ());
+ 
+         previewer_v2_proxy = g_dbus_proxy_new_sync (connection,
+-                                                    G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
++                                                    G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START_AT_CONSTRUCTION,
+                                                     NULL,
+                                                     PREVIEWER_DBUS_NAME,
+                                                     PREVIEWER_DBUS_PATH,