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

[Jan Steffens]

    Date: Monday, October 7, 2019 @ 12:35:27
  Author: heftig
Revision: 364015

3.34.1-1

Modified:
  nautilus/trunk/PKGBUILD
Deleted:
  nautilus/trunk/sushi.diff

------------+
 PKGBUILD   |   13 ++++---------
 sushi.diff |   13 -------------
 2 files changed, 4 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-07 12:33:23 UTC (rev 364014)
+++ PKGBUILD	2019-10-07 12:35:27 UTC (rev 364015)
@@ -3,7 +3,7 @@
 
 pkgbase=nautilus
 pkgname=(nautilus libnautilus-extension)
-pkgver=3.34.0+3+ge3d7846c4
+pkgver=3.34.1
 pkgrel=1
 pkgdesc="Default file manager for GNOME"
 url="https://wiki.gnome.org/Apps/Nautilus"
@@ -13,20 +13,15 @@
          gst-plugins-base-libs tracker-miners)
 makedepends=(gobject-introspection git gtk-doc meson appstream-glib)
 options=(!emptydirs)
-_commit=e3d7846c4ea43e1cc7c170a5753b4bd58881e07e  # master
+_commit=7a2a59b6847580aa9f73b4670fc03bf2a15f7708  # tags/3.34.1^0
 source=("git+https://gitlab.gnome.org/GNOME/nautilus.git#commit=$_commit"
-        "git+https://gitlab.gnome.org/GNOME/libgd.git"
-        sushi.diff)
+        "git+https://gitlab.gnome.org/GNOME/libgd.git")
 sha256sums=('SKIP'
-            'SKIP'
-            '4c987be3b2d2d1ddec6889dc4434308acf9f41dfd6e60f350da9d8616e89385c')
+            'SKIP')
 
 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

Deleted: sushi.diff
===================================================================
--- sushi.diff	2019-10-07 12:33:23 UTC (rev 364014)
+++ sushi.diff	2019-10-07 12:35:27 UTC (rev 364015)
@@ -1,13 +0,0 @@
-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,