scp2/AutoInstall.mk | 2 ++ scp2/InstallModule_ooo.mk | 1 + scp2/source/ooo/file_ooo.scp | 6 ++++++ 3 files changed, 9 insertions(+)
New commits: commit e3fdd01dfde8ff2513b3a694dcb36f8d55ed1b9a Author: Thorsten Behrens <[email protected]> AuthorDate: Fri Oct 14 16:58:00 2022 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Fri Oct 14 16:58:00 2022 +0200 Fix Windows packaging Change "Extend --enable-mpl-subset options effect to some dictionaries" broke Windows, as scp2 packaging did not yet consider dictionaries optional. Change-Id: I36bd3a0c89cc9d7f29c141167ef34203ebc80b5c diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index e39fbd559363..e6d7475d509e 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -40,7 +40,9 @@ $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE $(eval $(call gb_AutoInstall_add_module,python,LIBO_LIB_FILE,LIBO_EXECUTABLE,,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,python_scriptprovider,,,,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,python_librelogo,,,,PACKAGE_FILELIST)) +ifeq ($(MPL_SUBSET),TRUE) $(eval $(call gb_AutoInstall_add_module,postgresqlsdbc,LIBO_LIB_FILE,,,PACKAGE_FILELIST)) +endif $(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE,,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,quickstart,,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,reportbuilder,LIBO_LIB_FILE,,LIBO_JAR_FILE,PACKAGE_FILELIST)) diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 8739b86cfdf9..8b52a4f61d29 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -27,6 +27,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ SYSTEM_HSQLDB \ SYSTEM_LIBXSLT \ SYSTEM_REDLAND \ + MPL_SUBSET \ WITH_GALLERY_BUILD \ WITH_MYSPELL_DICTS \ )) diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 9bdeab03e702..fc784aeb3644 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -375,6 +375,7 @@ End #endif #if defined WITH_MYSPELL_DICTS +#if defined MPL_SUBSET File gid_File_Extension_Dictionary_De Dir = FILELIST_DIR; Name = "Dictionary/dict-de.filelist"; @@ -382,8 +383,10 @@ File gid_File_Extension_Dictionary_De TXT_FILE_BODY; End #endif +#endif #if defined WITH_MYSPELL_DICTS +#if defined MPL_SUBSET File gid_File_Extension_Dictionary_En Dir = FILELIST_DIR; Name = "Dictionary/dict-en.filelist"; @@ -391,6 +394,7 @@ File gid_File_Extension_Dictionary_En TXT_FILE_BODY; End #endif +#endif #if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_El @@ -519,6 +523,7 @@ End #endif #if defined WITH_MYSPELL_DICTS +#if defined MPL_SUBSET File gid_File_Extension_Dictionary_It Dir = FILELIST_DIR; Name = "Dictionary/dict-it.filelist"; @@ -526,6 +531,7 @@ File gid_File_Extension_Dictionary_It TXT_FILE_BODY; End #endif +#endif #if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Kmr_Latn
