Accepting request 738193 from GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/738193
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=333

gvfs-nds.patch

@@ -1,7 +1,7 @@
-Index: b/daemon/gvfsbackendnds.c
+Index: gvfs-1.42.1/daemon/gvfsbackendnds.c
 ===================================================================
 --- /dev/null
-+++ b/daemon/gvfsbackendnds.c
++++ gvfs-1.42.1/daemon/gvfsbackendnds.c
 @@ -0,0 +1,747 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode; nil; -*- */
 +/* GIO - GLib Input, Output and Streaming Library
@@ -751,10 +751,10 @@ Index: b/daemon/gvfsbackendnds.c
 +  g_set_application_name (_("Displaying Embedded Objects"));
 +}
 
-Index: b/daemon/gvfsbackendnds.h
+Index: gvfs-1.42.1/daemon/gvfsbackendnds.h
 ===================================================================
 --- /dev/null
-+++ b/daemon/gvfsbackendncs.h
++++ gvfs-1.42.1/daemon/gvfsbackendnds.h
 @@ -0,0 +1,53 @@
 +/* GIO - GLib Input, Output and Streaming Library
 + *
@@ -810,24 +810,24 @@ Index: b/daemon/gvfsbackendnds.h
 +
 +#endif /* __G_VFS_BACKEND_NDS_H__ */
 
-Index: b/meson_options.txt
+Index: gvfs-1.42.1/meson_options.txt
 ===================================================================
