From 61fbb774488c8fac1e38c0cfd3d0888cc0060444 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Fri, 24 Aug 2018 17:57:08 +0100 Subject: [PATCH] make-package-modules-not-suck Gbp-Pq: Name make-package-modules-not-suck.diff --- Repository.mk | 47 ++++++++++++++++++-------------- scp2/AutoInstall.mk | 1 + scp2/InstallModule_draw.mk | 1 + scp2/source/draw/module_draw.scp | 4 ++- 4 files changed, 32 insertions(+), 21 deletions(-) diff --git a/Repository.mk b/Repository.mk index 2a66608621a..9fbb2ce7169 100644 --- a/Repository.mk +++ b/Repository.mk @@ -246,13 +246,28 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \ abp \ + calc \ + $(call gb_Helper_optional,DBCONNECTIVITY, \ + dba \ + dbase \ + dbaxml \ + dbahsql) \ dbp \ dbu \ + $(call gb_Helper_optional,DBCONNECTIVITY,flat) \ + $(if $(ENABLE_JAVA),jdbc) \ + $(call gb_Helper_optional,DBCONNECTIVITY,mysql) \ + odbc \ +)) + +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,base, \ + $(call gb_Helper_optional,DBCONNECTIVITY,dbpool2) \ + $(if $(ENABLE_JAVA),hsqldb) \ + sdbc2 \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \ analysis \ - $(call gb_Helper_optional,DBCONNECTIVITY,calc) \ date \ pricing \ sc \ @@ -264,6 +279,14 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \ $(call gb_Helper_optional,SCRIPTING,vbaobj) \ )) +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,draw, \ + animcore \ + sd \ + sdd \ + sdfilt \ + sdui \ +)) + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \ svgfilter \ flash \ @@ -272,10 +295,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,impress, \ - animcore \ PresenterScreen \ PresentationMinimizer \ wpftimpress \ + slideshow \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,onlineupdate, \ @@ -354,11 +377,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ ctl \ cui \ $(call gb_Helper_optional,DBCONNECTIVITY, \ - dba \ - dbase \ - dbmm \ - dbaxml \ - dbahsql) \ + dbmm) \ dbtools \ deploymentmisc \ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ @@ -372,7 +391,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ evtatt \ expwrap \ $(call gb_Helper_optional,DBCONNECTIVITY, \ - flat \ file) \ filterconfig \ fps_office \ @@ -393,7 +411,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ gie \ hyphen \ icg \ - $(if $(ENABLE_JAVA),jdbc) \ ldapbe2 \ $(if $(filter WNT,$(OS)),WinUserInfoBe) \ localebe1 \ @@ -407,9 +424,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ msfilter \ $(call gb_Helper_optional,SCRIPTING,msforms) \ mtfrenderer \ - $(call gb_Helper_optional,DBCONNECTIVITY,mysql) \ numbertext \ - odbc \ odfflatxml \ offacc \ oox \ @@ -422,13 +437,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ sb \ $(call gb_Helper_optional,DBCONNECTIVITY,sdbt) \ scn \ - sd \ - sdd \ - sdfilt \ - sdui \ sfx \ simplecanvas \ - slideshow \ sot \ spell \ $(if $(ENABLE_HEADLESS),,spl) \ @@ -440,7 +450,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ svt \ svx \ svxcore \ - sw \ syssh \ textconversiondlgs \ textfd \ @@ -525,6 +534,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \ hwp \ $(if $(ENABLE_LWP),lwpft) \ msword \ + sw \ swd \ swui \ t602filter \ @@ -603,14 +613,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ cached1 \ collator_data \ comphelper \ - $(call gb_Helper_optional,DBCONNECTIVITY,dbpool2) \ $(call gb_Helper_optional,BREAKPAD,crashreport) \ deployment \ deploymentgui \ dict_ja \ dict_zh \ embobj \ - $(if $(ENABLE_JAVA),hsqldb) \ i18nutil \ index_data \ $(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), libreofficekitgtk) \ @@ -626,7 +634,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ package2 \ $(if $(USING_X11),recentfile) \ $(call gb_Helper_optional,SCRIPTING,scriptframe) \ - sdbc2 \ sofficeapp \ srtrs1 \ $(if $(filter $(OS),WNT),sysdtrans) \ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 7c9d6c4538b..15b6d503bbd 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -17,6 +17,7 @@ $(eval $(call gb_AutoInstall_add_module,base_brand,,LIBO_EXECUTABLE,,PACKAGE_FIL $(eval $(call gb_AutoInstall_add_module,brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE,,,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,calc_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST)) +$(eval $(call gb_AutoInstall_add_module,draw,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,extensions_ct2n,,,,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE)) diff --git a/scp2/InstallModule_draw.mk b/scp2/InstallModule_draw.mk index a7c02bef4ba..d48edf2b9e9 100644 --- a/scp2/InstallModule_draw.mk +++ b/scp2/InstallModule_draw.mk @@ -10,6 +10,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/draw)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/draw,\ + draw \ draw_brand \ )) diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp index 87375797e1c..0913c6110f6 100644 --- a/scp2/source/draw/module_draw.scp +++ b/scp2/source/draw/module_draw.scp @@ -18,6 +18,7 @@ #include "macros.inc" +#include "AutoInstall/draw" #include "AutoInstall/draw_brand" Module gid_Module_Prg_Draw @@ -34,7 +35,8 @@ Module gid_Module_Prg_Draw_Bin Sortkey = "100"; Default = YES; Styles = (HIDDEN_ROOT); - Files = (gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw, + Files = (auto_draw_ALL + gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw, gid_File_Share_Registry_Draw_Xcd, gid_File_Tmp_Userinstall_Draw_Inf); End -- 2.30.2