diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2016-12-24 14:42:54 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2016-12-25 09:11:11 +0100 |
| commit | 7b340f0d88e32408c4dd797aba826c73caccc01d (patch) | |
| tree | dfa59a6333945eb9159e0e8c84b0f23340434e2f | |
| parent | 8987e91843392f225f97150b066b4415bbe525a8 (diff) | |
tdf#90753: AutoInstall libreofficekit_selectionhandles package
Change-Id: I9998f3dcd6725a49aa2c083eac0de1f970b167e0
| -rw-r--r-- | Repository.mk | 5 | ||||
| -rw-r--r-- | scp2/AutoInstall.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/module_libreofficekit.scp | 30 |
4 files changed, 10 insertions, 30 deletions
diff --git a/Repository.mk b/Repository.mk index 939b91d2d00c..dbc3c2bc5a25 100644 --- a/Repository.mk +++ b/Repository.mk @@ -786,7 +786,6 @@ $(eval $(call gb_Helper_register_packages, \ more_fonts_conf \ instsetoo_native_setup \ $(if $(ENABLE_OOENV),instsetoo_native_ooenv) \ - libreofficekit_selectionhandles \ odk_headers_generated \ oox_customshapes \ oox_generated \ @@ -807,6 +806,10 @@ $(eval $(call gb_Helper_register_packages_for_install,calc,\ sc_res_xml \ )) +$(eval $(call gb_Helper_register_packages_for_install,libreofficekit,\ + $(if $(filter LINUX %BSD SOLARIS, $(OS)),$(if $(ENABLE_GTK3),libreofficekit_selectionhandles)) \ +)) + $(eval $(call gb_Helper_register_packages_for_install,ure,\ instsetoo_native_setup_ure \ ure_install \ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index cba489fba73a..43c53ab7dadf 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -27,6 +27,7 @@ $(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,impress_brand,,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE,LIBO_EXECUTABLE)) +$(eval $(call gb_AutoInstall_add_module,libreofficekit,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,math_brand,,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,ogltrans,LIBO_LIB_FILE)) diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index ade0cbd60ad3..5831304c5d89 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -11,16 +11,16 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/ooo)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\ brand \ + libreofficekit \ ooo \ ooobinarytable \ - reportbuilder \ pdfimport \ + reportbuilder \ )) $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_GTK \ ENABLE_SYSTRAY_GTK \ - ENABLE_GTK3 \ ENABLE_MACOSX_SANDBOX \ ENABLE_ONLINE_UPDATE \ ENABLE_TDE \ diff --git a/scp2/source/ooo/module_libreofficekit.scp b/scp2/source/ooo/module_libreofficekit.scp index 4a3192382809..80af179c704d 100644 --- a/scp2/source/ooo/module_libreofficekit.scp +++ b/scp2/source/ooo/module_libreofficekit.scp @@ -9,6 +9,8 @@ #include "macros.inc" +#include "AutoInstall/libreofficekit" + Module gid_Module_Libreofficekit Name = "Libreofficekit Data"; Description = "Libreofficekit Data"; @@ -16,10 +18,7 @@ Module gid_Module_Libreofficekit ParentID = gid_Module_Root_Brand; Styles = (HIDDEN_ROOT); Dirs = (gid_Dir_Share_Libreofficekit); - Files = ( - gid_File_Dat_HandleImageStart, - gid_File_Dat_HandleImageMiddle, - gid_File_Dat_HandleImageEnd); + Files = (auto_libreofficekit_ALL); End Directory gid_Dir_Share_Libreofficekit @@ -27,27 +26,4 @@ Directory gid_Dir_Share_Libreofficekit DosName = "libreofficekit"; End -#ifdef ENABLE_GTK3 -File gid_File_Dat_HandleImageStart - TXT_FILE_BODY; - Dir = gid_Dir_Share_Libreofficekit; - Name = "handle_image_start.png"; - Styles = (PACKED); -End - -File gid_File_Dat_HandleImageMiddle - TXT_FILE_BODY; - Dir = gid_Dir_Share_Libreofficekit; - Name = "handle_image_middle.png"; - Styles = (PACKED); -End - -File gid_File_Dat_HandleImageEnd - TXT_FILE_BODY; - Dir = gid_Dir_Share_Libreofficekit; - Name = "handle_image_end.png"; - Styles = (PACKED); -End -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |