From 3125f1561853d205148afba7b7a3ecf7a2646893 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Tue, 27 Aug 2013 11:17:07 +0900 Subject: [PATCH] Bug 895213 - Add STLport license to about:license. r=gerv --- toolkit/content/Makefile.in | 4 ++ toolkit/content/license.html | 72 ++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in index a769ea70fba..d108440f133 100644 --- a/toolkit/content/Makefile.in +++ b/toolkit/content/Makefile.in @@ -41,6 +41,10 @@ ifneq (,$(filter http%,$(source_repo))) DEFINES += -DSOURCE_REPO="$(source_repo)" endif +ifneq (,$(findstring stlport,$(STLPORT_LIBS))) +DEFINES += -DUSE_STLPORT +endif + BUILD_HOSTNAME = $(shell hostname -s || hostname) DEFINES += -DBUILD_HOSTNAME="$(BUILD_HOSTNAME)" diff --git a/toolkit/content/license.html b/toolkit/content/license.html index 9d195be7535..574a069307a 100644 --- a/toolkit/content/license.html +++ b/toolkit/content/license.html @@ -112,6 +112,9 @@
  • Skia License
  • Snappy License
  • Sparkle License
    • +#ifdef USE_STLPORT +
  • STLport License
    • +#endif
  • Suitable Systems License
  • SunSoft License
  • Unicode License
    • @@ -3476,6 +3479,75 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    +#ifdef USE_STLPORT +

    STLport License

    + +

    This license applies to most files in the directory + build/stlport/.

    + +
    +Boris Fomitchev grants Licensee a non-exclusive, non-transferable, royalty-free
+license to use STLport and its documentation without fee.
+
+By downloading, using, or copying STLport or any portion thereof,  Licensee
+agrees to abide by the intellectual property laws and all other applicable laws
+of the United States of America, and to all of the terms and conditions of this
+Agreement.
+
+Licensee shall maintain the following copyright and permission notices on
+STLport sources and its documentation unchanged :
+
+Copyright 1999,2000 Boris Fomitchev
+
+This material is provided "as is", with absolutely no warranty expressed or
+implied. Any use is at your own risk.
+Permission to use or copy this software for any purpose is hereby granted
+without fee, provided the above notices are retained on all copies. Permission
+to modify the code and to distribute modified code is granted, provided the
+above notices are retained, and a notice that the code was modified is included
+with the above copyright notice.
+The Licensee may distribute binaries compiled with STLport (whether original or
+modified) without any royalties or restrictions.
+
+The Licensee may distribute original or modified STLport sources, provided that:
+
+The conditions indicated in the above permission notice are met;
+The following copyright notices are retained when present, and conditions
+provided in accompanying permission notices are met :
+Copyright 1994 Hewlett-Packard Company
+
+Copyright 1996,97 Silicon Graphics Computer Systems, Inc.
+
+Copyright 1997 Moscow Center for SPARC Technology.
+
+Permission to use, copy, modify, distribute and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that the
+above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation.
+Hewlett-Packard Company makes no representations about the suitability of this
+software for any purpose. It is provided "as is" without express or implied
+warranty.
+
+Permission to use, copy, modify, distribute and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that the
+above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation.
+Silicon Graphics makes no representations about the suitability of this
+software for any purpose. It is provided "as is" without express or implied
+warranty.
+
+Permission to use, copy, modify, distribute and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that the
+above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation. Moscow
+Center for SPARC Technology  makes no representations about the suitability
+of this software for any purpose. It is provided "as is" without express or
+implied warranty.
+
    + +
    + +#endif

    Suitable Systems License

    This license applies to certain files in the directory