Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/3626 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/26/3626/1 fdo#60949: Remove UNOLIBS_OOO By removing the last two libs: nullcanvas and directx5canvas. directx5canvas seems to be dead and nullcanvas don't have entries in scp2. Change-Id: Ib8fc1da123f8374fb83192f14db730638213f564 --- M Repository.mk D canvas/Library_nullcanvas.mk M canvas/Module_canvas.mk 3 files changed, 0 insertions(+), 65 deletions(-) diff --git a/Repository.mk b/Repository.mk index 6a0e297..f20519e 100644 --- a/Repository.mk +++ b/Repository.mk @@ -642,10 +642,6 @@ localebe1 \ ucpexpand1 \ )) -$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ - directx5canvas \ - nullcanvas \ -)) $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ testtools_cppobj \ diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk deleted file mode 100644 index 863696f..0000000 --- a/canvas/Library_nullcanvas.mk +++ /dev/null @@ -1,60 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 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. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,nullcanvas)) - -$(eval $(call gb_Library_set_componentfile,nullcanvas,canvas/source/null/nullcanvas)) - -$(eval $(call gb_Library_use_external,nullcanvas,boost_headers)) - -$(eval $(call gb_Library_use_sdk_api,nullcanvas)) - -$(eval $(call gb_Library_use_libraries,nullcanvas,\ - basegfx \ - canvastools \ - comphelper \ - cppu \ - cppuhelper \ - sal \ - vcl \ - $(gb_UWINAPI) \ -)) - -$(eval $(call gb_Library_add_exception_objects,nullcanvas,\ - canvas/source/null/null_canvasbitmap \ - canvas/source/null/null_canvascustomsprite \ - canvas/source/null/null_canvasfont \ - canvas/source/null/null_canvashelper \ - canvas/source/null/null_devicehelper \ - canvas/source/null/null_spritecanvas \ - canvas/source/null/null_spritecanvashelper \ - canvas/source/null/null_spritehelper \ - canvas/source/null/null_textlayout \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/canvas/Module_canvas.mk b/canvas/Module_canvas.mk index a678faf..59acf96 100644 --- a/canvas/Module_canvas.mk +++ b/canvas/Module_canvas.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_targets,canvas,\ Library_canvasfactory \ Library_canvastools \ - Library_nullcanvas \ Library_simplecanvas \ Library_vclcanvas \ )) -- To view, visit https://gerrit.libreoffice.org/3626 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib8fc1da123f8374fb83192f14db730638213f564 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