From dc2369ee1ae7ab4c1f9820bd7c543238109d6a0a Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Wed, 20 Apr 2022 16:39:49 +0100 Subject: [PATCH] split-evoab Gbp-Pq: Name split-evoab.diff --- postprocess/CustomTarget_registry.mk | 3 ++- scp2/InstallModule_gnome.mk | 4 ++++ scp2/source/gnome/file_gnome.scp | 10 ++++++++++ scp2/source/gnome/module_gnome.scp | 3 +++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index fa30e33ae0c..4d3cfee32c1 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -453,7 +453,8 @@ postprocess_FILES_calc += \ postprocess_DRIVERS += calc ifeq ($(ENABLE_EVOAB2),TRUE) -postprocess_FILES_main += \ +postprocess_XCDS += evoab.xcd +postprocess_FILES_evoab += \ $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu \ $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu postprocess_DRIVERS += evoab diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk index c33f4f52d67..8f06c0273ef 100644 --- a/scp2/InstallModule_gnome.mk +++ b/scp2/InstallModule_gnome.mk @@ -19,4 +19,8 @@ $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/gnome,\ scp2/source/gnome/module_gnome \ )) +$(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\ + ENABLE_EVOAB2 \ +)) + # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index 3f4b8f55810..25d068f3a2b 100644 --- a/scp2/source/gnome/file_gnome.scp +++ b/scp2/source/gnome/file_gnome.scp @@ -26,3 +26,13 @@ File gid_File_Share_Registry_Gnome_Xcd Name = "gnome.xcd"; End #endif + +#ifdef ENABLE_EVOAB2 +File gid_File_Share_Registry_Evoab_Xcd + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Brand_Dir_Share_Registry; + Name = "evoab.xcd"; +End +#endif + diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index 200c30049d7..48250752fe4 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -30,6 +30,9 @@ Module gid_Module_Optional_Gnome Files = (auto_gnome_ALL #if ENABLE_GIO ,gid_File_Share_Registry_Gnome_Xcd +#endif +#ifdef ENABLE_EVOAB2 + ,gid_File_Share_Registry_Evoab_Xcd #endif ); End -- 2.30.2