[gvfs] Remove libgdu support
- From: Ondrej Holy <oholy src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gvfs] Remove libgdu support
- Date: Tue, 17 Apr 2018 10:57:40 +0000 (UTC)
commit 1db029df72bcd50dd877d388c2e0934d8ed3d321
Author: Ondrej Holy <oholy redhat com>
Date: Fri Apr 13 14:26:33 2018 +0200
Remove libgdu support
libgdu has been removed in 2011 and is superseded by libudisks2, so
there is no need to have gdu volume monitor in the tree.
meson.build | 7 -
meson_options.txt | 1 -
monitor/gdu/gdu-volume-monitor-daemon.c | 45 -
monitor/gdu/gdu.monitor | 5 -
monitor/gdu/ggdudrive.c | 1244 -------------
monitor/gdu/ggdudrive.h | 69 -
monitor/gdu/ggdumount.c | 1475 ---------------
monitor/gdu/ggdumount.h | 64 -
monitor/gdu/ggduvolume.c | 1884 --------------------
monitor/gdu/ggduvolume.h | 87 -
monitor/gdu/ggduvolumemonitor.c | 1812 -------------------
monitor/gdu/ggduvolumemonitor.h | 67 -
monitor/gdu/gvfs-gdu-volume-monitor.service.in | 7 -
monitor/gdu/meson.build | 76 -
.../gdu/org.gtk.vfs.GduVolumeMonitor.service.in | 4 -
monitor/meson.build | 4 -
po/POTFILES.in | 4 -
test/meson.build | 4 -
18 files changed, 0 insertions(+), 6859 deletions(-)
---
diff --git a/meson.build b/meson.build
index 2b6b350..5b836c6 100644
--- a/meson.build
+++ b/meson.build
@@ -330,12 +330,6 @@ if enable_fuse
endif
config_h.set('HAVE_FUSE', enable_fuse)
-# *** Check for gnome-disk-utility ***
-enable_gdu = get_option('gdu')
-if enable_gdu
- gdu_dep = dependency('gdu', version: '>= 3.0.2')
-endif
-
# *** Check for udisks2 ***
enable_udisks2 = get_option('udisks2')
if enable_udisks2
@@ -522,7 +516,6 @@ output += ' afp: ' + enable_afp.to_string() + '\n'
output += ' archive: ' + enable_archive.to_string() + '\n'
output += ' cdda: ' + enable_cdda.to_string() + '\n'
output += ' dnssd: ' + enable_dnssd.to_string() + '\n'
-output += ' gdu: ' + enable_gdu.to_string() + '\n'
output += ' goa: ' + enable_goa.to_string() + '\n'
output += ' google: ' + enable_google.to_string() + '\n'
output += ' gphoto2: ' + enable_gphoto2.to_string() + '\n'
diff --git a/meson_options.txt b/meson_options.txt
index 66e2ade..e4006db 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -7,7 +7,6 @@ option('afp', type: 'boolean', value: true, description: 'build with afp backend
option('archive', type: 'boolean', value: true, description: 'build with archive backend')
option('cdda', type: 'boolean', value: true, description: 'build with cdda backend')
option('dnssd', type: 'boolean', value: true, description: 'build with dnssd backend')
-option('gdu', type: 'boolean', value: false, description: 'build with gdu volume monitor')
option('goa', type: 'boolean', value: true, description: 'build with goa volume monitor')
option('google', type: 'boolean', value: true, description: 'build with google backend')
option('gphoto2', type: 'boolean', value: true, description: 'build with gphoto2 backend and volume monitor')
diff --git a/monitor/meson.build b/monitor/meson.build
index b6aa8de..f841bdc 100644
--- a/monitor/meson.build
+++ b/monitor/meson.build
@@ -1,9 +1,5 @@
subdir('proxy')
-if enable_gdu
- subdir('gdu')
-endif
-
if enable_udisks2
subdir('udisks2')
endif
diff --git a/po/POTFILES.in b/po/POTFILES.in
index da37920..7a87075 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -90,10 +90,6 @@ daemon/mount.c
daemon/org.gtk.vfs.file-operations.policy.in.in
metadata/meta-daemon.c
monitor/afc/afcvolume.c
-monitor/gdu/gdu-volume-monitor-daemon.c
-monitor/gdu/ggdudrive.c
-monitor/gdu/ggdumount.c
-monitor/gdu/ggduvolume.c
monitor/goa/goavolume.c
monitor/gphoto2/ggphoto2volume.c
monitor/gphoto2/ggphoto2volumemonitor.c
diff --git a/test/meson.build b/test/meson.build
index b6e23dd..53c3c97 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -41,10 +41,6 @@ if enable_installed_tests
test_data += [afc_monitor, afc_service]
endif
- if enable_gdu
- test_data += [gdu_monitor, gdu_service]
- endif
-
if enable_gphoto2
test_data += [gphoto2_monitor, gphoto2_service]
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]