---- a/meson_options.txt
+--- gvfs-1.42.1.orig/meson_options.txt
-+++ b/meson_options.txt
++++ gvfs-1.42.1/meson_options.txt
-@@ -15,6 +15,7 @@ option('google', type: 'boolean', value:
+@@ -12,6 +12,7 @@ option('google', type: 'boolean', value:
  option('gphoto2', type: 'boolean', value: true, description: 'build with gphoto2 backend and volume monitor')
  option('http', type: 'boolean', value: true, description: 'build with http/dav backends')
  option('mtp', type: 'boolean', value: true, description: 'build with mtp backend and volume monitor')
 +option('nds', type: 'boolean', value: true, description: 'build with nds backend')
  option('nfs', type: 'boolean', value: true, description: 'build with nfs backend')
+ option('sftp', type: 'boolean', value: true, description: 'build with sftp backend')
  option('smb', type: 'boolean', value: true, description: 'build with smb backends')
- option('udisks2', type: 'boolean', value: true, description: 'build with udisks2 volume monitor')
 
-Index: b/meson.build
+Index: gvfs-1.42.1/meson.build
 ===================================================================
---- a/meson.build
+--- gvfs-1.42.1.orig/meson.build
-+++ b/meson.build
++++ gvfs-1.42.1/meson.build
-@@ -465,6 +465,12 @@ config_h.set('HAVE_LIBMTP', enable_mtp)
+@@ -449,6 +449,12 @@ config_h.set('HAVE_LIBMTP', enable_mtp)
  # *** AFP backend ***
  enable_afp = get_option('afp')
  
@@ -841,11 +841,11 @@ Index: b/meson.build
  enable_nfs = get_option('nfs')
  if enable_nfs
 
-Index: b/daemon/meson.build
+Index: gvfs-1.42.1/daemon/meson.build
 ===================================================================
---- a/daemon/meson.build
+--- gvfs-1.42.1.orig/daemon/meson.build
-+++ b/daemon/meson.build
++++ gvfs-1.42.1/daemon/meson.build
-@@ -562,6 +562,22 @@ if enable_afp
+@@ -530,6 +530,22 @@ if enable_afp
    mounts += ['afp-browse']
  endif
  
@@ -866,4 +866,5 @@ Index: b/daemon/meson.build
 +endif
 +
  if enable_nfs
-   sources = files('gvfsbackendnfs.c')
+   cflags = [
+     '-DBACKEND_HEADER=gvfsbackendnfs.h',

gvfs-nvvfs.patch

@@ -1,7 +1,7 @@
-Index: b/daemon/gvfsbackendnvvfs.c
+Index: gvfs-1.42.1/daemon/gvfsbackendnvvfs.c
 ===================================================================
 --- /dev/null
-+++ b/daemon/gvfsbackendnvvfs.c
++++ gvfs-1.42.1/daemon/gvfsbackendnvvfs.c
 @@ -0,0 +1,591 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 +/* GIO - GLib Input, Output and Streaming Library
@@ -595,10 +595,10 @@ Index: b/daemon/gvfsbackendnvvfs.c
 +  backend_class->try_enumerate = try_enumerate;
 +}
 
-Index: b/daemon/gvfsbackendnvvfs.h
+Index: gvfs-1.42.1/daemon/gvfsbackendnvvfs.h
 ===================================================================
 --- /dev/null
-+++ b/daemon/gvfsbackendnvvfs.h
++++ gvfs-1.42.1/daemon/gvfsbackendnvvfs.h
 @@ -0,0 +1,50 @@
 +/* GIO - GLib Input, Output and Streaming Library
 + *
@@ -651,38 +651,39 @@ Index: b/daemon/gvfsbackendnvvfs.h
 +
 +#endif /* __G_VFS_BACKEND_NVVFS_H__ */
 
-Index: b/meson_options.txt
+Index: gvfs-1.42.1/meson_options.txt
 ===================================================================
---- a/meson_options.txt
+--- gvfs-1.42.1.orig/meson_options.txt
-+++ b/meson_options.txt
++++ gvfs-1.42.1/meson_options.txt
-@@ -17,6 +17,7 @@ option('http', type: 'boolean', value: t
+@@ -14,6 +14,7 @@ option('http', type: 'boolean', value: t
  option('mtp', type: 'boolean', value: true, description: 'build with mtp backend and volume monitor')
  option('nds', type: 'boolean', value: true, description: 'build with nds backend')
  option('nfs', type: 'boolean', value: true, description: 'build with nfs backend')
 +option('nvvfs', type: 'boolean', value: true, description: 'build with nvvfs backend')
+ option('sftp', type: 'boolean', value: true, description: 'build with sftp backend')
  option('smb', type: 'boolean', value: true, description: 'build with smb backends')
  option('udisks2', type: 'boolean', value: true, description: 'build with udisks2 volume monitor')
 
-Index: b/meson.build
+Index: gvfs-1.42.1/meson.build
 ===================================================================
---- a/meson.build
+--- gvfs-1.42.1.orig/meson.build
-+++ b/meson.build
++++ gvfs-1.42.1/meson.build
-@@ -477,6 +477,9 @@ if enable_nfs
+@@ -461,6 +461,9 @@ if enable_nfs
    libnfs_dep = dependency('libnfs', version: '>= 1.9.8')
  endif
  
 +# *** NVVFS backend ***
 +enable_nvvfs = get_option('nvvfs')
 +
- # *** Enable development utils ***
+ # *** SFTP backend ***
- enable_devel_utils = get_option('devel_utils')
+ enable_sftp = get_option('sftp')
- enable_installed_tests = get_option('installed_tests')
+ if enable_sftp
 
-Index: b/daemon/meson.build
+Index: gvfs-1.42.1/daemon/meson.build
 ===================================================================
---- a/daemon/meson.build
+--- gvfs-1.42.1.orig/daemon/meson.build
-+++ b/daemon/meson.build
++++ gvfs-1.42.1/daemon/meson.build
-@@ -594,6 +594,22 @@ if enable_nfs
+@@ -558,6 +558,22 @@ if enable_nfs
    mounts += ['nfs']
  endif
  
@@ -703,5 +704,5 @@ Index: b/daemon/meson.build
 +endif
 +
  foreach program: programs
-   executable(
+   options = program[1]
-     program[0],
+   kwargs = {

gvfs.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Oct 14 07:17:45 UTC 2019 - QK ZHU <qkzhu@suse.com>
+
+- Rebase SLE patches for version 1.42.1:
+  + gvfs-nds.patch
+  + gvfs-nvvfs.patch
+
 -------------------------------------------------------------------
 Mon Oct  7 07:47:29 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>