From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Sun, 21 Jun 2020 11:07:16 +0000 (+0100)
Subject: split-evoab
X-Git-Tag: archive/raspbian/1%6.4.5_rc1-2+rpi1^2~45
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=87cfdf86eebffdf5e5f33afd2c6c16f1614290f6;p=libreoffice.git

split-evoab


Gbp-Pq: Name split-evoab.diff
---

diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index c33417c6b2a..4375958df9b 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -324,8 +324,9 @@ ifneq ($(WITH_WEBDAV),)
 postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-webdav.xcu
 endif
 ifeq ($(ENABLE_EVOAB2),TRUE)
-postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
-postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
+postprocess_XCDS += evoab.xcd
+postprocess_FILES_evoab += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
+postprocess_FILES_evoab += $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
 postprocess_DRIVERS += evoab
 endif
 ifeq ($(ENABLE_JAVA),TRUE)
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