fdo#60924: autoinstall gnome libraries

Change-Id: I0fd872d15a0c938d32aac185c3c00c5fb14a091a
Reviewed-on: https://gerrit.libreoffice.org/3813
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

Repository.mk

@@ -233,6 +233,14 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GNOME, \
+    $(if $(ENABLE_EVOAB2),evoab) \
+    $(if $(ENABLE_GTK),vclplug_gtk) \
+    $(if $(ENABLE_GTK3),vclplug_gtk3) \
+    $(if $(ENABLE_GCONF),gconfbe1) \
+    $(if $(ENABLE_SYSTRAY_GTK),qstart_gtk) \
+    $(if $(ENABLE_GIO),losessioninstall) \
+    $(if $(ENABLE_GIO),ucpgio1) \
+    $(if $(ENABLE_GNOMEVFS),ucpgvfs1) \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,KDE, \
@@ -390,7 +398,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     calc \
     dbp \
     dbu \
-    evoab \
 	filtertracer \
     log \
 	MacOSXSpell \
@@ -400,7 +407,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     placeware \
     pricing \
     protocolhandler \
-    qstart_gtk \
     rpt \
     rptui \
     rptxml \
@@ -418,8 +424,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     textfd \
     updatecheckui \
     $(if $(DISABLE_SCRIPTING),,vbahelper) \
-    vclplug_gtk \
-    vclplug_gtk3 \
     vclplug_tde \
     vclplug_kde \
     vclplug_kde4 \
@@ -613,12 +617,10 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     fastsax \
     fpicker \
     fps_office \
-    gconfbe1 \
     gdipluscanvas \
     hatchwindowfactory \
     i18nsearch \
     ldapbe2 \
-    losessioninstall \
     macbe1 \
     migrationoo2 \
     migrationoo3 \
@@ -636,8 +638,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     syssh \
     ucpcmis1 \
     ucpext \
-    ucpgio1 \
-    ucpgvfs1 \
     ucptdoc1 \
     updatefeed \
     vbaevents \

scp2/InstallModule_gnome.mk

@@ -12,22 +12,13 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/gnome))
 $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome))
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
-	ENABLE_EVOAB2 \
-	ENABLE_GCONF \
 	ENABLE_GIO \
 	ENABLE_GNOMEVFS \
-	ENABLE_GTK \
-	ENABLE_GTK3 \
 	ENABLE_LOCKDOWN \
-	ENABLE_SYSTRAY_GTK \
 ))
 
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/gnome,\
     scp2/source/gnome/file_gnome \
 ))
 
-$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/gnome,\
-    scp2/source/gnome/module_gnome \
-))
-
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:

scp2/source/gnome/file_gnome.scp

@@ -26,16 +26,6 @@
  ************************************************************************/
 #include "macros.inc"
 
-#ifdef ENABLE_GIO
-STD_LIB_FILE( gid_File_Lib_GIO, ucpgio1 )
-
-STD_LIB_FILE(gid_File_Lib_Losessioninstall, losessioninstall)
-#endif
-
-#ifdef ENABLE_GNOMEVFS
-STD_LIB_FILE( gid_File_Lib_Gnomevfs, ucpgvfs1 )
-#endif
-
 #if (defined ENABLE_GCONF && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
 File gid_File_Share_Registry_Gnome_Xcd
     TXT_FILE_BODY;
@@ -44,16 +34,3 @@ File gid_File_Share_Registry_Gnome_Xcd
     Name = "gnome.xcd";
 End
 #endif
-
-#ifdef ENABLE_GCONF
-STD_LIB_FILE( gid_File_Lib_Gconfbe, gconfbe1 )
-#endif
-
-#ifdef ENABLE_SYSTRAY_GTK
-File gid_File_Lib_QStart_Gtk
-    Name = LIBNAME(qstart_gtk);
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-#endif

scp2/source/gnome/module_gnome.scp

@@ -39,29 +39,6 @@ Module gid_Module_Optional_Gnome
     XpdCheckSolaris = "SUNWgnome-vfs";
 #endif
     Files = (
-#ifdef ENABLE_EVOAB2
-      gid_File_Lib_Evoab,
-#endif
-#ifdef ENABLE_GTK
-      gid_File_Lib_Fps_Gnome,
-      gid_File_Lib_Vclplug_Gtk,
-#endif
-#ifdef ENABLE_GTK3
-      gid_File_Lib_Vclplug_Gtk3,
-#endif
-#ifdef ENABLE_SYSTRAY_GTK
-      gid_File_Lib_QStart_Gtk,
-#endif
-#ifdef ENABLE_GNOMEVFS
-      gid_File_Lib_Gnomevfs, gid_File_Bin_Gnome_Set_Default_Application,
-#endif
-#ifdef ENABLE_GIO
-      gid_File_Lib_GIO,
-      gid_File_Lib_Losessioninstall,
-#endif
-#ifdef ENABLE_GCONF
-      gid_File_Lib_Gconfbe,
-#endif
 #if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
       gid_File_Share_Registry_Gnome_Xcd,
 #endif

scp2/source/ooo/file_library_ooo.scp

@@ -163,19 +163,6 @@ End
 
 #endif
 
-#ifdef UNX
-#ifdef ENABLE_GTK
-#ifdef ENABLE_SYSTRAY_GTK
-File gid_File_Lib_QStart_Gtk
-    Name = LIBNAME(qstart_gtk);
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-#endif
-#endif
-#endif
-
 File gid_File_Lib_Dbpool
     LIB_FILE_BODY;
     Styles = (PACKED);
@@ -325,12 +312,6 @@ File gid_File_Lib_Macab_Drv_1
 End
 #endif  // #ifdef MACOSX
 
-#ifdef ENABLE_EVOAB2
-
-STD_LIB_FILE( gid_File_Lib_Evoab , evoab)
-
-#endif  // #ifdef ENABLE_EVOAB2
-
 #endif  // #ifdef UNX
 
 #ifdef WNT
@@ -657,22 +638,6 @@ STD_LIB_FILE( gid_File_Lib_Pl , pl)
 #endif
 
 #if defined(UNX) && ! defined(MACOSX)
-#ifdef ENABLE_GTK
-File gid_File_Lib_Vclplug_Gtk
-    Name = LIBNAME(vclplug_gtk);
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-#endif
-#ifdef ENABLE_GTK3
-File gid_File_Lib_Vclplug_Gtk3
-    Name = LIBNAME(vclplug_gtk3);
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-#endif
 #ifdef ENABLE_TDE
 #ifndef MACOSX
 File gid_File_Lib_Vclplug_Tde