rpm/gvfs
SHA256
1
0
Fork 0
forked from pool/gvfs
Code Pull Requests Activity

Accepting request 741461 from GNOME:Next

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/741461
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=335
This commit is contained in:
Bjørn Lie 2019-10-24 11:03:23 +00:00 committed by Git OBS Bridge
parent f7e4a66e92
commit 853406a954
3 changed files with 147 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
gvfs-nds.patch
View File

@ -1,7 +1,8 @@
Index: gvfs-1.42.1/daemon/gvfsbackendnds.c diff --git a/daemon/gvfsbackendnds.c b/daemon/gvfsbackendnds.c
=================================================================== new file mode 100644
index 0000000..960d457
--- /dev/null --- /dev/null
+++ gvfs-1.42.1/daemon/gvfsbackendnds.c +++ b/daemon/gvfsbackendnds.c
@@ -0,0 +1,747 @@ @@ -0,0 +1,747 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode; nil; -*- */ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode; nil; -*- */
+/* GIO - GLib Input, Output and Streaming Library +/* GIO - GLib Input, Output and Streaming Library
@ -750,11 +751,11 @@ Index: gvfs-1.42.1/daemon/gvfsbackendnds.c
+{ +{
+ g_set_application_name (_("Displaying Embedded Objects")); + g_set_application_name (_("Displaying Embedded Objects"));
+} +}
diff --git a/daemon/gvfsbackendnds.h b/daemon/gvfsbackendnds.h
Index: gvfs-1.42.1/daemon/gvfsbackendnds.h new file mode 100644
=================================================================== index 0000000..0b48ad6
--- /dev/null --- /dev/null
+++ gvfs-1.42.1/daemon/gvfsbackendnds.h +++ b/daemon/gvfsbackendnds.h
@@ -0,0 +1,53 @@ @@ -0,0 +1,53 @@
+/* GIO - GLib Input, Output and Streaming Library +/* GIO - GLib Input, Output and Streaming Library
+ * + *
@ -809,24 +810,48 @@ Index: gvfs-1.42.1/daemon/gvfsbackendnds.h
+G_END_DECLS +G_END_DECLS
+ +
+#endif /* __G_VFS_BACKEND_NDS_H__ */ +#endif /* __G_VFS_BACKEND_NDS_H__ */
diff --git a/daemon/meson.build b/daemon/meson.build
Index: gvfs-1.42.1/meson_options.txt index dffeef3..dabdcb2 100644
=================================================================== --- a/daemon/meson.build
--- gvfs-1.42.1.orig/meson_options.txt +++ b/daemon/meson.build
+++ gvfs-1.42.1/meson_options.txt @@ -530,6 +530,22 @@ if enable_afp
@@ -12,6 +12,7 @@ option('google', type: 'boolean', value: mounts += ['afp-browse']
option('gphoto2', type: 'boolean', value: true, description: 'build with gphoto2 backend and volume monitor') endif
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') +if enable_nds
+option('nds', type: 'boolean', value: true, description: 'build with nds backend') + sources = daemon_main_sources + files('gvfsbackendnds.c')
option('nfs', type: 'boolean', value: true, description: 'build with nfs backend') +
option('sftp', type: 'boolean', value: true, description: 'build with sftp backend') + deps = [libdl_dep]
option('smb', type: 'boolean', value: true, description: 'build with smb backends') +
+ cflags = [
Index: gvfs-1.42.1/meson.build + '-DBACKEND_HEADER=gvfsbackendnds.h',
=================================================================== + '-DDEFAULT_BACKEND_TYPE=nds',
--- gvfs-1.42.1.orig/meson.build + '-DBACKEND_TYPES="nds", G_VFS_TYPE_BACKEND_NDS,',
+++ gvfs-1.42.1/meson.build + '-DMAX_JOB_THREADS=1',
+ ]
+
+ programs += [['gvfsd-nds', {'sources': sources, 'dependencies': deps, 'c_args': cflags}]]
+ mounts += ['nds']
+endif
+
if enable_nfs
cflags = [
'-DBACKEND_HEADER=gvfsbackendnfs.h',
diff --git a/daemon/nds.mount.in b/daemon/nds.mount.in
new file mode 100644
index 0000000..1068344
--- /dev/null
+++ b/daemon/nds.mount.in
@@ -0,0 +1,5 @@
+[Mount]
+Type=nds
+Exec=@libexecdir@/gvfsd-nds
+AutoMount=false
+Scheme=nds
diff --git a/meson.build b/meson.build
index 080637b..6525b79 100644
--- a/meson.build
+++ b/meson.build
@@ -449,6 +449,12 @@ config_h.set('HAVE_LIBMTP', enable_mtp) @@ -449,6 +449,12 @@ config_h.set('HAVE_LIBMTP', enable_mtp)
# *** AFP backend *** # *** AFP backend ***
enable_afp = get_option('afp') enable_afp = get_option('afp')
@ -840,31 +865,23 @@ Index: gvfs-1.42.1/meson.build
# *** NFS backend *** # *** NFS backend ***
enable_nfs = get_option('nfs') enable_nfs = get_option('nfs')
if enable_nfs if enable_nfs
@@ -507,6 +513,7 @@ output += ' google: ' + enable_google.to_string() + '\n'
Index: gvfs-1.42.1/daemon/meson.build output += ' gphoto2: ' + enable_gphoto2.to_string() + '\n'
=================================================================== output += ' http: ' + enable_http.to_string() + '\n'
--- gvfs-1.42.1.orig/daemon/meson.build output += ' mtp: ' + enable_mtp.to_string() + '\n'
+++ gvfs-1.42.1/daemon/meson.build +output += ' nds: ' + enable_nds.to_string() + '\n'
@@ -530,6 +530,22 @@ if enable_afp output += ' nfs: ' + enable_nfs.to_string() + '\n'
mounts += ['afp-browse'] output += ' sftp: ' + enable_sftp.to_string() + '\n'
endif output += ' smb: ' + enable_samba.to_string() + '\n'
diff --git a/meson_options.txt b/meson_options.txt
+if enable_nds index 32f10d4..dced004 100644
+ sources = daemon_main_sources + files('gvfsbackendnds.c') --- a/meson_options.txt
+ +++ b/meson_options.txt
+ deps = [libdl_dep] @@ -12,6 +12,7 @@ option('google', type: 'boolean', value: true, description: 'build with google b
+ option('gphoto2', type: 'boolean', value: true, description: 'build with gphoto2 backend and volume monitor')
+ cflags = [ option('http', type: 'boolean', value: true, description: 'build with http/dav backends')
+ '-DBACKEND_HEADER=gvfsbackendnds.h', option('mtp', type: 'boolean', value: true, description: 'build with mtp backend and volume monitor')
+ '-DDEFAULT_BACKEND_TYPE=nds', +option('nds', type: 'boolean', value: true, description: 'build with nds backend')
+ '-DBACKEND_TYPES="nds", G_VFS_TYPE_BACKEND_NDS', option('nfs', type: 'boolean', value: true, description: 'build with nfs backend')
+ '-DMAX_JOB_THREADS=1' option('sftp', type: 'boolean', value: true, description: 'build with sftp backend')
+ ] option('smb', type: 'boolean', value: true, description: 'build with smb backends')
+
+ programs += [['gvfsd-nds', sources, deps, cflags]]
+ mounts += ['nds']
+endif
+
if enable_nfs
cflags = [
'-DBACKEND_HEADER=gvfsbackendnfs.h',

121
gvfs-nvvfs.patch
View File

@ -1,7 +1,8 @@
Index: gvfs-1.42.1/daemon/gvfsbackendnvvfs.c diff --git a/daemon/gvfsbackendnvvfs.c b/daemon/gvfsbackendnvvfs.c
=================================================================== new file mode 100644
index 0000000..2e5abdc
--- /dev/null --- /dev/null
+++ gvfs-1.42.1/daemon/gvfsbackendnvvfs.c +++ b/daemon/gvfsbackendnvvfs.c
@@ -0,0 +1,591 @@ @@ -0,0 +1,591 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/* GIO - GLib Input, Output and Streaming Library +/* GIO - GLib Input, Output and Streaming Library
@ -594,11 +595,11 @@ Index: gvfs-1.42.1/daemon/gvfsbackendnvvfs.c
+ backend_class->try_query_info = try_query_info; + backend_class->try_query_info = try_query_info;
+ backend_class->try_enumerate = try_enumerate; + backend_class->try_enumerate = try_enumerate;
+} +}
diff --git a/daemon/gvfsbackendnvvfs.h b/daemon/gvfsbackendnvvfs.h
Index: gvfs-1.42.1/daemon/gvfsbackendnvvfs.h new file mode 100644
=================================================================== index 0000000..eebf062
--- /dev/null --- /dev/null
+++ gvfs-1.42.1/daemon/gvfsbackendnvvfs.h +++ b/daemon/gvfsbackendnvvfs.h
@@ -0,0 +1,50 @@ @@ -0,0 +1,50 @@
+/* GIO - GLib Input, Output and Streaming Library +/* GIO - GLib Input, Output and Streaming Library
+ * + *
@ -650,24 +651,46 @@ Index: gvfs-1.42.1/daemon/gvfsbackendnvvfs.h
+G_END_DECLS +G_END_DECLS
+ +
+#endif /* __G_VFS_BACKEND_NVVFS_H__ */ +#endif /* __G_VFS_BACKEND_NVVFS_H__ */
diff --git a/daemon/meson.build b/daemon/meson.build
Index: gvfs-1.42.1/meson_options.txt index dabdcb2..81e219a 100644
=================================================================== --- a/daemon/meson.build
--- gvfs-1.42.1.orig/meson_options.txt +++ b/daemon/meson.build
+++ gvfs-1.42.1/meson_options.txt @@ -558,6 +558,20 @@ if enable_nfs
@@ -14,6 +14,7 @@ option('http', type: 'boolean', value: t mounts += ['nfs']
option('mtp', type: 'boolean', value: true, description: 'build with mtp backend and volume monitor') endif
option('nds', type: 'boolean', value: true, description: 'build with nds backend')
option('nfs', type: 'boolean', value: true, description: 'build with nfs backend') +if enable_nvvfs
+option('nvvfs', type: 'boolean', value: true, description: 'build with nvvfs backend') + sources = daemon_main_sources + files('gvfsbackendnvvfs.c')
option('sftp', type: 'boolean', value: true, description: 'build with sftp backend') +
option('smb', type: 'boolean', value: true, description: 'build with smb backends') + cflags = [
option('udisks2', type: 'boolean', value: true, description: 'build with udisks2 volume monitor') + '-DBACKEND_HEADER=gvfsbackendnvvfs.h',
+ '-DDEFAULT_BACKEND_TYPE=nvvfs',
Index: gvfs-1.42.1/meson.build + '-DBACKEND_TYPES="nvvfs", G_VFS_TYPE_BACKEND_NVVFS,',
=================================================================== + '-DMA_JOB_THREADS=1',
--- gvfs-1.42.1.orig/meson.build + ]
+++ gvfs-1.42.1/meson.build +
+ programs += [['gvfsd-nvvfs', {'sources': sources, 'dependencies': [gio_unix_dep], 'c_args': cflags}]]
+ mounts += ['nvvfs']
+endif
+
foreach program: programs
options = program[1]
kwargs = {
diff --git a/daemon/nvvfs.mount.in b/daemon/nvvfs.mount.in
new file mode 100644
index 0000000..c5d6f8e
--- /dev/null
+++ b/daemon/nvvfs.mount.in
@@ -0,0 +1,5 @@
+[Mount]
+Type=nvvfs
+Exec=@libexecdir@/gvfsd-nvvfs
+AutoMount=false
+Scheme=nvvfs
diff --git a/meson.build b/meson.build
index 6525b79..016d4c7 100644
--- a/meson.build
+++ b/meson.build
@@ -461,6 +461,9 @@ if enable_nfs @@ -461,6 +461,9 @@ if enable_nfs
libnfs_dep = dependency('libnfs', version: '>= 1.9.8') libnfs_dep = dependency('libnfs', version: '>= 1.9.8')
endif endif
@ -678,31 +701,23 @@ Index: gvfs-1.42.1/meson.build
# *** SFTP backend *** # *** SFTP backend ***
enable_sftp = get_option('sftp') enable_sftp = get_option('sftp')
if enable_sftp if enable_sftp
@@ -514,6 +517,7 @@ output += ' gphoto2: ' + enable_gphoto2.to_string() + '\n'
Index: gvfs-1.42.1/daemon/meson.build output += ' http: ' + enable_http.to_string() + '\n'
=================================================================== output += ' mtp: ' + enable_mtp.to_string() + '\n'
--- gvfs-1.42.1.orig/daemon/meson.build output += ' nds: ' + enable_nds.to_string() + '\n'
+++ gvfs-1.42.1/daemon/meson.build +output += ' nvvfs: ' + enable_nvvfs.to_string() + '\n'
@@ -558,6 +558,22 @@ if enable_nfs output += ' nfs: ' + enable_nfs.to_string() + '\n'
mounts += ['nfs'] output += ' sftp: ' + enable_sftp.to_string() + '\n'
endif output += ' smb: ' + enable_samba.to_string() + '\n'
diff --git a/meson_options.txt b/meson_options.txt
+if enable_nvvfs index dced004..e7a9398 100644
+ sources = daemon_main_sources + files('gvfsbackendnvvfs.c') --- a/meson_options.txt
+ +++ b/meson_options.txt
+ deps = [] @@ -14,6 +14,7 @@ option('http', type: 'boolean', value: true, description: 'build with http/dav b
+ option('mtp', type: 'boolean', value: true, description: 'build with mtp backend and volume monitor')
+ cflags = [ option('nds', type: 'boolean', value: true, description: 'build with nds backend')
+ '-DBACKEND_HEADER=gvfsbackendnvvfs.h', option('nfs', type: 'boolean', value: true, description: 'build with nfs backend')
+ '-DDEFAULT_BACKEND_TYPE=nvvfs', +option('nvvfs', type: 'boolean', value: true, description: 'build with nvvfs backend')
+ '-DBACKEND_TYPES="nvvfs", G_VFS_TYPE_BACKEND_NVVFS', option('sftp', type: 'boolean', value: true, description: 'build with sftp backend')
+ '-DMA_JOB_THREADS=1' option('smb', type: 'boolean', value: true, description: 'build with smb backends')
+ ] option('udisks2', type: 'boolean', value: true, description: 'build with udisks2 volume monitor')
+
+ programs += [['gvfsd-nvvfs', sources, deps, cflags]]
+ mounts += ['nvvfs']
+endif
+
foreach program: programs
options = program[1]
kwargs = {

9
gvfs.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Oct 21 07:45:59 UTC 2019 - QK ZHU <qkzhu@suse.com>
- Rebase SLE patches gvfs-nds.patch and gvfs-nvvfs.patch for version
1.42.1:
+ Add daemon/nds.mount.in.
+ Add daemon/nvvfs.mount.in.
+ meson porting fixes.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 14 07:17:45 UTC 2019 - QK ZHU <qkzhu@suse.com> Mon Oct 14 07:17:45 UTC 2019 - QK ZHU <qkzhu@suse.com>