Repository.mk | 7 +++++--
scp2/AutoInstall.mk | 1 +
scp2/InstallModule_ooo.mk | 1 +
scp2/source/ooo/file_ooo.scp | 16 ----------------
scp2/source/ooo/module_hidden_ooo.scp | 3 ++-
5 files changed, 9 insertions(+), 19 deletions(-)
New commits:
commit af79ff7a3ccc8c116da4f400ee5ee9f9df22c63b
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Jun 1 14:32:13 2017 +0200
tdf#90753 scp2: move image packages to AutoInstall
Fixes regression from 73661c6f0f78964633a74f487d6bb7c0922d00dc
Not sure why these need their own scp2 Module
Change-Id: I26386a5105b8244eacfcb1760091e8806c55abd8
diff --git a/Repository.mk b/Repository.mk
index dd80d10c2eaa..9b89385f8593 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -805,8 +805,6 @@ $(eval $(call gb_Helper_register_packages, \
instsetoo_native_setup \
$(if $(ENABLE_OOENV),instsetoo_native_ooenv) \
odk_headers_generated \
- postprocess_images \
- $(call gb_Helper_optional,HELP,helpcontent2_helpimages) \
postprocess_registry \
readlicense_oo_readmes \
setup_native_misc \
@@ -956,6 +954,11 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
$(if $(filter OPENCL,$(BUILD_TYPE)),sc_opencl_runtimetest) \
))
+$(eval $(call gb_Helper_register_packages_for_install,ooo_images,\
+ postprocess_images \
+ $(call gb_Helper_optional,HELP,helpcontent2_helpimages) \
+))
+
$(eval $(call gb_Helper_register_packages_for_install,ogltrans,\
sd_opengl \
slideshow_opengl_shader \
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 409ceb9ed21f..2065de0b7367 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -34,6 +34,7 @@ $(eval $(call
gb_AutoInstall_add_module,math_brand,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,ogltrans,LIBO_LIB_FILE))
$(eval $(call
gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,LIBO_EXECUTABLE_COMPONENTCONDITION,,"ISCHECKFORPRODUCTUPDATES=1"))
$(eval $(call
gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE))
+$(eval $(call gb_AutoInstall_add_module,ooo_images,,,,))
$(eval $(call
gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,python,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,python_scriptprovider,))
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 51c2a62d12c1..7242f4c088f7 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -13,6 +13,7 @@ $(eval $(call
gb_InstallModule_use_auto_install_libs,scp2/ooo,\
brand \
libreofficekit \
ooo \
+ ooo_images \
ooobinarytable \
pdfimport \
reportbuilder \
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 8e656ee9e121..bd57e8287ada 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -251,22 +251,6 @@ File gid_Starregistry_Services_Rdb
Styles = (PACKED);
End
-File gid_File_Images
- TXT_FILE_BODY;
- Dir = FILELIST_DIR;
- Name = "postprocess_images.filelist";
- Styles = (FILELIST, PACKED);
-End
-
-#ifdef WITH_HELP
-File gid_File_HelpImages
- TXT_FILE_BODY;
- Dir = FILELIST_DIR;
- Name = "postprocess_helpimages.filelist";
- Styles = (FILELIST, PACKED);
-End
-#endif
-
File gid_File_Share_Registry_Lingucomponent_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
diff --git a/scp2/source/ooo/module_hidden_ooo.scp
b/scp2/source/ooo/module_hidden_ooo.scp
index ac5d9fdde089..48644f36c600 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -18,6 +18,7 @@
#include "macros.inc"
#include "AutoInstall/ooo"
+#include "AutoInstall/ooo_images"
#include "AutoInstall/ooobinarytable"
#ifdef AIX
@@ -83,7 +84,7 @@ Module gid_Module_Root_Files_Images
Sortkey = "2050";
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (gid_File_Images, gid_File_HelpImages);
+ Files = (auto_ooo_images_ALL);
End
#endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
