Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/3829 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/3829/1 fdo#60924: autoinstall graphicfilter libraries Change-Id: I406ecef9bc1865d0cd17e3428bffaaaa137d972f --- M Repository.mk M scp2/InstallModule_graphicfilter.mk D scp2/source/graphicfilter/file_graphicfilter.scp M scp2/source/graphicfilter/module_graphicfilter.scp 4 files changed, 4 insertions(+), 56 deletions(-) diff --git a/Repository.mk b/Repository.mk index fc6e737..3cbed03 100644 --- a/Repository.mk +++ b/Repository.mk @@ -222,6 +222,10 @@ 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 @@ dbu \ evoab \ filtertracer \ - flash \ - graphicfilter \ log \ MacOSXSpell \ mork \ @@ -413,7 +415,6 @@ spa \ spell \ sts \ - svgfilter \ textfd \ updatecheckui \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ @@ -423,7 +424,6 @@ 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_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 deleted file mode 100644 index 535688d..0000000 --- a/scp2/source/graphicfilter/file_graphicfilter.scp +++ /dev/null @@ -1,44 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.inc" - -File gid_File_Share_Registry_Graphicfilter_Xcd - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Brand_Dir_Share_Registry; - 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 bd148a8..9ebfcc2 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.scp +++ b/scp2/source/graphicfilter/module_graphicfilter.scp @@ -36,9 +36,5 @@ ParentID = gid_Module_Optional; Default = YES; Files = (auto_Graphicfilter_Lib_ALL - gid_File_Lib_Svg, - gid_File_Lib_Flash, - gid_File_Lib_WpftDraw, - gid_File_Lib_Graphic, gid_File_Share_Registry_Graphicfilter_Xcd); End -- To view, visit https://gerrit.libreoffice.org/3829 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I406ecef9bc1865d0cd17e3428bffaaaa137d972f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza <marcos.souza....@gmail.com> _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice