Repository.mk | 8 ++++---- scp2/InstallModule_graphicfilter.mk | 4 ---- scp2/source/graphicfilter/file_graphicfilter.scp | 7 ------- scp2/source/graphicfilter/module_graphicfilter.scp | 6 +----- 4 files changed, 5 insertions(+), 20 deletions(-)
New commits: commit c058341b6de3730b404f44347bea408243416379 Author: Marcos Paulo de Souza <marcos.souza....@gmail.com> Date: Wed May 8 15:22:13 2013 -0300 fdo#60924: autoinstall graphicfilter libraries Change-Id: I406ecef9bc1865d0cd17e3428bffaaaa137d972f Reviewed-on: https://gerrit.libreoffice.org/3829 Reviewed-by: David Tardon <dtar...@redhat.com> Tested-by: David Tardon <dtar...@redhat.com> diff --git a/Repository.mk b/Repository.mk index fc6e737..3cbed03 100644 --- a/Repository.mk +++ b/Repository.mk @@ -222,6 +222,10 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ endif $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GRAPHICFILTER, \ + svgfilter \ + flash \ + wpftdraw \ + graphicfilter \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \ @@ -388,8 +392,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ dbu \ evoab \ filtertracer \ - flash \ - graphicfilter \ log \ MacOSXSpell \ mork \ @@ -413,7 +415,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ spa \ spell \ sts \ - svgfilter \ textfd \ updatecheckui \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ @@ -423,7 +424,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ vclplug_kde \ vclplug_kde4 \ vclplug_svp \ - wpftdraw \ )) ifneq (,$(filter ANDROID IOS,$(OS))) diff --git a/scp2/InstallModule_graphicfilter.mk b/scp2/InstallModule_graphicfilter.mk index 1858d93..f166e25 100644 --- a/scp2/InstallModule_graphicfilter.mk +++ b/scp2/InstallModule_graphicfilter.mk @@ -11,10 +11,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/graphicfilter)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/graphicfilter,graphicfilter)) -$(eval $(call gb_InstallModule_add_scpfiles,scp2/graphicfilter,\ - scp2/source/graphicfilter/file_graphicfilter \ -)) - $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/graphicfilter,\ scp2/source/graphicfilter/module_graphicfilter \ )) diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp index 535688d..2fdffb4 100644 --- a/scp2/source/graphicfilter/file_graphicfilter.scp +++ b/scp2/source/graphicfilter/file_graphicfilter.scp @@ -34,11 +34,4 @@ File gid_File_Share_Registry_Graphicfilter_Xcd Name = "graphicfilter.xcd"; End -STD_LIB_FILE( gid_File_Lib_Flash, flash ) STD_RES_FILE( gid_File_Res_Flash, flash ) - -STD_LIB_FILE( gid_File_Lib_Svg, svgfilter ) - -STD_LIB_FILE( gid_File_Lib_Graphic, graphicfilter ) - -STD_LIB_FILE( gid_File_Lib_WpftDraw, wpftdraw ) diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp index e86e6a5..9ebfcc2 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.scp +++ b/scp2/source/graphicfilter/module_graphicfilter.scp @@ -35,10 +35,6 @@ Module gid_Module_Optional_Grfflt Sortkey = "600"; ParentID = gid_Module_Optional; Default = YES; - Files = ( - gid_File_Lib_Svg, - gid_File_Lib_Flash, - gid_File_Lib_WpftDraw, - gid_File_Lib_Graphic, + Files = (auto_Graphicfilter_Lib_ALL gid_File_Share_Registry_Graphicfilter_Xcd); End _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits