Accepting request 1120787 from GNOME:Factory
OBS-URL: https://build.opensuse.org/request/show/1120787 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gvfs?expand=0&rev=188
This commit is contained in:
Ana Guerrero
Git OBS Bridge
commit
dd6cfd650b
@ -830,7 +830,7 @@ index dffeef3..dabdcb2 100644
|
||||
+ '-DMAX_JOB_THREADS=1',
|
||||
+ ]
|
||||
+
|
||||
+ programs += [['gvfsd-nds', {'sources': sources, 'dependencies': deps, 'c_args': cflags}]]
|
||||
+ programs += {'gvfsd-nds': {'sources': sources, 'dependencies': deps, 'c_args': cflags}}
|
||||
+ mounts += ['nds']
|
||||
+endif
|
||||
+
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
diff --git a/daemon/gvfsbackendnvvfs.c b/daemon/gvfsbackendnvvfs.c
|
||||
new file mode 100644
|
||||
index 0000000..2e5abdc
|
||||
Index: gvfs-1.52.0/daemon/gvfsbackendnvvfs.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ b/daemon/gvfsbackendnvvfs.c
|
||||
+++ gvfs-1.52.0/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,11 +594,10 @@ index 0000000..2e5abdc
|
||||
+ backend_class->try_query_info = try_query_info;
|
||||
+ backend_class->try_enumerate = try_enumerate;
|
||||
+}
|
||||
diff --git a/daemon/gvfsbackendnvvfs.h b/daemon/gvfsbackendnvvfs.h
|
||||
new file mode 100644
|
||||
index 0000000..eebf062
|
||||
Index: gvfs-1.52.0/daemon/gvfsbackendnvvfs.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ b/daemon/gvfsbackendnvvfs.h
|
||||
+++ gvfs-1.52.0/daemon/gvfsbackendnvvfs.h
|
||||
@@ -0,0 +1,50 @@
|
||||
+/* GIO - GLib Input, Output and Streaming Library
|
||||
+ *
|
||||
@ -651,11 +649,11 @@ index 0000000..eebf062
|
||||
+G_END_DECLS
|
||||
+
|
||||
+#endif /* __G_VFS_BACKEND_NVVFS_H__ */
|
||||
diff --git a/daemon/meson.build b/daemon/meson.build
|
||||
index dabdcb2..bc90afd 100644
|
||||
--- a/daemon/meson.build
|
||||
+++ b/daemon/meson.build
|
||||
@@ -558,6 +558,20 @@ if enable_nfs
|
||||
Index: gvfs-1.52.0/daemon/meson.build
|
||||
===================================================================
|
||||
--- gvfs-1.52.0.orig/daemon/meson.build
|
||||
+++ gvfs-1.52.0/daemon/meson.build
|
||||
@@ -557,6 +557,20 @@ if enable_nfs
|
||||
mounts += ['nfs']
|
||||
endif
|
||||
|
||||
@ -669,29 +667,28 @@ index dabdcb2..bc90afd 100644
|
||||
+ '-DMA_JOB_THREADS=1',
|
||||
+ ]
|
||||
+
|
||||
+ programs += [['gvfsd-nvvfs', {'sources': sources, 'dependencies': [gio_unix_dep], 'c_args': cflags}]]
|
||||
+ programs += {'gvfsd-nvvfs': {'sources': sources, 'dependencies': [gio_unix_dep], 'c_args': cflags}}
|
||||
+ mounts += ['nvvfs']
|
||||
+endif
|
||||
+
|
||||
foreach program: programs
|
||||
options = program[1]
|
||||
foreach program, options: programs
|
||||
kwargs = {
|
||||
diff --git a/daemon/nvvfs.mount.in b/daemon/nvvfs.mount.in
|
||||
new file mode 100644
|
||||
index 0000000..c5d6f8e
|
||||
'sources': daemon_main_sources + options.get('sources', []),
|
||||
Index: gvfs-1.52.0/daemon/nvvfs.mount.in
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ b/daemon/nvvfs.mount.in
|
||||
+++ gvfs-1.52.0/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 34d754f..98d5332 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -460,6 +460,9 @@ if enable_nfs
|
||||
Index: gvfs-1.52.0/meson.build
|
||||
===================================================================
|
||||
--- gvfs-1.52.0.orig/meson.build
|
||||
+++ gvfs-1.52.0/meson.build
|
||||
@@ -462,6 +462,9 @@ if enable_nfs
|
||||
libnfs_dep = dependency('libnfs', version: '>= 1.9.8')
|
||||
endif
|
||||
|
||||
@ -700,8 +697,8 @@ index 34d754f..98d5332 100644
|
||||
+
|
||||
# *** SFTP backend ***
|
||||
enable_sftp = get_option('sftp')
|
||||
if enable_sftp
|
||||
@@ -514,6 +517,7 @@ summary({
|
||||
|
||||
@@ -512,6 +515,7 @@ summary({
|
||||
'http': enable_http,
|
||||
'mtp': enable_mtp,
|
||||
'nds': enable_nds,
|
||||
@ -709,11 +706,11 @@ index 34d754f..98d5332 100644
|
||||
'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
|
||||
+++ b/meson_options.txt
|
||||
@@ -14,6 +14,7 @@ option('http', type: 'boolean', value: true, description: 'build with http/dav b
|
||||
Index: gvfs-1.52.0/meson_options.txt
|
||||
===================================================================
|
||||
--- gvfs-1.52.0.orig/meson_options.txt
|
||||
+++ gvfs-1.52.0/meson_options.txt
|
||||
@@ -15,6 +15,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')
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 27 07:45:47 UTC 2023 - Yifan Jiang <yfjiang@suse.com>
|
||||
|
||||
- Use older way than autopatch on SLE/Leap, which is not ready for
|
||||
the macro.
|
||||
- Rebase gvfs-nvvfs.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 20 13:43:06 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user