Skip to content

C
core
Kaydet (Commit) 08f94626 authored tarafından David Tardon's avatar David Tardon
Dosyalara gözat
Seçenekler

nuke MathMLDTD 

math.dtd was dropped from installation in 2009, see
https://issues.apache.org/ooo/show_bug.cgi?id=97200#c3 :
"In agreement with MIB and MT it was diecided that the Math.dtd should
be removed from the installation set as well since it
a) has incorrect content
b) is no longer used nowadays at all"

Change-Id: Id2a727338c224b0beb4b8def197988ab071a7d94
üst c35f495a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 300 deletions
MathMLDTD/Makefile deleted 100644 → 0
Dosyayı görüntüle @ c35f495a
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
include $(module_directory)/../solenv/gbuild/partial_build.mk
# vim: set noet sw=4 ts=4:
MathMLDTD/Module_MathMLDTD.mk deleted 100644 → 0
Dosyayı görüntüle @ c35f495a
#
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
#
$(eval $(call gb_Module_Module,MathMLDTD))
$(eval $(call gb_Module_add_targets,MathMLDTD,Package_bin))
MathMLDTD/Package_bin.mk deleted 100644 → 0
Dosyayı görüntüle @ c35f495a
#
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
#
$(eval $(call gb_Package_Package,MathMLDTD_bin,$(SRCDIR)/MathMLDTD))
$(eval $(call gb_Package_add_file,MathMLDTD_bin,bin/math.dtd,math.dtd))
$(eval $(call gb_Package_add_file,MathMLDTD_bin,bin/w3c_ipr_software_notice.html,w3c_ipr_software_notice.html))
MathMLDTD/README deleted 100644 → 0
Dosyayı görüntüle @ c35f495a
MathMLDTD implements XML Math format.
See also:
[http://www.w3.org/TR/REC-MathML]
MathMLDTD/math.dtd deleted 100644 → 0
Dosyayı görüntüle @ c35f495a
This diff is collapsed.
MathMLDTD/w3c_ipr_software_notice.html deleted 100644 → 0
Dosyayı görüntüle @ c35f495a
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<!-- W3C IPR SOFTWARE NOTICE -->
<!-- downloaded from: -->
<!-- http://www.w3.org/Consortium/Legal/copyright-software-19980720 -->
<!-- -->
<!-- Changed: 24. July 2001 -->
<!-- 1) removed link to stylesheet -->
<!-- 2) removed "webmaster" link -->
<!-- 3) changed site-relative URLs to absolute URLs -->
<!-- 4) added this comment block -->
<!-- Changes are intended to allow proper -->
<!-- off-line viewing of the license. -->
<html>
<head>
<meta name="generator" content="HTML Tidy, see www.w3.org">
<meta http-equiv="Content-Type" content=
"text/html; charset=iso-8859-1">
<title>W3C IPR SOFTWARE NOTICE</title>
</head>
<body text="#000000" bgcolor="#FFFFFF">
<h1>W3C<sup>&reg;</sup> SOFTWARE NOTICE AND LICENSE</h1>
<h3>Copyright &copy; 1994-2001 <a href="http://www.w3.org/">World
Wide Web Consortium</a>, (<a href=
"http://www.lcs.mit.edu/">Massachusetts Institute of
Technology</a>, <a href="http://www.inria.fr/">Institut National de
Recherche en Informatique et en Automatique</a>, <a href=
"http://www.keio.ac.jp/">Keio University</a>). All Rights Reserved.
http://www.w3.org/Consortium/Legal/</h3>
<p>This W3C work (including software, documents, or other related
items) is being provided by the copyright holders under the
following license. By obtaining, using and/or copying this work,
you (the licensee) agree that you have read, understood, and will
comply with the following terms and conditions:</p>
<p>Permission to use, copy, modify, and distribute this software
and its documentation, with or without modification,&nbsp; for any
purpose and without fee or royalty is hereby granted, provided that
you include the following on ALL copies of the software and
documentation or portions thereof, including modifications, that
you make:</p>
<ol>
<li>The full text of this NOTICE in a location viewable to users of
the redistributed or derivative work.</li>
<li>Any pre-existing intellectual property disclaimers, notices, or
terms and conditions. If none exist, a short notice of the
following form (hypertext is preferred, text is permitted) should
be used within the body of any redistributed or derivative code:
"Copyright &copy; [$date-of-software] <a href="http://www.w3.org/">
World Wide Web Consortium</a>, (<a href=
"http://www.lcs.mit.edu/">Massachusetts Institute of
Technology</a>, <a href="http://www.inria.fr/">Institut National de
Recherche en Informatique et en Automatique</a>, <a href=
"http://www.keio.ac.jp/">Keio University</a>). All Rights Reserved.
http://www.w3.org/Consortium/Legal/"</li>
<li>Notice of any changes or modifications to the W3C files,
including the date changes were made. (We recommend you provide
URIs to the location from which the code is derived.)</li>
</ol>
<p>THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND
COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD
PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p>
<p>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,
SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE
SOFTWARE OR DOCUMENTATION.</p>
<p>The name and trademarks of copyright holders may NOT be used in
advertising or publicity pertaining to the software without
specific, written prior permission. Title to copyright in this
software and any associated documentation will at all times remain
with copyright holders.</p>
<p>____________________________________</p>
<p>This formulation of W3C's notice and license became active on
August 14 1998 so as to improve compatibility with GPL. This
version ensures that W3C software licensing terms are no more
restrictive than GPL and consequently W3C software may be
distributed in GPL packages. See the <a href=
"http://www.w3.org/Consortium/Legal/copyright-software-19980519.html">older formulation</a> for the
policy prior to this date. Please see our <a href="http://www.w3.org/Consortium/Legal/IPR-FAQ.html">
Copyright FAQ</a> for common questions about using materials from
our site, including specific terms and conditions for packages like
libwww, Amaya, and Jigsaw. Other questions about this notice can be
directed to <a href="mailto:site-policy@w3.org">
site-policy@w3.org</a>.<br>
&nbsp;</p>
<p>&nbsp;</p>
</body>
</html>
RepositoryModule_host.mk
Dosyayı görüntüle @ 08f94626
......@@ -118,7 +118,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
$(call gb_Helper_optional,LPSOLVE,lpsolve) \
$(call gb_Helper_optional,DESKTOP,l10ntools) \
$(call gb_Helper_optional,MARIADB,libmariadb) \
MathMLDTD \
$(call gb_Helper_optional,MDDS,mdds) \
Mesa \
$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
......
configure.ac
Dosyayı görüntüle @ 08f94626
......@@ -768,11 +768,6 @@ AC_ARG_ENABLE(mpl-subset,
[Don't compile any pieces which are not MPL or more liberrally licensed])
)
AC_ARG_ENABLE(mathmldtd,
AS_HELP_STRING([--enable-mathmldtd],
[Enable bundling of (modified) MathML 1.01 DTD.])
)
AC_ARG_ENABLE(evolution2,
AS_HELP_STRING([--enable-evolution2],
[Allows the built-in evolution 2 addressbook connectivity build to be
......@@ -10652,23 +10647,6 @@ else
fi
AC_SUBST(ENABLE_KAB)
dnl ===================================================================
dnl Test whether to include MathMLDTD
dnl ===================================================================
AC_MSG_CHECKING([whether to include MathMLDTD])
if test -n "$enable_mathmldtd"; then
if test "$enable_mathmldtd" = "no"; then
AC_MSG_RESULT([no])
SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
else
AC_MSG_RESULT([yes])
BUILD_TYPE="$BUILD_TYPE MATHMLDTD"
fi
else
AC_MSG_RESULT([no])
SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD"
fi
dnl ===================================================================
dnl Test which themes to include
dnl ===================================================================
......
readlicense_oo/html/LICENSE.html
Dosyayı görüntüle @ 08f94626
......@@ -5232,71 +5232,6 @@ shall not be used in advertising or publicity pertaining to
distribution of the software without specific, written prior
permission. Hewlett-Packard Company makes no representations about
the suitability of this software for any purpose.</P>
<H2 CLASS="western">MathML DTD</H2>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The
following software may be included in this product: MathML DTD. Use
of any of this software is governed by the terms of the license
below:</P>
<H3 CLASS="western">W3C<SUP>®</SUP> SOFTWARE NOTICE AND LICENSE</H3>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm"><SPAN STYLE="font-weight: normal">Copyright
© 1994-2001 </SPAN><A HREF="http://www.w3.org/"><SPAN STYLE="font-weight: normal">World
Wide Web Consortium</SPAN></A><SPAN STYLE="font-weight: normal">,
(</SPAN><A HREF="http://www.lcs.mit.edu/"><SPAN STYLE="font-weight: normal">Massachusetts
Institute of Technology</SPAN></A><SPAN STYLE="font-weight: normal">,
</SPAN><A HREF="http://www.inria.fr/"><SPAN STYLE="font-weight: normal">Institut
National de Recherche en Informatique et en Automatique</SPAN></A><SPAN STYLE="font-weight: normal">,
</SPAN><A HREF="http://www.keio.ac.jp/"><SPAN STYLE="font-weight: normal">Keio
University</SPAN></A><SPAN STYLE="font-weight: normal">). All Rights
Reserved. </SPAN><A HREF="http://www.w3.org/Consortium/Legal/"><SPAN STYLE="font-weight: normal">http://www.w3.org/Consortium/Legal/</SPAN></A></P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">This
W3C work (including software, documents, or other related items) is
being provided by the copyright holders under the following license.
By obtaining, using and/or copying this work, you (the licensee)
agree that you have read, understood, and will comply with the
following terms and conditions:</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Permission
to use, copy, modify, and distribute this software and its
documentation, with or without modification,&nbsp; for any purpose
and without fee or royalty is hereby granted, provided that you
include the following on ALL copies of the software and documentation
or portions thereof, including modifications, that you make:</P>
<OL>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
The full text of this NOTICE in a location viewable to users of the
redistributed or derivative work.</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
Any pre-existing intellectual property disclaimers, notices, or
terms and conditions. If none exist, a short notice of the following
form (hypertext is preferred, text is permitted) should be used
within the body of any redistributed or derivative code: &quot;Copyright
© [$date-of-software] <A HREF="http://www.w3.org/">World Wide Web
Consortium</A>, (<A HREF="http://www.lcs.mit.edu/">Massachusetts
Institute of Technology</A>, <A HREF="http://www.inria.fr/">Institut
National de Recherche en Informatique et en Automatique</A>, <A HREF="http://www.keio.ac.jp/">Keio
University</A>). All Rights Reserved.
<A HREF="http://www.w3.org/Consortium/Legal/">http://www.w3.org/Consortium/Legal/</A>&quot;</P>
<LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
Notice of any changes or modifications to the W3C files, including
the date changes were made. (We recommend you provide URIs to the
location from which the code is derived.)</P>
</OL>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">THIS
SOFTWARE AND DOCUMENTATION IS PROVIDED &quot;AS IS,&quot; AND
COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY
OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE
OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS,
COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">COPYRIGHT
HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
DOCUMENTATION.</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The
name and trademarks of copyright holders may NOT be used in
advertising or publicity pertaining to the software without specific,
written prior permission. Title to copyright in this software and any
associated documentation will at all times remain with copyright
holders.</P>
<H1 CLASS="western" STYLE="page-break-before: always"><A NAME="__RefHeading__12227_1300998327"></A><A NAME="2.GNU Lesser General Public License Version 3|outline"></A><A NAME="1.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="4.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="1.GNU Lesser General Public License Version 3|outline"></A><A NAME="1.GNU Lesser General Public License Version 3|outline"></A>
GNU Lesser General Public License Version 3</H1>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Copyright
......@@ -9524,4 +9459,4 @@ this trademark restriction does not form part of the License.</P>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Creative
Commons may be contacted at <A HREF="http://creativecommons.org/">http://creativecommons.org/</A>.</P>
</BODY>
</HTML>
\ No newline at end of file
</HTML>
readlicense_oo/txt/license.txt
Dosyayı görüntüle @ 08f94626
......@@ -5260,61 +5260,6 @@ International Color Consortium sRGB Profiles
makes no representations about the suitability of this software for any
purpose.
MathML DTD
The following software may be included in this product: MathML DTD. Use
of any of this software is governed by the terms of the license below:
W3C^® SOFTWARE NOTICE AND LICENSE
Copyright © 1994-2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de
Recherche en Informatique et en Automatique, Keio University). All
Rights Reserved. http://www.w3.org/Consortium/Legal/
This W3C work (including software, documents, or other related items)
is being provided by the copyright holders under the following license.
By obtaining, using and/or copying this work, you (the licensee) agree
that you have read, understood, and will comply with the following
terms and conditions:
Permission to use, copy, modify, and distribute this software and its
documentation, with or without modification, for any purpose and
without fee or royalty is hereby granted, provided that you include the
following on ALL copies of the software and documentation or portions
thereof, including modifications, that you make:
1. The full text of this NOTICE in a location viewable to users of the
redistributed or derivative work.
2. Any pre-existing intellectual property disclaimers, notices, or
terms and conditions. If none exist, a short notice of the
following form (hypertext is preferred, text is permitted) should
be used within the body of any redistributed or derivative code:
"Copyright © [$date-of-software] World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National
de Recherche en Informatique et en Automatique, Keio
University). All Rights Reserved.
http://www.w3.org/Consortium/Legal/"
3. Notice of any changes or modifications to the W3C files, including
the date changes were made. (We recommend you provide URIs to the
location from which the code is derived.)
THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
TRADEMARKS OR OTHER RIGHTS.
COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
DOCUMENTATION.
The name and trademarks of copyright holders may NOT be used in
advertising or publicity pertaining to the software without specific,
written prior permission. Title to copyright in this software and any
associated documentation will at all times remain with copyright
holders.
GNU Lesser General Public License Version 3
Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
......
scp2/source/math/file_math.scp
Dosyayı görüntüle @ 08f94626
......@@ -27,16 +27,6 @@
#include "macros.inc"
#ifndef WITHOUT_MATHMLDTD
File gid_File_Html_W3c_Ipr
TXT_FILE_BODY;
Styles = (PACKED);
Dir = gid_Dir_Share_Dtd_Math_1_01;
Name = "w3c_ipr_software_notice.html";
End
#endif
STD_LIB_FILE( gid_File_Lib_Sm , sm)
STD_LIB_FILE( gid_File_Lib_Smd , smd)
......
scp2/source/math/module_math.scp
Dosyayı görüntüle @ 08f94626
......@@ -42,7 +42,7 @@ Module gid_Module_Prg_Math_Bin
Minimal = YES;
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_File_Html_W3c_Ipr,gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
Files = (gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
gid_File_Share_Registry_Math_Xcd,
gid_File_Tmp_Userinstall_Math_Inf);
End
......
solenv/gbuild/TargetLocations.mk
Dosyayı görüntüle @ 08f94626
......@@ -99,6 +99,7 @@ gb_Configuration_get_preparation_target = $(WORKDIR)/Configuration/$(1).prepared
gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test
gb_CppunitTestFakeExecutable_get_target = \
$(OUTDIR)/unittest/install/program/$(1)
gb_CustomPackage_get_target = $(WORKDIR)/CustomPackage/$(1).filelist
gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done
gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done
gb_CustomTarget_get_workdir = $(WORKDIR)/CustomTarget/$(1)
......@@ -266,6 +267,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
CliNativeLibraryTarget \
CliUnoApiTarget \
ComponentTarget \
CustomPackage \
DescriptionTranslateTarget \
Dictionary \
ExternalPackage \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment