diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-02 12:02:11 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-02 11:46:18 +0000 |
| commit | b40b6010077f875565ce90cd995222451e37321c (patch) | |
| tree | 5ad869c146407c8fa16197cd461991f78e500402 /scp2 | |
| parent | daa869222edc3aded82f0fc3e73f126b6cfd08ad (diff) | |
ditch gnome-vfs2 support
Change-Id: I882c04fd3a255f55511b1884157de26e7574e6db
Reviewed-on: https://gerrit.libreoffice.org/18262
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_gnome.mk | 3 | ||||
| -rw-r--r-- | scp2/InstallScript_setup_osl.mk | 2 | ||||
| -rw-r--r-- | scp2/Module_scp2.mk | 2 | ||||
| -rw-r--r-- | scp2/source/gnome/module_gnome.scp | 5 |
4 files changed, 4 insertions, 8 deletions
diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk index 3e2fa774d9d8..686f6c16cb94 100644 --- a/scp2/InstallModule_gnome.mk +++ b/scp2/InstallModule_gnome.mk @@ -13,9 +13,8 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome)) $(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\ ENABLE_GIO \ - ENABLE_GNOMEVFS \ ENABLE_LOCKDOWN \ - ENABLE_GTK \ + ENABLE_GTK \ )) $(eval $(call gb_InstallModule_add_scpfiles,scp2/gnome,\ diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk index ab776cc2cee1..0464d3542aed 100644 --- a/scp2/InstallScript_setup_osl.mk +++ b/scp2/InstallScript_setup_osl.mk @@ -33,7 +33,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\ $(if $(WITH_EXTENSION_INTEGRATION),\ scp2/extensions \ ) \ - $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\ + $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\ scp2/gnome \ ) \ $(if $(filter TRUE,$(ENABLE_KDE) $(ENABLE_KDE4)),\ diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 2db4fc7e966d..5b8ad47e3c8c 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -39,7 +39,7 @@ $(eval $(call gb_Module_add_targets,scp2,\ InstallModule_winexplorerext \ ) \ ) \ - $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\ + $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\ InstallModule_gnome \ ) \ $(if $(filter TRUE,$(ENABLE_KDE) $(ENABLE_KDE4)),\ diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index 91d0a00bae62..08d9efeb7f57 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -26,11 +26,8 @@ Module gid_Module_Optional_Gnome PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_GNOME); Styles = (); -#ifdef ENABLE_GNOMEVFS - XpdCheckSolaris = "SUNWgnome-vfs"; -#endif Files = (auto_gnome_ALL, -#if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO +#if defined ENABLE_GIO gid_File_Share_Registry_Gnome_Xcd, #endif gid_File_Bin_Gnome_Open_Url |