From dd71086120403a4ee67b5ab1bec559d48313cb98b51921f103be43bb102f1efc Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Sat, 17 Apr 2021 08:18:34 +0000
Subject: [PATCH] Accepting request 885822 from
 home:qkzhu:branches:GNOME:Factory

- Rebase SLE patches gvfs-nds.patch and gvfs-nvvfs.patch for version
  1.48.0:
  + Use meson summary function instead of custom output(boo#1184104).

OBS-URL: https://build.opensuse.org/request/show/885822
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=356
---
 gvfs-nds.patch   | 20 ++++++++++----------
 gvfs-nvvfs.patch | 22 +++++++++++-----------
 gvfs.changes     |  7 +++++++
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/gvfs-nds.patch b/gvfs-nds.patch
index a784aba..f1a0371 100644
--- a/gvfs-nds.patch
+++ b/gvfs-nds.patch
@@ -849,10 +849,10 @@ index 0000000..1068344
 +AutoMount=false
 +Scheme=nds
 diff --git a/meson.build b/meson.build
-index 080637b..6525b79 100644
+index d844335..34d754f 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -449,6 +449,12 @@ config_h.set('HAVE_LIBMTP', enable_mtp)
+@@ -448,6 +448,12 @@ config_h.set('HAVE_LIBMTP', enable_mtp)
  # *** AFP backend ***
  enable_afp = get_option('afp')
  
@@ -865,14 +865,14 @@ index 080637b..6525b79 100644
  # *** NFS backend ***
  enable_nfs = get_option('nfs')
  if enable_nfs
-@@ -507,6 +513,7 @@ output += '  google: ' + enable_google.to_string() + '\n'
- output += '  gphoto2: ' + enable_gphoto2.to_string() + '\n'
- output += '  http: ' + enable_http.to_string() + '\n'
- output += '  mtp: ' + enable_mtp.to_string() + '\n'
-+output += '  nds: ' + enable_nds.to_string() + '\n'
- output += '  nfs: ' + enable_nfs.to_string() + '\n'
- output += '  sftp: ' + enable_sftp.to_string() + '\n'
- output += '  smb: ' + enable_samba.to_string() + '\n'
+@@ -507,6 +513,7 @@ summary({
+   'gphoto2': enable_gphoto2,
+   'http': enable_http,
+   'mtp': enable_mtp,
++  'nds': enable_nds,
+   'nfs': enable_nfs,
+   'sftp': enable_sftp,
+   'smb': enable_samba,
 diff --git a/meson_options.txt b/meson_options.txt
 index 32f10d4..dced004 100644
 --- a/meson_options.txt
diff --git a/gvfs-nvvfs.patch b/gvfs-nvvfs.patch
index 1a9d95d..4a2db20 100644
--- a/gvfs-nvvfs.patch
+++ b/gvfs-nvvfs.patch
@@ -652,7 +652,7 @@ index 0000000..eebf062
 +
 +#endif /* __G_VFS_BACKEND_NVVFS_H__ */
 diff --git a/daemon/meson.build b/daemon/meson.build
-index dabdcb2..81e219a 100644
+index dabdcb2..bc90afd 100644
 --- a/daemon/meson.build
 +++ b/daemon/meson.build
 @@ -558,6 +558,20 @@ if enable_nfs
@@ -688,10 +688,10 @@ index 0000000..c5d6f8e
 +AutoMount=false
 +Scheme=nvvfs
 diff --git a/meson.build b/meson.build
-index 6525b79..016d4c7 100644
+index 34d754f..98d5332 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -461,6 +461,9 @@ if enable_nfs
+@@ -460,6 +460,9 @@ if enable_nfs
    libnfs_dep = dependency('libnfs', version: '>= 1.9.8')
  endif
  
@@ -701,14 +701,14 @@ index 6525b79..016d4c7 100644
  # *** SFTP backend ***
  enable_sftp = get_option('sftp')
  if enable_sftp
-@@ -514,6 +517,7 @@ output += '  gphoto2: ' + enable_gphoto2.to_string() + '\n'
- output += '  http: ' + enable_http.to_string() + '\n'
- output += '  mtp: ' + enable_mtp.to_string() + '\n'
- output += '  nds: ' + enable_nds.to_string() + '\n'
-+output += '  nvvfs: ' + enable_nvvfs.to_string() + '\n'
- output += '  nfs: ' + enable_nfs.to_string() + '\n'
- output += '  sftp: ' + enable_sftp.to_string() + '\n'
- output += '  smb: ' + enable_samba.to_string() + '\n'
+@@ -514,6 +517,7 @@ summary({
+   'http': enable_http,
+   'mtp': enable_mtp,
+   'nds': enable_nds,
++  'nvvfs': enable_nvvfs,
+   'nfs': enable_nfs,
+   'sftp': enable_sftp,
+   'smb': enable_samba,
 diff --git a/meson_options.txt b/meson_options.txt
 index dced004..e7a9398 100644
 --- a/meson_options.txt
diff --git a/gvfs.changes b/gvfs.changes
index 341a417..7fb73fb 100644
--- a/gvfs.changes
+++ b/gvfs.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Apr 16 04:51:53 UTC 2021 - QK ZHU <qkzhu@suse.com>
+
+- Rebase SLE patches gvfs-nds.patch and gvfs-nvvfs.patch for version
+  1.48.0:
+  + Use meson summary function instead of custom output(boo#1184104).
+
 -------------------------------------------------------------------
 Sat Mar 20 07:08:17 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>