fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO

Change-Id: I0de4b88eb076e53792aa6d16092dcbcbb548246c
Reviewed-on: https://gerrit.libreoffice.org/6763Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

Repository.mk

@@ -307,6 +307,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	odbcbase \
 	odfflatxml \
 	offacc \
+	oox \
 	passwordcontainer \
 	pcr \
 	$(if $(ENABLE_NPAPI_FROM_BROWSER),pl) \
@@ -325,6 +326,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	simplecanvas \
 	slideshow \
 	sot \
+	$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
+		$(if $(ENABLE_HEADLESS),,spa) \
+	) \
 	spell \
 	$(if $(ENABLE_HEADLESS),,spl) \
 	$(if $(DISABLE_SCRIPTING),,stringresource) \
@@ -354,7 +358,13 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	$(if $(DISABLE_SCRIPTING),,vbahelper) \
 	vcl \
 	vclcanvas \
-	$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))),vclplug_gen) \
+	$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
+		vclplug_gen \
+		$(if $(ENABLE_TDE),vclplug_tde) \
+		$(if $(ENABLE_KDE),vclplug_kde) \
+		$(if $(ENABLE_KDE4),vclplug_kde4) \
+		$(if $(ENABLE_HEADLESS),,vclplug_svp) \
+	) \
 	xmlscript \
 	xmlfa \
 	xmlfd \
@@ -406,7 +416,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 		basebmp \
 	) \
 	communi \
-	oox \
 	ooxml \
 	sdbc \
 	avmediaQuickTime \
@@ -415,12 +424,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	rptui \
 	rptxml \
 	simplecm \
-	spa \
 	sts \
-	vclplug_tde \
-	vclplug_kde \
-	vclplug_kde4 \
-	vclplug_svp \
 ))
 
 ifneq (,$(filter ANDROID IOS,$(OS)))
@@ -522,6 +526,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 	) \
 	$(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \
 	package2 \
+	$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))),recentfile) \
 	$(if $(DISABLE_SCRIPTING),,scriptframe) \
 	sdbc2 \
 	sofficeapp \
@@ -561,7 +566,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	pyuno \
 	pyuno_wrapper \
-	recentfile \
 	ucpdav1 \
 	xsec_xmlsec \
 	$(if $(filter $(OS),ANDROID), \

scp2/source/ooo/file_library_ooo.scp

@@ -232,27 +232,6 @@ End
 
 #endif
 
-#if defined(UNX) && ! defined(MACOSX)
-#ifdef ENABLE_TDE
-File gid_File_Lib_Vclplug_Tde
-    Name = LIBNAME(vclplug_tde);
-    PACKED_LIB_FILE_BODY;
-End
-#endif
-#ifdef ENABLE_KDE
-File gid_File_Lib_Vclplug_Kde
-    Name = LIBNAME(vclplug_kde);
-    PACKED_LIB_FILE_BODY;
-End
-#endif
-#ifdef ENABLE_KDE4
-File gid_File_Lib_Vclplug_Kde4
-    Name = LIBNAME(vclplug_kde4);
-    PACKED_LIB_FILE_BODY;
-End
-#endif
-#endif
-
 #if defined(MACOSX)
 File gid_File_Lib_Basebmp
     Name = LIBNAME(basebmp);
@@ -261,32 +240,9 @@ End
 #endif
 
 #if defined UNX && ! defined MACOSX
-#if ! defined LIBO_HEADLESS
-STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp )
-#endif
 STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
 #endif
 
-#if defined UNX && ! defined MACOSX
-
-File gid_File_Lib_Recentfile
-    PACKED_LIB_FILE_BODY;
-    Name = STRING(CONCAT2(librecentfile,UNXSUFFIX));
-End
-
-#endif
-
-STD_LIB_FILE( gid_File_Lib_Oox , oox)
-
-#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
-
-File gid_File_Lib_Spa
-    Name = LIBNAME(spa);
-    PACKED_LIB_FILE_BODY;
-End
-
-#endif
-
 #if ! defined UNX
 File gid_File_Lib_Sysdtrans
     PACKED_LIB_FILE_BODY;

scp2/source/ooo/module_hidden_ooo.scp

@@ -142,15 +142,9 @@ Module gid_Module_Root_Files_4
 	auto_ooobinarytable_ALL,
 	gid_File_Lib_Bib,
 	gid_File_Lib_J,
-	gid_File_Lib_Oox,
-	gid_File_Lib_Spa,
 	gid_File_Lib_Sysdtrans,
 	gid_File_Lib_BaseBmp,
-	gid_File_Lib_Zip,
-	gid_File_Lib_Vclplug_Tde,
-	gid_File_Lib_Vclplug_Kde,
-	gid_File_Lib_Vclplug_Kde4,
-	gid_File_Lib_Vclplug_Svp);
+	gid_File_Lib_Zip);
 End
 
 Module gid_Module_Root_Files_5