aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Sergio Prado <sergio.prado@e-labworks.com>2021-04-10 15:22:19 -0300
committerGravatar Peter Korsgaard <peter@korsgaard.com>2021-04-11 20:11:52 +0200
commita363384cff08fd8380c88bef0238875e0685328b (patch)
treeb4466aa055e4f8566e140be763cf7b83b0e44f91
parentdd3c1bafb898f77584cca97ff86a6c8c6ea3c5c5 (diff)
downloadbuildroot-a363384cff08fd8380c88bef0238875e0685328b.tar.gz
buildroot-a363384cff08fd8380c88bef0238875e0685328b.tar.bz2
package/libgdiplus: bump version to 6.0.5
Remove patches applied upstream. Add patch to not build unit tests by default (patch sent upstream): https://github.com/mono/libgdiplus/pull/701 Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/libgdiplus/0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch53
-rw-r--r--package/libgdiplus/0001-Embed-the-license-texts-in-LICENSE-like-on-Mono-repo.patch1863
-rw-r--r--package/libgdiplus/0002-Update-LICENSE-to-match-the-headers-of-the-source-fi.patch1018
-rw-r--r--package/libgdiplus/0003-gifcodec.c-Include-copy-of-GifQuantizeBuffer-functio.patch414
-rw-r--r--package/libgdiplus/libgdiplus.hash2
-rw-r--r--package/libgdiplus/libgdiplus.mk2
6 files changed, 55 insertions, 3297 deletions
diff --git a/package/libgdiplus/0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch b/package/libgdiplus/0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch
new file mode 100644
index 0000000000..450286462e
--- /dev/null
+++ b/package/libgdiplus/0001-Build-unit-tests-only-when-enable-unit-tests-is-pass.patch
@@ -0,0 +1,53 @@
+From ae92a466e203c8aec43f682a3a7aa617b820c3ba Mon Sep 17 00:00:00 2001
+From: Sergio Prado <sergio.prado@e-labworks.com>
+Date: Sat, 10 Apr 2021 11:03:38 -0300
+Subject: [PATCH] Build unit tests only when --enable-unit-tests is passed
+
+Building unit tests by default requires all dependencies to be
+installed (jpeg, tiff, etc) and users may not want that.
+
+So let's disable the build of unit tests by default and introduce
+--enable-unit-tests configure option to enable it.
+
+Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
+---
+ Makefile.am | 8 ++++++--
+ configure.ac | 4 ++++
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index f40bdee0c2e9..152e0d64fdd9 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,11 @@
+ ACLOCAL_AMFLAGS = -I m4
+
+-SUBDIRS = src tests
+-DIST_SUBDIRS = src tests
++if BUILD_UNIT_TESTS
++SUBDIRS_TESTS = tests
++endif
++
++SUBDIRS = src $(SUBDIRS_TESTS)
++DIST_SUBDIRS = src $(SUBDIRS_TESTS)
+
+ pkgconfigdir = $(libdir)/pkgconfig
+
+diff --git a/configure.ac b/configure.ac
+index 098fd0a664bd..c126ff091e58 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -39,6 +39,10 @@ if test $warnaserror = "yes"; then
+ GDIPLUS_CFLAGS="$GDIPLUS_CFLAGS -Werror -Wno-unknown-warning-option -Wno-clobbered -Wno-typedef-redefinition"
+ fi
+
++AC_ARG_ENABLE(unittests, AS_HELP_STRING([--enable-unittests],[Enable building unit tests.]),[unittests=yes],[unittests=no])
++
++AM_CONDITIONAL([BUILD_UNIT_TESTS], [test x$unittests = xyes])
++
+ AC_ARG_ENABLE(asan, AS_HELP_STRING([--enable-asan],[Enable address sanitizer.]),[asan=yes],[asan=no])
+
+ if test $asan = "yes"; then
+--
+2.17.1
+
diff --git a/package/libgdiplus/0001-Embed-the-license-texts-in-LICENSE-like-on-Mono-repo.patch b/package/libgdiplus/0001-Embed-the-license-texts-in-LICENSE-like-on-Mono-repo.patch
deleted file mode 100644
index 02efc972dc..0000000000
--- a/package/libgdiplus/0001-Embed-the-license-texts-in-LICENSE-like-on-Mono-repo.patch
+++ /dev/null
@@ -1,1863 +0,0 @@
-From 850660e11ab302961aaf5ef336ed02451ade9f5b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
-Date: Thu, 21 Sep 2017 12:50:21 +0200
-Subject: [PATCH] Embed the license texts in LICENSE like on Mono repo
-
-Remove the MPL-1.1.html file.
-
-Upstream: ad0fb6f0a5e3e11f7e474456d53cc660f7808aed
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
----
- LICENSE | 980 +++++++++++++++++++++++++++++++++++++++++++++++++++
- MPL-1.1.html | 840 -------------------------------------------
- Makefile.am | 2 +-
- 3 files changed, 981 insertions(+), 841 deletions(-)
- delete mode 100644 MPL-1.1.html
-
-diff --git a/LICENSE b/LICENSE
-index f5b62b7..b3164bb 100644
---- a/LICENSE
-+++ b/LICENSE
-@@ -2,3 +2,983 @@ Libgdiplus is licensed under the terms of the GNU Library GPL or the
- Mozilla Public License 1.1.
-
-
-+The Licenses
-+============
-+
-+### GNU Library GPL
-+
-+ GNU LESSER GENERAL PUBLIC LICENSE
-+ Version 2.1, February 1999
-+
-+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ Everyone is permitted to copy and distribute verbatim copies
-+ of this license document, but changing it is not allowed.
-+
-+[This is the first released version of the Lesser GPL. It also counts
-+ as the successor of the GNU Library Public License, version 2, hence
-+ the version number 2.1.]
-+
-+ Preamble
-+
-+ The licenses for most software are designed to take away your
-+freedom to share and change it. By contrast, the GNU General Public
-+Licenses are intended to guarantee your freedom to share and change
-+free software--to make sure the software is free for all its users.
-+
-+ This license, the Lesser General Public License, applies to some
-+specially designated software packages--typically libraries--of the
-+Free Software Foundation and other authors who decide to use it. You
-+can use it too, but we suggest you first think carefully about whether
-+this license or the ordinary General Public License is the better
-+strategy to use in any particular case, based on the explanations below.
-+
-+ When we speak of free software, we are referring to freedom of use,
-+not price. Our General Public Licenses are designed to make sure that
-+you have the freedom to distribute copies of free software (and charge
-+for this service if you wish); that you receive source code or can get
-+it if you want it; that you can change the software and use pieces of
-+it in new free programs; and that you are informed that you can do
-+these things.
-+
-+ To protect your rights, we need to make restrictions that forbid
-+distributors to deny you these rights or to ask you to surrender these
-+rights. These restrictions translate to certain responsibilities for
-+you if you distribute copies of the library or if you modify it.
-+
-+ For example, if you distribute copies of the library, whether gratis
-+or for a fee, you must give the recipients all the rights that we gave
-+you. You must make sure that they, too, receive or can get the source
-+code. If you link other code with the library, you must provide
-+complete object files to the recipients, so that they can relink them
-+with the library after making changes to the library and recompiling
-+it. And you must show them these terms so they know their rights.
-+
-+ We protect your rights with a two-step method: (1) we copyright the
-+library, and (2) we offer you this license, which gives you legal
-+permission to copy, distribute and/or modify the library.
-+
-+ To protect each distributor, we want to make it very clear that
-+there is no warranty for the free library. Also, if the library is
-+modified by someone else and passed on, the recipients should know
-+that what they have is not the original version, so that the original
-+author's reputation will not be affected by problems that might be
-+introduced by others.
-+
-+ Finally, software patents pose a constant threat to the existence of
-+any free program. We wish to make sure that a company cannot
-+effectively restrict the users of a free program by obtaining a
-+restrictive license from a patent holder. Therefore, we insist that
-+any patent license obtained for a version of the library must be
-+consistent with the full freedom of use specified in this license.
-+
-+ Most GNU software, including some libraries, is covered by the
-+ordinary GNU General Public License. This license, the GNU Lesser
-+General Public License, applies to certain designated libraries, and
-+is quite different from the ordinary General Public License. We use
-+this license for certain libraries in order to permit linking those
-+libraries into non-free programs.
-+
-+ When a program is linked with a library, whether statically or using
-+a shared library, the combination of the two is legally speaking a
-+combined work, a derivative of the original library. The ordinary
-+General Public License therefore permits such linking only if the
-+entire combination fits its criteria of freedom. The Lesser General
-+Public License permits more lax criteria for linking other code with
-+the library.
-+
-+ We call this license the "Lesser" General Public License because it
-+does Less to protect the user's freedom than the ordinary General
-+Public License. It also provides other free software developers Less
-+of an advantage over competing non-free programs. These disadvantages
-+are the reason we use the ordinary General Public License for many
-+libraries. However, the Lesser license provides advantages in certain
-+special circumstances.
-+
-+ For example, on rare occasions, there may be a special need to
-+encourage the widest possible use of a certain library, so that it becomes
-+a de-facto standard. To achieve this, non-free programs must be
-+allowed to use the library. A more frequent case is that a free
-+library does the same job as widely used non-free libraries. In this
-+case, there is little to gain by limiting the free library to free
-+software only, so we use the Lesser General Public License.
-+
-+ In other cases, permission to use a particular library in non-free
-+programs enables a greater number of people to use a large body of
-+free software. For example, permission to use the GNU C Library in
-+non-free programs enables many more people to use the whole GNU
-+operating system, as well as its variant, the GNU/Linux operating
-+system.
-+
-+ Although the Lesser General Public License is Less protective of the
-+users' freedom, it does ensure that the user of a program that is
-+linked with the Library has the freedom and the wherewithal to run
-+that program using a modified version of the Library.
-+
-+ The precise terms and conditions for copying, distribution and
-+modification follow. Pay close attention to the difference between a
-+"work based on the library" and a "work that uses the library". The
-+former contains code derived from the library, whereas the latter must
-+be combined with the library in order to run.
-+
-+ GNU LESSER GENERAL PUBLIC LICENSE
-+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-+
-+ 0. This License Agreement applies to any software library or other
-+program which contains a notice placed by the copyright holder or
-+other authorized party saying it may be distributed under the terms of
-+this Lesser General Public License (also called "this License").
-+Each licensee is addressed as "you".
-+
-+ A "library" means a collection of software functions and/or data
-+prepared so as to be conveniently linked with application programs
-+(which use some of those functions and data) to form executables.
-+
-+ The "Library", below, refers to any such software library or work
-+which has been distributed under these terms. A "work based on the
-+Library" means either the Library or any derivative work under
-+copyright law: that is to say, a work containing the Library or a
-+portion of it, either verbatim or with modifications and/or translated
-+straightforwardly into another language. (Hereinafter, translation is
-+included without limitation in the term "modification".)
-+
-+ "Source code" for a work means the preferred form of the work for
-+making modifications to it. For a library, complete source code means
-+all the source code for all modules it contains, plus any associated
-+interface definition files, plus the scripts used to control compilation
-+and installation of the library.
-+
-+ Activities other than copying, distribution and modification are not
-+covered by this License; they are outside its scope. The act of
-+running a program using the Library is not restricted, and output from
-+such a program is covered only if its contents constitute a work based
-+on the Library (independent of the use of the Library in a tool for
-+writing it). Whether that is true depends on what the Library does
-+and what the program that uses the Library does.
-+
-+ 1. You may copy and distribute verbatim copies of the Library's
-+complete source code as you receive it, in any medium, provided that
-+you conspicuously and appropriately publish on each copy an
-+appropriate copyright notice and disclaimer of warranty; keep intact
-+all the notices that refer to this License and to the absence of any
-+warranty; and distribute a copy of this License along with the
-+Library.
-+
-+ You may charge a fee for the physical act of transferring a copy,
-+and you may at your option offer warranty protection in exchange for a
-+fee.
-+
-+ 2. You may modify your copy or copies of the Library or any portion
-+of it, thus forming a work based on the Library, and copy and
-+distribute such modifications or work under the terms of Section 1
-+above, provided that you also meet all of these conditions:
-+
-+ a) The modified work must itself be a software library.
-+
-+ b) You must cause the files modified to carry prominent notices
-+ stating that you changed the files and the date of any change.
-+
-+ c) You must cause the whole of the work to be licensed at no
-+ charge to all third parties under the terms of this License.
-+
-+ d) If a facility in the modified Library refers to a function or a
-+ table of data to be supplied by an application program that uses
-+ the facility, other than as an argument passed when the facility
-+ is invoked, then you must make a good faith effort to ensure that,
-+ in the event an application does not supply such function or
-+ table, the facility still operates, and performs whatever part of
-+ its purpose remains meaningful.
-+
-+ (For example, a function in a library to compute square roots has
-+ a purpose that is entirely well-defined independent of the
-+ application. Therefore, Subsection 2d requires that any
-+ application-supplied function or table used by this function must
-+ be optional: if the application does not supply it, the square
-+ root function must still compute square roots.)
-+
-+These requirements apply to the modified work as a whole. If
-+identifiable sections of that work are not derived from the Library,
-+and can be reasonably considered independent and separate works in
-+themselves, then this License, and its terms, do not apply to those
-+sections when you distribute them as separate works. But when you
-+distribute the same sections as part of a whole which is a work based
-+on the Library, the distribution of the whole must be on the terms of
-+this License, whose permissions for other licensees extend to the
-+entire whole, and thus to each and every part regardless of who wrote
-+it.
-+
-+Thus, it is not the intent of this section to claim rights or contest
-+your rights to work written entirely by you; rather, the intent is to
-+exercise the right to control the distribution of derivative or
-+collective works based on the Library.
-+
-+In addition, mere aggregation of another work not based on the Library
-+with the Library (or with a work based on the Library) on a volume of
-+a storage or distribution medium does not bring the other work under
-+the scope of this License.
-+
-+ 3. You may opt to apply the terms of the ordinary GNU General Public
-+License instead of this License to a given copy of the Library. To do
-+this, you must alter all the notices that refer to this License, so
-+that they refer to the ordinary GNU General Public License, version 2,
-+instead of to this License. (If a newer version than version 2 of the
-+ordinary GNU General Public License has appeared, then you can specify
-+that version instead if you wish.) Do not make any other change in
-+these notices.
-+
-+ Once this change is made in a given copy, it is irreversible for
-+that copy, so the ordinary GNU General Public License applies to all
-+subsequent copies and derivative works made from that copy.
-+
-+ This option is useful when you wish to copy part of the code of
-+the Library into a program that is not a library.
-+
-+ 4. You may copy and distribute the Library (or a portion or
-+derivative of it, under Section 2) in object code or executable form
-+under the terms of Sections 1 and 2 above provided that you accompany
-+it with the complete corresponding machine-readable source code, which
-+must be distributed under the terms of Sections 1 and 2 above on a
-+medium customarily used for software interchange.
-+
-+ If distribution of object code is made by offering access to copy
-+from a designated place, then offering equivalent access to copy the
-+source code from the same place satisfies the requirement to
-+distribute the source code, even though third parties are not
-+compelled to copy the source along with the object code.
-+
-+ 5. A program that contains no derivative of any portion of the
-+Library, but is designed to work with the Library by being compiled or
-+linked with it, is called a "work that uses the Library". Such a
-+work, in isolation, is not a derivative work of the Library, and
-+therefore falls outside the scope of this License.
-+
-+ However, linking a "work that uses the Library" with the Library
-+creates an executable that is a derivative of the Library (because it
-+contains portions of the Library), rather than a "work that uses the
-+library". The executable is therefore covered by this License.
-+Section 6 states terms for distribution of such executables.
-+
-+ When a "work that uses the Library" uses material from a header file
-+that is part of the Library, the object code for the work may be a
-+derivative work of the Library even though the source code is not.
-+Whether this is true is especially significant if the work can be
-+linked without the Library, or if the work is itself a library. The
-+threshold for this to be true is not precisely defined by law.
-+
-+ If such an object file uses only numerical parameters, data
-+structure layouts and accessors, and small macros and small inline
-+functions (ten lines or less in length), then the use of the object
-+file is unrestricted, regardless of whether it is legally a derivative
-+work. (Executables containing this object code plus portions of the
-+Library will still fall under Section 6.)
-+
-+ Otherwise, if the work is a derivative of the Library, you may
-+distribute the object code for the work under the terms of Section 6.
-+Any executables containing that work also fall under Section 6,
-+whether or not they are linked directly with the Library itself.
-+
-+ 6. As an exception to the Sections above, you may also combine or
-+link a "work that uses the Library" with the Library to produce a
-+work containing portions of the Library, and distribute that work
-+under terms of your choice, provided that the terms permit
-+modification of the work for the customer's own use and reverse
-+engineering for debugging such modifications.
-+
-+ You must give prominent notice with each copy of the work that the
-+Library is used in it and that the Library and its use are covered by
-+this License. You must supply a copy of this License. If the work
-+during execution displays copyright notices, you must include the
-+copyright notice for the Library among them, as well as a reference
-+directing the user to the copy of this License. Also, you must do one
-+of these things:
-+
-+ a) Accompany the work with the complete corresponding
-+ machine-readable source code for the Library including whatever
-+ changes were used in the work (which must be distributed under
-+ Sections 1 and 2 above); and, if the work is an executable linked
-+ with the Library, with the complete machine-readable "work that
-+ uses the Library", as object code and/or source code, so that the
-+ user can modify the Library and then relink to produce a modified
-+ executable containing the modified Library. (It is understood
-+ that the user who changes the contents of definitions files in the
-+ Library will not necessarily be able to recompile the application
-+ to use the modified definitions.)
-+
-+ b) Use a suitable shared library mechanism for linking with the
-+ Library. A suitable mechanism is one that (1) uses at run time a
-+ copy of the library already present on the user's computer system,
-+ rather than copying library functions into the executable, and (2)
-+ will operate properly with a modified version of the library, if
-+ the user installs one, as long as the modified version is
-+ interface-compatible with the version that the work was made with.
-+
-+ c) Accompany the work with a written offer, valid for at
-+ least three years, to give the same user the materials
-+ specified in Subsection 6a, above, for a charge no more
-+ than the cost of performing this distribution.
-+
-+ d) If distribution of the work is made by offering access to copy
-+ from a designated place, offer equivalent access to copy the above
-+ specified materials from the same place.
-+
-+ e) Verify that the user has already received a copy of these
-+ materials or that you have already sent this user a copy.
-+
-+ For an executable, the required form of the "work that uses the
-+Library" must include any data and utility programs needed for
-+reproducing the executable from it. However, as a special exception,
-+the materials to be distributed need not include anything that is
-+normally distributed (in either source or binary form) with the major
-+components (compiler, kernel, and so on) of the operating system on
-+which the executable runs, unless that component itself accompanies
-+the executable.
-+
-+ It may happen that this requirement contradicts the license
-+restrictions of other proprietary libraries that do not normally
-+accompany the operating system. Such a contradiction means you cannot
-+use both them and the Library together in an executable that you
-+distribute.
-+
-+ 7. You may place library facilities that are a work based on the
-+Library side-by-side in a single library together with other library
-+facilities not covered by this License, and distribute such a combined
-+library, provided that the separate distribution of the work based on
-+the Library and of the other library facilities is otherwise
-+permitted, and provided that you do these two things:
-+
-+ a) Accompany the combined library with a copy of the same work
-+ based on the Library, uncombined with any other library
-+ facilities. This must be distributed under the terms of the
-+ Sections above.
-+
-+ b) Give prominent notice with the combined library of the fact
-+ that part of it is a work based on the Library, and explaining
-+ where to find the accompanying uncombined form of the same work.
-+
-+ 8. You may not copy, modify, sublicense, link with, or distribute
-+the Library except as expressly provided under this License. Any
-+attempt otherwise to copy, modify, sublicense, link with, or
-+distribute the Library is void, and will automatically terminate your
-+rights under this License. However, parties who have received copies,
-+or rights, from you under this License will not have their licenses
-+terminated so long as such parties remain in full compliance.
-+
-+ 9. You are not required to accept this License, since you have not
-+signed it. However, nothing else grants you permission to modify or
-+distribute the Library or its derivative works. These actions are
-+prohibited by law if you do not accept this License. Therefore, by
-+modifying or distributing the Library (or any work based on the
-+Library), you indicate your acceptance of this License to do so, and
-+all its terms and conditions for copying, distributing or modifying
-+the Library or works based on it.
-+
-+ 10. Each time you redistribute the Library (or any work based on the
-+Library), the recipient automatically receives a license from the
-+original licensor to copy, distribute, link with or modify the Library
-+subject to these terms and conditions. You may not impose any further
-+restrictions on the recipients' exercise of the rights granted herein.
-+You are not responsible for enforcing compliance by third parties with
-+this License.
-+
-+ 11. If, as a consequence of a court judgment or allegation of patent
-+infringement or for any other reason (not limited to patent issues),
-+conditions are imposed on you (whether by court order, agreement or
-+otherwise) that contradict the conditions of this License, they do not
-+excuse you from the conditions of this License. If you cannot
-+distribute so as to satisfy simultaneously your obligations under this
-+License and any other pertinent obligations, then as a consequence you
-+may not distribute the Library at all. For example, if a patent
-+license would not permit royalty-free redistribution of the Library by
-+all those who receive copies directly or indirectly through you, then
-+the only way you could satisfy both it and this License would be to
-+refrain entirely from distribution of the Library.
-+
-+If any portion of this section is held invalid or unenforceable under any
-+particular circumstance, the balance of the section is intended to apply,
-+and the section as a whole is intended to apply in other circumstances.
-+
-+It is not the purpose of this section to induce you to infringe any
-+patents or other property right claims or to contest validity of any
-+such claims; this section has the sole purpose of protecting the
-+integrity of the free software distribution system which is
-+implemented by public license practices. Many people have made
-+generous contributions to the wide range of software distributed
-+through that system in reliance on consistent application of that
-+system; it is up to the author/donor to decide if he or she is willing
-+to distribute software through any other system and a licensee cannot
-+impose that choice.
-+
-+This section is intended to make thoroughly clear what is believed to
-+be a consequence of the rest of this License.
-+
-+ 12. If the distribution and/or use of the Library is restricted in
-+certain countries either by patents or by copyrighted interfaces, the
-+original copyright holder who places the Library under this License may add
-+an explicit geographical distribution limitation excluding those countries,
-+so that distribution is permitted only in or among countries not thus
-+excluded. In such case, this License incorporates the limitation as if
-+written in the body of this License.
-+
-+ 13. The Free Software Foundation may publish revised and/or new
-+versions of the Lesser General Public License from time to time.
-+Such new versions will be similar in spirit to the present version,
-+but may differ in detail to address new problems or concerns.
-+
-+Each version is given a distinguishing version number. If the Library
-+specifies a version number of this License which applies to it and
-+"any later version", you have the option of following the terms and
-+conditions either of that version or of any later version published by
-+the Free Software Foundation. If the Library does not specify a
-+license version number, you may choose any version ever published by
-+the Free Software Foundation.
-+
-+ 14. If you wish to incorporate parts of the Library into other free
-+programs whose distribution conditions are incompatible with these,
-+write to the author to ask for permission. For software which is
-+copyrighted by the Free Software Foundation, write to the Free
-+Software Foundation; we sometimes make exceptions for this. Our
-+decision will be guided by the two goals of preserving the free status
-+of all derivatives of our free software and of promoting the sharing
-+and reuse of software generally.
-+
-+ NO WARRANTY
-+
-+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-+
-+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-+DAMAGES.
-+
-+ END OF TERMS AND CONDITIONS
-+
-+ How to Apply These Terms to Your New Libraries
-+
-+ If you develop a new library, and you want it to be of the greatest
-+possible use to the public, we recommend making it free software that
-+everyone can redistribute and change. You can do so by permitting
-+redistribution under these terms (or, alternatively, under the terms of the
-+ordinary General Public License).
-+
-+ To apply these terms, attach the following notices to the library. It is
-+safest to attach them to the start of each source file to most effectively
-+convey the exclusion of warranty; and each file should have at least the
-+"copyright" line and a pointer to where the full notice is found.
-+
-+ <one line to give the library's name and a brief idea of what it does.>
-+ Copyright (C) <year> <name of author>
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ This library 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 for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with this library; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+
-+Also add information on how to contact you by electronic and paper mail.
-+
-+You should also get your employer (if you work as a programmer) or your
-+school, if any, to sign a "copyright disclaimer" for the library, if
-+necessary. Here is a sample; alter the names:
-+
-+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
-+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-+
-+ <signature of Ty Coon>, 1 April 1990
-+ Ty Coon, President of Vice
-+
-+That's all there is to it!
-+
-+
-+### Mozilla Public License 1.1
-+
-+ MOZILLA PUBLIC LICENSE
-+ Version 1.1
-+
-+ ---------------
-+
-+1. Definitions.
-+
-+ 1.0.1. "Commercial Use" means distribution or otherwise making the
-+ Covered Code available to a third party.
-+
-+ 1.1. "Contributor" means each entity that creates or contributes to
-+ the creation of Modifications.
-+
-+ 1.2. "Contributor Version" means the combination of the Original
-+ Code, prior Modifications used by a Contributor, and the Modifications
-+ made by that particular Contributor.
-+
-+ 1.3. "Covered Code" means the Original Code or Modifications or the
-+ combination of the Original Code and Modifications, in each case
-+ including portions thereof.
-+
-+ 1.4. "Electronic Distribution Mechanism" means a mechanism generally
-+ accepted in the software development community for the electronic
-+ transfer of data.
-+
-+ 1.5. "Executable" means Covered Code in any form other than Source
-+ Code.
-+
-+ 1.6. "Initial Developer" means the individual or entity identified
-+ as the Initial Developer in the Source Code notice required by Exhibit
-+ A.
-+
-+ 1.7. "Larger Work" means a work which combines Covered Code or
-+ portions thereof with code not governed by the terms of this License.
-+
-+ 1.8. "License" means this document.
-+
-+ 1.8.1. "Licensable" means having the right to grant, to the maximum
-+ extent possible, whether at the time of the initial grant or
-+ subsequently acquired, any and all of the rights conveyed herein.
-+
-+ 1.9. "Modifications" means any addition to or deletion from the
-+ substance or structure of either the Original Code or any previous
-+ Modifications. When Covered Code is released as a series of files, a
-+ Modification is:
-+ A. Any addition to or deletion from the contents of a file
-+ containing Original Code or previous Modifications.
-+
-+ B. Any new file that contains any part of the Original Code or
-+ previous Modifications.
-+
-+ 1.10. "Original Code" means Source Code of computer software code
-+ which is described in the Source Code notice required by Exhibit A as
-+ Original Code, and which, at the time of its release under this
-+ License is not already Covered Code governed by this License.
-+
-+ 1.10.1. "Patent Claims" means any patent claim(s), now owned or
-+ hereafter acquired, including without limitation, method, process,
-+ and apparatus claims, in any patent Licensable by grantor.
-+
-+ 1.11. "Source Code" means the preferred form of the Covered Code for
-+ making modifications to it, including all modules it contains, plus
-+ any associated interface definition files, scripts used to control
-+ compilation and installation of an Executable, or source code
-+ differential comparisons against either the Original Code or another
-+ well known, available Covered Code of the Contributor's choice. The
-+ Source Code can be in a compressed or archival form, provided the
-+ appropriate decompression or de-archiving software is widely available
-+ for no charge.
-+
-+ 1.12. "You" (or "Your") means an individual or a legal entity
-+ exercising rights under, and complying with all of the terms of, this
-+ License or a future version of this License issued under Section 6.1.
-+ For legal entities, "You" includes any entity which controls, is
-+ controlled by, or is under common control with You. For purposes of
-+ this definition, "control" means (a) the power, direct or indirect,
-+ to cause the direction or management of such entity, whether by
-+ contract or otherwise, or (b) ownership of more than fifty percent
-+ (50%) of the outstanding shares or beneficial ownership of such
-+ entity.
-+
-+2. Source Code License.
-+
-+ 2.1. The Initial Developer Grant.
-+ The Initial Developer hereby grants You a world-wide, royalty-free,
-+ non-exclusive license, subject to third party intellectual property
-+ claims:
-+ (a) under intellectual property rights (other than patent or
-+ trademark) Licensable by Initial Developer to use, reproduce,
-+ modify, display, perform, sublicense and distribute the Original
-+ Code (or portions thereof) with or without Modifications, and/or
-+ as part of a Larger Work; and
-+
-+ (b) under Patents Claims infringed by the making, using or
-+ selling of Original Code, to make, have made, use, practice,
-+ sell, and offer for sale, and/or otherwise dispose of the
-+ Original Code (or portions thereof).
-+
-+ (c) the licenses granted in this Section 2.1(a) and (b) are
-+ effective on the date Initial Developer first distributes
-+ Original Code under the terms of this License.
-+
-+ (d) Notwithstanding Section 2.1(b) above, no patent license is
-+ granted: 1) for code that You delete from the Original Code; 2)
-+ separate from the Original Code; or 3) for infringements caused
-+ by: i) the modification of the Original Code or ii) the
-+ combination of the Original Code with other software or devices.
-+
-+ 2.2. Contributor Grant.
-+ Subject to third party intellectual property claims, each Contributor
-+ hereby grants You a world-wide, royalty-free, non-exclusive license
-+
-+ (a) under intellectual property rights (other than patent or
-+ trademark) Licensable by Contributor, to use, reproduce, modify,
-+ display, perform, sublicense and distribute the Modifications
-+ created by such Contributor (or portions thereof) either on an
-+ unmodified basis, with other Modifications, as Covered Code
-+ and/or as part of a Larger Work; and
-+
-+ (b) under Patent Claims infringed by the making, using, or
-+ selling of Modifications made by that Contributor either alone
-+ and/or in combination with its Contributor Version (or portions
-+ of such combination), to make, use, sell, offer for sale, have
-+ made, and/or otherwise dispose of: 1) Modifications made by that
-+ Contributor (or portions thereof); and 2) the combination of
-+ Modifications made by that Contributor with its Contributor
-+ Version (or portions of such combination).
-+
-+ (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-+ effective on the date Contributor first makes Commercial Use of
-+ the Covered Code.
-+
-+ (d) Notwithstanding Section 2.2(b) above, no patent license is
-+ granted: 1) for any code that Contributor has deleted from the
-+ Contributor Version; 2) separate from the Contributor Version;
-+ 3) for infringements caused by: i) third party modifications of
-+ Contributor Version or ii) the combination of Modifications made
-+ by that Contributor with other software (except as part of the
-+ Contributor Version) or other devices; or 4) under Patent Claims
-+ infringed by Covered Code in the absence of Modifications made by
-+ that Contributor.
-+
-+3. Distribution Obligations.
-+
-+ 3.1. Application of License.
-+ The Modifications which You create or to which You contribute are
-+ governed by the terms of this License, including without limitation
-+ Section 2.2. The Source Code version of Covered Code may be
-+ distributed only under the terms of this License or a future version
-+ of this License released under Section 6.1, and You must include a
-+ copy of this License with every copy of the Source Code You
-+ distribute. You may not offer or impose any terms on any Source Code
-+ version that alters or restricts the applicable version of this
-+ License or the recipients' rights hereunder. However, You may include
-+ an additional document offering the additional rights described in
-+ Section 3.5.
-+
-+ 3.2. Availability of Source Code.
-+ Any Modification which You create or to which You contribute must be
-+ made available in Source Code form under the terms of this License
-+ either on the same media as an Executable version or via an accepted
-+ Electronic Distribution Mechanism to anyone to whom you made an
-+ Executable version available; and if made available via Electronic
-+ Distribution Mechanism, must remain available for at least twelve (12)
-+ months after the date it initially became available, or at least six
-+ (6) months after a subsequent version of that particular Modification
-+ has been made available to such recipients. You are responsible for
-+ ensuring that the Source Code version remains available even if the
-+ Electronic Distribution Mechanism is maintained by a third party.
-+
-+ 3.3. Description of Modifications.
-+ You must cause all Covered Code to which You contribute to contain a
-+ file documenting the changes You made to create that Covered Code and
-+ the date of any change. You must include a prominent statement that
-+ the Modification is derived, directly or indirectly, from Original
-+ Code provided by the Initial Developer and including the name of the
-+ Initial Developer in (a) the Source Code, and (b) in any notice in an
-+ Executable version or related documentation in which You describe the
-+ origin or ownership of the Covered Code.
-+
-+ 3.4. Intellectual Property Matters
-+ (a) Third Party Claims.
-+ If Contributor has knowledge that a license under a third party's
-+ intellectual property rights is required to exercise the rights
-+ granted by such Contributor under Sections 2.1 or 2.2,
-+ Contributor must include a text file with the Source Code
-+ distribution titled "LEGAL" which describes the claim and the
-+ party making the claim in sufficient detail that a recipient will
-+ know whom to contact. If Contributor obtains such knowledge after
-+ the Modification is made available as described in Section 3.2,
-+ Contributor shall promptly modify the LEGAL file in all copies
-+ Contributor makes available thereafter and shall take other steps
-+ (such as notifying appropriate mailing lists or newsgroups)
-+ reasonably calculated to inform those who received the Covered
-+ Code that new knowledge has been obtained.
-+
-+ (b) Contributor APIs.
-+ If Contributor's Modifications include an application programming
-+ interface and Contributor has knowledge of patent licenses which
-+ are reasonably necessary to implement that API, Contributor must
-+ also include this information in the LEGAL file.
-+
-+ (c) Representations.
-+ Contributor represents that, except as disclosed pursuant to
-+ Section 3.4(a) above, Contributor believes that Contributor's
-+ Modifications are Contributor's original creation(s) and/or
-+ Contributor has sufficient rights to grant the rights conveyed by
-+ this License.
-+
-+ 3.5. Required Notices.
-+ You must duplicate the notice in Exhibit A in each file of the Source
-+ Code. If it is not possible to put such notice in a particular Source
-+ Code file due to its structure, then You must include such notice in a
-+ location (such as a relevant directory) where a user would be likely
-+ to look for such a notice. If You created one or more Modification(s)
-+ You may add your name as a Contributor to the notice described in
-+ Exhibit A. You must also duplicate this License in any documentation
-+ for the Source Code where You describe recipients' rights or ownership
-+ rights relating to Covered Code. You may choose to offer, and to
-+ charge a fee for, warranty, support, indemnity or liability
-+ obligations to one or more recipients of Covered Code. However, You
-+ may do so only on Your own behalf, and not on behalf of the Initial
-+ Developer or any Contributor. You must make it absolutely clear than
-+ any such warranty, support, indemnity or liability obligation is
-+ offered by You alone, and You hereby agree to indemnify the Initial
-+ Developer and every Contributor for any liability incurred by the
-+ Initial Developer or such Contributor as a result of warranty,
-+ support, indemnity or liability terms You offer.
-+
-+ 3.6. Distribution of Executable Versions.
-+ You may distribute Covered Code in Executable form only if the
-+ requirements of Section 3.1-3.5 have been met for that Covered Code,
-+ and if You include a notice stating that the Source Code version of
-+ the Covered Code is available under the terms of this License,
-+ including a description of how and where You have fulfilled the
-+ obligations of Section 3.2. The notice must be conspicuously included
-+ in any notice in an Executable version, related documentation or
-+ collateral in which You describe recipients' rights relating to the
-+ Covered Code. You may distribute the Executable version of Covered
-+ Code or ownership rights under a license of Your choice, which may
-+ contain terms different from this License, provided that You are in
-+ compliance with the terms of this License and that the license for the
-+ Executable version does not attempt to limit or alter the recipient's
-+ rights in the Source Code version from the rights set forth in this
-+ License. If You distribute the Executable version under a different
-+ license You must make it absolutely clear that any terms which differ
-+ from this License are offered by You alone, not by the Initial
-+ Developer or any Contributor. You hereby agree to indemnify the
-+ Initial Developer and every Contributor for any liability incurred by
-+ the Initial Developer or such Contributor as a result of any such
-+ terms You offer.
-+
-+ 3.7. Larger Works.
-+ You may create a Larger Work by combining Covered Code with other code
-+ not governed by the terms of this License and distribute the Larger
-+ Work as a single product. In such a case, You must make sure the
-+ requirements of this License are fulfilled for the Covered Code.
-+
-+4. Inability to Comply Due to Statute or Regulation.
-+
-+ If it is impossible for You to comply with any of the terms of this
-+ License with respect to some or all of the Covered Code due to
-+ statute, judicial order, or regulation then You must: (a) comply with
-+ the terms of this License to the maximum extent possible; and (b)
-+ describe the limitations and the code they affect. Such description
-+ must be included in the LEGAL file described in Section 3.4 and must
-+ be included with all distributions of the Source Code. Except to the
-+ extent prohibited by statute or regulation, such description must be
-+ sufficiently detailed for a recipient of ordinary skill to be able to
-+ understand it.
-+
-+5. Application of this License.
-+
-+ This License applies to code to which the Initial Developer has
-+ attached the notice in Exhibit A and to related Covered Code.
-+
-+6. Versions of the License.
-+
-+ 6.1. New Versions.
-+ Netscape Communications Corporation ("Netscape") may publish revised
-+ and/or new versions of the License from time to time. Each version
-+ will be given a distinguishing version number.
-+
-+ 6.2. Effect of New Versions.
-+ Once Covered Code has been published under a particular version of the
-+ License, You may always continue to use it under the terms of that
-+ version. You may also choose to use such Covered Code under the terms
-+ of any subsequent version of the License published by Netscape. No one
-+ other than Netscape has the right to modify the terms applicable to
-+ Covered Code created under this License.
-+
-+ 6.3. Derivative Works.
-+ If You create or use a modified version of this License (which you may
-+ only do in order to apply it to code which is not already Covered Code
-+ governed by this License), You must (a) rename Your license so that
-+ the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-+ "MPL", "NPL" or any confusingly similar phrase do not appear in your
-+ license (except to note that your license differs from this License)
-+ and (b) otherwise make it clear that Your version of the license
-+ contains terms which differ from the Mozilla Public License and
-+ Netscape Public License. (Filling in the name of the Initial
-+ Developer, Original Code or Contributor in the notice described in
-+ Exhibit A shall not of themselves be deemed to be modifications of
-+ this License.)
-+
-+7. DISCLAIMER OF WARRANTY.
-+
-+ COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-+ WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+ WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-+ DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-+ THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-+ IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-+ YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-+ COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-+ OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-+ ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-+
-+8. TERMINATION.
-+
-+ 8.1. This License and the rights granted hereunder will terminate
-+ automatically if You fail to comply with terms herein and fail to cure
-+ such breach within 30 days of becoming aware of the breach. All
-+ sublicenses to the Covered Code which are properly granted shall
-+ survive any termination of this License. Provisions which, by their
-+ nature, must remain in effect beyond the termination of this License
-+ shall survive.
-+
-+ 8.2. If You initiate litigation by asserting a patent infringement
-+ claim (excluding declatory judgment actions) against Initial Developer
-+ or a Contributor (the Initial Developer or Contributor against whom
-+ You file such action is referred to as "Participant") alleging that:
-+
-+ (a) such Participant's Contributor Version directly or indirectly
-+ infringes any patent, then any and all rights granted by such
-+ Participant to You under Sections 2.1 and/or 2.2 of this License
-+ shall, upon 60 days notice from Participant terminate prospectively,
-+ unless if within 60 days after receipt of notice You either: (i)
-+ agree in writing to pay Participant a mutually agreeable reasonable
-+ royalty for Your past and future use of Modifications made by such
-+ Participant, or (ii) withdraw Your litigation claim with respect to
-+ the Contributor Version against such Participant. If within 60 days
-+ of notice, a reasonable royalty and payment arrangement are not
-+ mutually agreed upon in writing by the parties or the litigation claim
-+ is not withdrawn, the rights granted by Participant to You under
-+ Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-+ the 60 day notice period specified above.
-+
-+ (b) any software, hardware, or device, other than such Participant's
-+ Contributor Version, directly or indirectly infringes any patent, then
-+ any rights granted to You by such Participant under Sections 2.1(b)
-+ and 2.2(b) are revoked effective as of the date You first made, used,
-+ sold, distributed, or had made, Modifications made by that
-+ Participant.
-+
-+ 8.3. If You assert a patent infringement claim against Participant
-+ alleging that such Participant's Contributor Version directly or
-+ indirectly infringes any patent where such claim is resolved (such as
-+ by license or settlement) prior to the initiation of patent
-+ infringement litigation, then the reasonable value of the licenses
-+ granted by such Participant under Sections 2.1 or 2.2 shall be taken
-+ into account in determining the amount or value of any payment or
-+ license.
-+
-+ 8.4. In the event of termination under Sections 8.1 or 8.2 above,
-+ all end user license agreements (excluding distributors and resellers)
-+ which have been validly granted by You or any distributor hereunder
-+ prior to termination shall survive termination.
-+
-+9. LIMITATION OF LIABILITY.
-+
-+ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-+ (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-+ DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-+ OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-+ ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-+ CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-+ WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-+ COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-+ INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-+ LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-+ RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-+ PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-+ EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-+ THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-+
-+10. U.S. GOVERNMENT END USERS.
-+
-+ The Covered Code is a "commercial item," as that term is defined in
-+ 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-+ software" and "commercial computer software documentation," as such
-+ terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-+ C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-+ all U.S. Government End Users acquire Covered Code with only those
-+ rights set forth herein.
-+
-+11. MISCELLANEOUS.
-+
-+ This License represents the complete agreement concerning subject
-+ matter hereof. If any provision of this License is held to be
-+ unenforceable, such provision shall be reformed only to the extent
-+ necessary to make it enforceable. This License shall be governed by
-+ California law provisions (except to the extent applicable law, if
-+ any, provides otherwise), excluding its conflict-of-law provisions.
-+ With respect to disputes in which at least one party is a citizen of,
-+ or an entity chartered or registered to do business in the United
-+ States of America, any litigation relating to this License shall be
-+ subject to the jurisdiction of the Federal Courts of the Northern
-+ District of California, with venue lying in Santa Clara County,
-+ California, with the losing party responsible for costs, including
-+ without limitation, court costs and reasonable attorneys' fees and
-+ expenses. The application of the United Nations Convention on
-+ Contracts for the International Sale of Goods is expressly excluded.
-+ Any law or regulation which provides that the language of a contract
-+ shall be construed against the drafter shall not apply to this
-+ License.
-+
-+12. RESPONSIBILITY FOR CLAIMS.
-+
-+ As between Initial Developer and the Contributors, each party is
-+ responsible for claims and damages arising, directly or indirectly,
-+ out of its utilization of rights under this License and You agree to
-+ work with Initial Developer and Contributors to distribute such
-+ responsibility on an equitable basis. Nothing herein is intended or
-+ shall be deemed to constitute any admission of liability.
-+
-+13. MULTIPLE-LICENSED CODE.
-+
-+ Initial Developer may designate portions of the Covered Code as
-+ "Multiple-Licensed". "Multiple-Licensed" means that the Initial
-+ Developer permits you to utilize portions of the Covered Code under
-+ Your choice of the NPL or the alternative licenses, if any, specified
-+ by the Initial Developer in the file described in Exhibit A.
-+
-+EXHIBIT A -Mozilla Public License.
-+
-+ ``The contents of this file are subject to the Mozilla Public License
-+ Version 1.1 (the "License"); you may not use this file except in
-+ compliance with the License. You may obtain a copy of the License at
-+ http://www.mozilla.org/MPL/
-+
-+ Software distributed under the License is distributed on an "AS IS"
-+ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-+ License for the specific language governing rights and limitations
-+ under the License.
-+
-+ The Original Code is ______________________________________.
-+
-+ The Initial Developer of the Original Code is ________________________.
-+ Portions created by ______________________ are Copyright (C) ______
-+ _______________________. All Rights Reserved.
-+
-+ Contributor(s): ______________________________________.
-+
-+ Alternatively, the contents of this file may be used under the terms
-+ of the _____ license (the "[___] License"), in which case the
-+ provisions of [______] License are applicable instead of those
-+ above. If you wish to allow use of your version of this file only
-+ under the terms of the [____] License and not to allow others to use
-+ your version of this file under the MPL, indicate your decision by
-+ deleting the provisions above and replace them with the notice and
-+ other provisions required by the [___] License. If you do not delete
-+ the provisions above, a recipient may use your version of this file
-+ under either the MPL or the [___] License."
-+
-+ [NOTE: The text of this Exhibit A may differ slightly from the text of
-+ the notices in the Source Code files of the Original Code. You should
-+ use the text of this Exhibit A rather than the text found in the
-+ Original Code Source Code for Your Modifications.]
-diff --git a/MPL-1.1.html b/MPL-1.1.html
-deleted file mode 100644
-index 7729f6c..0000000
---- a/MPL-1.1.html
-+++ /dev/null
-@@ -1,840 +0,0 @@
--<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
--
--<html>
--
--<head>
--
-- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
--
-- <meta name="GENERATOR" content="Mozilla/4.5 [en]C-NSCP (Win95; U) [Netscape]">
--
-- <title>Mozilla Public License version 1.1</title>
--
--</head>
--
--<body text="#000000" bgcolor="#FFFFFF" link="#0000EE" vlink="#551A8B" alink="#FF0000">
--
--
--
--<center><b><font size=+2>MOZILLA PUBLIC LICENSE</font></b>
--
--<br><b>Version 1.1</b>
--
--<p>
--
--<hr WIDTH="20%"></center>
--
--
--<a name="1"></a>
--<p><b>1. Definitions.</b>
--
--<a name="1.0.1"></a>
--<ul><b>1.0.1. "Commercial Use" </b>means distribution or otherwise making
--
--the Covered Code available to a third party.
--
--<a name="1.1"></a>
--<p><b>1.1. ''Contributor''</b> means each entity that creates or contributes
--
--to the creation of Modifications.
--
--<a name="1.2"></a>
--<p><b>1.2. ''Contributor Version''</b> means the combination of the Original
--
--Code, prior Modifications used by a Contributor, and the Modifications
--
--made by that particular Contributor.
--
--<a name="1.3"></a>
--<p><b>1.3. ''Covered Code''</b> means the Original Code or Modifications
--
--or the combination of the Original Code and Modifications, in each case
--
--including portions thereof<b>.</b>
--
--<a name="1.4"></a>
--<p><b>1.4. ''Electronic Distribution Mechanism''</b> means a mechanism
--
--generally accepted in the software development community for the electronic
--
--transfer of data.
--
--<a name="1.5"></a>
--<p><b>1.5. ''Executable''</b> means Covered Code in any form other than
--
--Source Code.
--
--<a name="1.6"></a>
--<p><b>1.6. ''Initial Developer''</b> means the individual or entity identified
--
--as the Initial Developer in the Source Code notice required by <b>Exhibit
--
--A</b>.
--
--<a name="1.7"></a>
--<p><b>1.7. ''Larger Work''</b> means a work which combines Covered Code
--
--or portions thereof with code not governed by the terms of this License.
--
--<a name="1.8"></a>
--<p><b>1.8. ''License''</b> means this document.
--
--<a name="1.8.1"></a>
--<p><b>1.8.1. "Licensable"</b> means having the right to grant, to the maximum
--
--extent possible, whether at the time of the initial grant or subsequently
--
--acquired, any and all of the rights conveyed herein.
--
--<a name="1.9"></a>
--<p><b>1.9. ''Modifications''</b> means any addition to or deletion from
--
--the substance or structure of either the Original Code or any previous
--
--Modifications. When Covered Code is released as a series of files, a Modification
--
--is:
--
--<ul><b>A.</b> Any addition to or deletion from the contents of a file containing
--
--Original Code or previous Modifications.
--
--<p><b>B.</b> Any new file that contains any part of the Original Code or
--
--previous Modifications.
--
--<br>&nbsp;</ul>
--
--<a name="1.10"></a>
--<b>1.10. ''Original Code''</b> means Source Code of computer software code
--
--which is described in the Source Code notice required by <b>Exhibit A</b>
--
--as Original Code, and which, at the time of its release under this License
--
--is not already Covered Code governed by this License.
--
--<a name="1.10.1"></a>
--<p><b>1.10.1. "Patent Claims"</b> means any patent claim(s), now owned
--
--or hereafter acquired, including without limitation,&nbsp; method, process,
--
--and apparatus claims, in any patent Licensable by grantor.
--
--<a name="1.11"></a>
--<p><b>1.11. ''Source Code''</b> means the preferred form of the Covered
--
--Code for making modifications to it, including all modules it contains,
--
--plus any associated interface definition files, scripts used to control
--
--compilation and installation of an Executable, or source code differential
--
--comparisons against either the Original Code or another well known, available
--
--Covered Code of the Contributor's choice. The Source Code can be in a compressed
--
--or archival form, provided the appropriate decompression or de-archiving
--
--software is widely available for no charge.
--
--<a name="1.12"></a>
--<p><b>1.12. "You'' (or "Your")&nbsp;</b> means an individual or a legal
--
--entity exercising rights under, and complying with all of the terms of,
--
--this License or a future version of this License issued under Section 6.1.
--
--For legal entities, "You'' includes any entity which controls, is controlled
--
--by, or is under common control with You. For purposes of this definition,
--
--"control'' means (a) the power, direct or indirect, to cause the direction
--
--or management of such entity, whether by contract or otherwise, or (b)
--
--ownership of more than fifty percent (50%) of the outstanding shares or
--
--beneficial ownership of such entity.</ul>
--
--<a name="2"></a>
--<b>2. Source Code License.</b>
--
--<a name="2.1"></a>
--<ul><b>2.1. The Initial Developer Grant.</b>
--
--<br>The Initial Developer hereby grants You a world-wide, royalty-free,
--
--non-exclusive license, subject to third party intellectual property claims:
--
--<ul><b>(a)</b>&nbsp;<b> </b>under intellectual property rights (other than
--
--patent or trademark) Licensable by Initial Developer to use, reproduce,
--
--modify, display, perform, sublicense and distribute the Original Code (or
--
--portions thereof) with or without Modifications, and/or as part of a Larger
--
--Work; and
--
--<p><b>(b)</b> under Patents Claims infringed by the making, using or selling
--
--of Original Code, to make, have made, use, practice, sell, and offer for
--
--sale, and/or otherwise dispose of the Original Code (or portions thereof).
--
--<ul>
--
--<ul>&nbsp;</ul>
--
--</ul>
--
--<b>(c) </b>the licenses granted in this Section 2.1(a) and (b) are effective
--
--on the date Initial Developer first distributes Original Code under the
--
--terms of this License.
--
--<p><b>(d) </b>Notwithstanding Section 2.1(b) above, no patent license is
--
--granted: 1) for code that You delete from the Original Code; 2) separate
--
--from the Original Code;&nbsp; or 3) for infringements caused by: i) the
--
--modification of the Original Code or ii) the combination of the Original
--
--Code with other software or devices.
--
--<br>&nbsp;</ul>
--
--<a name="2.2"></a>
--<b>2.2. Contributor Grant.</b>
--
--<br>Subject to third party intellectual property claims, each Contributor
--
--hereby grants You a world-wide, royalty-free, non-exclusive license
--
--<ul>&nbsp;
--
--<br><b>(a)</b>&nbsp;<b> </b>under intellectual property rights (other than
--
--patent or trademark) Licensable by Contributor, to use, reproduce, modify,
--
--display, perform, sublicense and distribute the Modifications created by
--
--such Contributor (or portions thereof) either on an unmodified basis, with
--
--other Modifications, as Covered Code and/or as part of a Larger Work; and
--
--<p><b>(b)</b> under Patent Claims infringed by the making, using, or selling
--
--of&nbsp; Modifications made by that Contributor either alone and/or in<font color="#000000">
--
--combination with its Contributor Version (or portions of such combination),
--
--to make, use, sell, offer for sale, have made, and/or otherwise dispose
--
--of: 1) Modifications made by that Contributor (or portions thereof); and
--
--2) the combination of&nbsp; Modifications made by that Contributor with
--
--its Contributor Version (or portions of such combination).</font>
--
--<p><b>(c) </b>the licenses granted in Sections 2.2(a) and 2.2(b) are effective
--
--on the date Contributor first makes Commercial Use of the Covered Code.
--
--<p><b>(d)&nbsp;</b>&nbsp;&nbsp; Notwithstanding Section 2.2(b) above, no
--
--patent license is granted: 1) for any code that Contributor has deleted
--
--from the Contributor Version; 2)&nbsp; separate from the Contributor Version;&nbsp;
--
--3)&nbsp; for infringements caused by: i) third party modifications of Contributor
--
--Version or ii)&nbsp; the combination of Modifications made by that Contributor
--
--with other software&nbsp; (except as part of the Contributor Version) or
--
--other devices; or 4) under Patent Claims infringed by Covered Code in the
--
--absence of Modifications made by that Contributor.</ul>
--
--</ul>
--
--
--
--<a name="3"></a>
--<p><br><b>3. Distribution Obligations.</b>
--
--<a name="3.1"></a>
--<ul><b>3.1. Application of License.</b>
--
--<br>The Modifications which You create or to which You contribute are governed
--
--by the terms of this License, including without limitation Section <b>2.2</b>.
--
--The Source Code version of Covered Code may be distributed only under the
--
--terms of this License or a future version of this License released under
--
--Section <b>6.1</b>, and You must include a copy of this License with every
--
--copy of the Source Code You distribute. You may not offer or impose any
--
--terms on any Source Code version that alters or restricts the applicable
--
--version of this License or the recipients' rights hereunder. However, You
--
--may include an additional document offering the additional rights described
--
--in Section <b>3.5</b>.
--
--<a name="3.2"></a>
--<p><b>3.2. Availability of Source Code.</b>
--
--<br>Any Modification which You create or to which You contribute must be
--
--made available in Source Code form under the terms of this License either
--
--on the same media as an Executable version or via an accepted Electronic
--
--Distribution Mechanism to anyone to whom you made an Executable version
--
--available; and if made available via Electronic Distribution Mechanism,
--
--must remain available for at least twelve (12) months after the date it
--
--initially became available, or at least six (6) months after a subsequent
--
--version of that particular Modification has been made available to such
--
--recipients. You are responsible for ensuring that the Source Code version
--
--remains available even if the Electronic Distribution Mechanism is maintained
--
--by a third party.
--
--<a name="3.3"></a>
--<p><b>3.3. Description of Modifications.</b>
--
--<br>You must cause all Covered Code to which You contribute to contain
--
--a file documenting the changes You made to create that Covered Code and
--
--the date of any change. You must include a prominent statement that the
--
--Modification is derived, directly or indirectly, from Original Code provided
--
--by the Initial Developer and including the name of the Initial Developer
--
--in (a) the Source Code, and (b) in any notice in an Executable version
--
--or related documentation in which You describe the origin or ownership
--
--of the Covered Code.
--
--<a name="3.4"></a>
--<p><b>3.4. Intellectual Property Matters</b>
--
--<ul><b>(a) Third Party Claims</b>.
--
--<br>If Contributor has knowledge that a license under a third party's intellectual
--
--property rights is required to exercise the rights granted by such Contributor
--
--under Sections 2.1 or 2.2, Contributor must include a text file with the
--
--Source Code distribution titled "LEGAL'' which describes the claim and
--
--the party making the claim in sufficient detail that a recipient will know
--
--whom to contact. If Contributor obtains such knowledge after the Modification
--
--is made available as described in Section 3.2, Contributor shall promptly
--
--modify the LEGAL file in all copies Contributor makes available thereafter
--
--and shall take other steps (such as notifying appropriate mailing lists
--
--or newsgroups) reasonably calculated to inform those who received the Covered
--
--Code that new knowledge has been obtained.
--
--<p><b>(b) Contributor APIs</b>.
--
--<br>If Contributor's Modifications include an application programming interface
--
--and Contributor has knowledge of patent licenses which are reasonably necessary
--
--to implement that API, Contributor must also include this information in
--
--the LEGAL file.
--
--<br>&nbsp;</ul>
--
--&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <b>(c)&nbsp;&nbsp;&nbsp;
--
--Representations.</b>
--
--<ul>Contributor represents that, except as disclosed pursuant to Section
--
--3.4(a) above, Contributor believes that Contributor's Modifications are
--
--Contributor's original creation(s) and/or Contributor has sufficient rights
--
--to grant the rights conveyed by this License.</ul>
--
--
--
--<a name="3.5"></a>
--<p><br><b>3.5. Required Notices.</b>
--
--<br>You must duplicate the notice in <b>Exhibit A</b> in each file of the
--
--Source Code.&nbsp; If it is not possible to put such notice in a particular
--
--Source Code file due to its structure, then You must include such notice
--
--in a location (such as a relevant directory) where a user would be likely
--
--to look for such a notice.&nbsp; If You created one or more Modification(s)
--
--You may add your name as a Contributor to the notice described in <b>Exhibit
--
--A</b>.&nbsp; You must also duplicate this License in any documentation
--
--for the Source Code where You describe recipients' rights or ownership
--
--rights relating to Covered Code.&nbsp; You may choose to offer, and to
--
--charge a fee for, warranty, support, indemnity or liability obligations
--
--to one or more recipients of Covered Code. However, You may do so only
--
--on Your own behalf, and not on behalf of the Initial Developer or any Contributor.
--
--You must make it absolutely clear than any such warranty, support, indemnity
--
--or liability obligation is offered by You alone, and You hereby agree to
--
--indemnify the Initial Developer and every Contributor for any liability
--
--incurred by the Initial Developer or such Contributor as a result of warranty,
--
--support, indemnity or liability terms You offer.
--
--<a name="3.6"></a>
--<p><b>3.6. Distribution of Executable Versions.</b>
--
--<br>You may distribute Covered Code in Executable form only if the requirements
--
--of Section <b>3.1-3.5</b> have been met for that Covered Code, and if You
--
--include a notice stating that the Source Code version of the Covered Code
--
--is available under the terms of this License, including a description of
--
--how and where You have fulfilled the obligations of Section <b>3.2</b>.
--
--The notice must be conspicuously included in any notice in an Executable
--
--version, related documentation or collateral in which You describe recipients'
--
--rights relating to the Covered Code. You may distribute the Executable
--
--version of Covered Code or ownership rights under a license of Your choice,
--
--which may contain terms different from this License, provided that You
--
--are in compliance with the terms of this License and that the license for
--
--the Executable version does not attempt to limit or alter the recipient's
--
--rights in the Source Code version from the rights set forth in this License.
--
--If You distribute the Executable version under a different license You
--
--must make it absolutely clear that any terms which differ from this License
--
--are offered by You alone, not by the Initial Developer or any Contributor.
--
--You hereby agree to indemnify the Initial Developer and every Contributor
--
--for any liability incurred by the Initial Developer or such Contributor
--
--as a result of any such terms You offer.
--
--<a name="3.7"></a>
--<p><b>3.7. Larger Works.</b>
--
--<br>You may create a Larger Work by combining Covered Code with other code
--
--not governed by the terms of this License and distribute the Larger Work
--
--as a single product. In such a case, You must make sure the requirements
--
--of this License are fulfilled for the Covered Code.</ul>
--
--<a name="4"></a>
--<b>4. Inability to Comply Due to Statute or Regulation.</b>
--
--<ul>If it is impossible for You to comply with any of the terms of this
--
--License with respect to some or all of the Covered Code due to statute,
--
--judicial order, or regulation then You must: (a) comply with the terms
--
--of this License to the maximum extent possible; and (b) describe the limitations
--
--and the code they affect. Such description must be included in the LEGAL
--
--file described in Section <b>3.4</b> and must be included with all distributions
--
--of the Source Code. Except to the extent prohibited by statute or regulation,
--
--such description must be sufficiently detailed for a recipient of ordinary
--
--skill to be able to understand it.</ul>
--
--<a name="5"></a>
--<b>5. Application of this License.</b>
--
--<ul>This License applies to code to which the Initial Developer has attached
--
--the notice in <b>Exhibit A</b> and to related Covered Code.</ul>
--
--<a name="6"></a>
--<b>6. Versions of the License.</b>
--
--<a name="6.1"></a>
--<ul><b>6.1. New Versions</b>.
--
--<br>Netscape Communications Corporation (''Netscape'') may publish revised
--
--and/or new versions of the License from time to time. Each version will
--
--be given a distinguishing version number.
--
--<a name="6.2"></a>
--<p><b>6.2. Effect of New Versions</b>.
--
--<br>Once Covered Code has been published under a particular version of
--
--the License, You may always continue to use it under the terms of that
--
--version. You may also choose to use such Covered Code under the terms of
--
--any subsequent version of the License published by Netscape. No one other
--
--than Netscape has the right to modify the terms applicable to Covered Code
--
--created under this License.
--
--<a name="6.3"></a>
--<p><b>6.3. Derivative Works</b>.
--
--<br>If You create or use a modified version of this License (which you
--
--may only do in order to apply it to code which is not already Covered Code
--
--governed by this License), You must (a) rename Your license so that the
--
--phrases ''Mozilla'', ''MOZILLAPL'', ''MOZPL'', ''Netscape'', "MPL", ''NPL''
--
--or any confusingly similar phrase do not appear in your license (except
--
--to note that your license differs from this License) and (b) otherwise
--
--make it clear that Your version of the license contains terms which differ
--
--from the Mozilla Public License and Netscape Public License. (Filling in
--
--the name of the Initial Developer, Original Code or Contributor in the
--
--notice described in <b>Exhibit A</b> shall not of themselves be deemed
--
--to be modifications of this License.)</ul>
--
--<a name="7"></a>
--<b>7. DISCLAIMER OF WARRANTY.</b>
--
--<ul>COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT
--
--WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION,
--
--WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT
--
--FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY
--
--AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE
--
--PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER
--
--CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION.
--
--THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE.
--
--NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.</ul>
--
--<a name="8"></a>
--<b>8. TERMINATION.</b>
--
--<a name="8.1"></a>
--<ul><b>8.1.&nbsp; </b>This License and the rights granted hereunder will
--
--terminate automatically if You fail to comply with terms herein and fail
--
--to cure such breach within 30 days of becoming aware of the breach. All
--
--sublicenses to the Covered Code which are properly granted shall survive
--
--any termination of this License. Provisions which, by their nature, must
--
--remain in effect beyond the termination of this License shall survive.
--
--<a name="8.2"></a>
--<p><b>8.2.&nbsp; </b>If You initiate litigation by asserting a patent infringement
--
--claim (excluding declatory judgment actions) against Initial Developer
--
--or a Contributor (the Initial Developer or Contributor against whom You
--
--file such action is referred to as "Participant")&nbsp; alleging that:
--
--<p><b>(a)&nbsp; </b>such Participant's Contributor Version directly or
--
--indirectly infringes any patent, then any and all rights granted by such
--
--Participant to You under Sections 2.1 and/or 2.2 of this License shall,
--
--upon 60 days notice from Participant terminate prospectively, unless if
--
--within 60 days after receipt of notice You either: (i)&nbsp; agree in writing
--
--to pay Participant a mutually agreeable reasonable royalty for Your past
--
--and future use of Modifications made by such Participant, or (ii) withdraw
--
--Your litigation claim with respect to the Contributor Version against such
--
--Participant.&nbsp; If within 60 days of notice, a reasonable royalty and
--
--payment arrangement are not mutually agreed upon in writing by the parties
--
--or the litigation claim is not withdrawn, the rights granted by Participant
--
--to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration
--
--of the 60 day notice period specified above.
--
--<p><b>(b)</b>&nbsp; any software, hardware, or device, other than such
--
--Participant's Contributor Version, directly or indirectly infringes any
--
--patent, then any rights granted to You by such Participant under Sections
--
--2.1(b) and 2.2(b) are revoked effective as of the date You first made,
--
--used, sold, distributed, or had made, Modifications made by that Participant.
--
--<a name="8.3"></a>
--<p><b>8.3.&nbsp; </b>If You assert a patent infringement claim against
--
--Participant alleging that such Participant's Contributor Version directly
--
--or indirectly infringes any patent where such claim is resolved (such as
--
--by license or settlement) prior to the initiation of patent infringement
--
--litigation, then the reasonable value of the licenses granted by such Participant
--
--under Sections 2.1 or 2.2 shall be taken into account in determining the
--
--amount or value of any payment or license.
--
--<a name="8.4"></a>
--<p><b>8.4.</b>&nbsp; In the event of termination under Sections 8.1 or
--
--8.2 above,&nbsp; all end user license agreements (excluding distributors
--
--and resellers) which have been validly granted by You or any distributor
--
--hereunder prior to termination shall survive termination.</ul>
--
--<a name="9"></a>
--<b>9. LIMITATION OF LIABILITY.</b>
--
--<ul>UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
--
--NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER,
--
--ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER
--
--OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL,
--
--INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
--
--LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE
--
--OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN
--
--IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES.
--
--THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR
--
--PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE
--
--LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
--
--OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION
--
--AND LIMITATION MAY NOT APPLY TO YOU.</ul>
--
--<a name="10"></a>
--<b>10. U.S. GOVERNMENT END USERS.</b>
--
--<ul>The Covered Code is a ''commercial item,'' as that term is defined
--
--in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer software''
--
--and ''commercial computer software documentation,'' as such terms are used
--
--in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and
--
--48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government
--
--End Users acquire Covered Code with only those rights set forth herein.</ul>
--
--<a name="11"></a>
--<b>11. MISCELLANEOUS.</b>
--
--<ul>This License represents the complete agreement concerning subject matter
--
--hereof. If any provision of this License is held to be unenforceable, such
--
--provision shall be reformed only to the extent necessary to make it enforceable.
--
--This License shall be governed by California law provisions (except to
--
--the extent applicable law, if any, provides otherwise), excluding its conflict-of-law
--
--provisions. With respect to disputes in which at least one party is a citizen
--
--of, or an entity chartered or registered to do business in the United States
--
--of America, any litigation relating to this License shall be subject to
--
--the jurisdiction of the Federal Courts of the Northern District of California,
--
--with venue lying in Santa Clara County, California, with the losing party
--
--responsible for costs, including without limitation, court costs and reasonable
--
--attorneys' fees and expenses. The application of the United Nations Convention
--
--on Contracts for the International Sale of Goods is expressly excluded.
--
--Any law or regulation which provides that the language of a contract shall
--
--be construed against the drafter shall not apply to this License.</ul>
--
--<a name="12"></a>
--<b>12. RESPONSIBILITY FOR CLAIMS.</b>
--
--<ul>As between Initial Developer and the Contributors, each party is responsible
--
--for claims and damages arising, directly or indirectly, out of its utilization
--
--of rights under this License and You agree to work with Initial Developer
--
--and Contributors to distribute such responsibility on an equitable basis.
--
--Nothing herein is intended or shall be deemed to constitute any admission
--
--of liability.</ul>
--
--<a name="13"></a>
--<b>13. MULTIPLE-LICENSED CODE.</b>
--
--<ul>Initial Developer may designate portions of the Covered Code as “Multiple-Licensed”.&nbsp;
--
--“Multiple-Licensed” means that the Initial Developer permits you to utilize
--
--portions of the Covered Code under Your choice of the MPL or the alternative
--
--licenses, if any, specified by the Initial Developer in the file described
--
--in Exhibit A.</ul>
--
--
--
--<a name="EXHIBIT-A"></a>
--<p><br><b>EXHIBIT A -Mozilla Public License.</b>
--
--<ul>``The contents of this file are subject to the Mozilla Public License
--
--Version 1.1 (the "License"); you may not use this file except in compliance
--
--with the License. You may obtain a copy of the License at
--
--<br>http://www.mozilla.org/MPL/
--
--<p>Software distributed under the License is distributed on an "AS IS"
--
--basis, WITHOUT WARRANTY OF
--
--<br>ANY KIND, either express or implied. See the License for the specific
--
--language governing rights and
--
--<br>limitations under the License.
--
--<p>The Original Code is ______________________________________.
--
--<p>The Initial Developer of the Original Code is ________________________.
--
--Portions created by
--
--<br>&nbsp;______________________ are Copyright (C) ______ _______________________.
--
--All Rights
--
--<br>Reserved.
--
--<p>Contributor(s): ______________________________________.
--
--<p>Alternatively, the contents of this file may be used under the terms
--
--of the _____ license (the&nbsp; “[___] License”), in which case the provisions
--
--of [______] License are applicable&nbsp; instead of those above.&nbsp;
--
--If you wish to allow use of your version of this file only under the terms
--
--of the [____] License and not to allow others to use your version of this
--
--file under the MPL, indicate your decision by deleting&nbsp; the provisions
--
--above and replace&nbsp; them with the notice and other provisions required
--
--by the [___] License.&nbsp; If you do not delete the provisions above,
--
--a recipient may use your version of this file under either the MPL or the
--
--[___] License."
--
--<p>[NOTE: The text of this Exhibit A may differ slightly from the text
--
--of the notices in the Source Code files of the Original Code. You should
--
--use the text of this Exhibit A rather than the text found in the Original
--
--Code Source Code for Your Modifications.]
--
--<p>
--
--</body>
--
--</html>
--
-diff --git a/Makefile.am b/Makefile.am
-index bb89e98..34a01d3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -7,4 +7,4 @@ pkgconfig_DATA= libgdiplus.pc
-
- DISTCLEANFILES= libgdiplus.pc
-
--EXTRA_DIST = libgdiplus.pc.in LICENSE MPL-1.1.html
-+EXTRA_DIST = libgdiplus.pc.in LICENSE
---
-2.19.2
-
diff --git a/package/libgdiplus/0002-Update-LICENSE-to-match-the-headers-of-the-source-fi.patch b/package/libgdiplus/0002-Update-LICENSE-to-match-the-headers-of-the-source-fi.patch
deleted file mode 100644
index 3ddfe7c37c..0000000000
--- a/package/libgdiplus/0002-Update-LICENSE-to-match-the-headers-of-the-source-fi.patch
+++ /dev/null
@@ -1,1018 +0,0 @@
-From 7ac3970c792ffbbf53e4168e086fae33fab39ce3 Mon Sep 17 00:00:00 2001
-From: Frederik Carlier <frederik.carlier@quamotion.mobi>
-Date: Tue, 17 Jul 2018 23:24:51 +0200
-Subject: [PATCH] Update LICENSE to match the headers of the source files
-
-Upstream: 947e525d1025200623f686d8efe4c0094c5d2380
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
----
- LICENSE | 998 +-------------------------------------------------------
- 1 file changed, 14 insertions(+), 984 deletions(-)
-
-diff --git a/LICENSE b/LICENSE
-index b3164bb..2342cc9 100644
---- a/LICENSE
-+++ b/LICENSE
-@@ -1,984 +1,14 @@
--Libgdiplus is licensed under the terms of the GNU Library GPL or the
--Mozilla Public License 1.1.
--
--
--The Licenses
--============
--
--### GNU Library GPL
--
-- GNU LESSER GENERAL PUBLIC LICENSE
-- Version 2.1, February 1999
--
-- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-- Everyone is permitted to copy and distribute verbatim copies
-- of this license document, but changing it is not allowed.
--
--[This is the first released version of the Lesser GPL. It also counts
-- as the successor of the GNU Library Public License, version 2, hence
-- the version number 2.1.]
--
-- Preamble
--
-- The licenses for most software are designed to take away your
--freedom to share and change it. By contrast, the GNU General Public
--Licenses are intended to guarantee your freedom to share and change
--free software--to make sure the software is free for all its users.
--
-- This license, the Lesser General Public License, applies to some
--specially designated software packages--typically libraries--of the
--Free Software Foundation and other authors who decide to use it. You
--can use it too, but we suggest you first think carefully about whether
--this license or the ordinary General Public License is the better
--strategy to use in any particular case, based on the explanations below.
--
-- When we speak of free software, we are referring to freedom of use,
--not price. Our General Public Licenses are designed to make sure that
--you have the freedom to distribute copies of free software (and charge
--for this service if you wish); that you receive source code or can get
--it if you want it; that you can change the software and use pieces of
--it in new free programs; and that you are informed that you can do
--these things.
--
-- To protect your rights, we need to make restrictions that forbid
--distributors to deny you these rights or to ask you to surrender these
--rights. These restrictions translate to certain responsibilities for
--you if you distribute copies of the library or if you modify it.
--
-- For example, if you distribute copies of the library, whether gratis
--or for a fee, you must give the recipients all the rights that we gave
--you. You must make sure that they, too, receive or can get the source
--code. If you link other code with the library, you must provide
--complete object files to the recipients, so that they can relink them
--with the library after making changes to the library and recompiling
--it. And you must show them these terms so they know their rights.
--
-- We protect your rights with a two-step method: (1) we copyright the
--library, and (2) we offer you this license, which gives you legal
--permission to copy, distribute and/or modify the library.
--
-- To protect each distributor, we want to make it very clear that
--there is no warranty for the free library. Also, if the library is
--modified by someone else and passed on, the recipients should know
--that what they have is not the original version, so that the original
--author's reputation will not be affected by problems that might be
--introduced by others.
--
-- Finally, software patents pose a constant threat to the existence of
--any free program. We wish to make sure that a company cannot
--effectively restrict the users of a free program by obtaining a
--restrictive license from a patent holder. Therefore, we insist that
--any patent license obtained for a version of the library must be
--consistent with the full freedom of use specified in this license.
--
-- Most GNU software, including some libraries, is covered by the
--ordinary GNU General Public License. This license, the GNU Lesser
--General Public License, applies to certain designated libraries, and
--is quite different from the ordinary General Public License. We use
--this license for certain libraries in order to permit linking those
--libraries into non-free programs.
--
-- When a program is linked with a library, whether statically or using
--a shared library, the combination of the two is legally speaking a
--combined work, a derivative of the original library. The ordinary
--General Public License therefore permits such linking only if the
--entire combination fits its criteria of freedom. The Lesser General
--Public License permits more lax criteria for linking other code with
--the library.
--
-- We call this license the "Lesser" General Public License because it
--does Less to protect the user's freedom than the ordinary General
--Public License. It also provides other free software developers Less
--of an advantage over competing non-free programs. These disadvantages
--are the reason we use the ordinary General Public License for many
--libraries. However, the Lesser license provides advantages in certain
--special circumstances.
--
-- For example, on rare occasions, there may be a special need to
--encourage the widest possible use of a certain library, so that it becomes
--a de-facto standard. To achieve this, non-free programs must be
--allowed to use the library. A more frequent case is that a free
--library does the same job as widely used non-free libraries. In this
--case, there is little to gain by limiting the free library to free
--software only, so we use the Lesser General Public License.
--
-- In other cases, permission to use a particular library in non-free
--programs enables a greater number of people to use a large body of
--free software. For example, permission to use the GNU C Library in
--non-free programs enables many more people to use the whole GNU
--operating system, as well as its variant, the GNU/Linux operating
--system.
--
-- Although the Lesser General Public License is Less protective of the
--users' freedom, it does ensure that the user of a program that is
--linked with the Library has the freedom and the wherewithal to run
--that program using a modified version of the Library.
--
-- The precise terms and conditions for copying, distribution and
--modification follow. Pay close attention to the difference between a
--"work based on the library" and a "work that uses the library". The
--former contains code derived from the library, whereas the latter must
--be combined with the library in order to run.
--
-- GNU LESSER GENERAL PUBLIC LICENSE
-- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
--
-- 0. This License Agreement applies to any software library or other
--program which contains a notice placed by the copyright holder or
--other authorized party saying it may be distributed under the terms of
--this Lesser General Public License (also called "this License").
--Each licensee is addressed as "you".
--
-- A "library" means a collection of software functions and/or data
--prepared so as to be conveniently linked with application programs
--(which use some of those functions and data) to form executables.
--
-- The "Library", below, refers to any such software library or work
--which has been distributed under these terms. A "work based on the
--Library" means either the Library or any derivative work under
--copyright law: that is to say, a work containing the Library or a
--portion of it, either verbatim or with modifications and/or translated
--straightforwardly into another language. (Hereinafter, translation is
--included without limitation in the term "modification".)
--
-- "Source code" for a work means the preferred form of the work for
--making modifications to it. For a library, complete source code means
--all the source code for all modules it contains, plus any associated
--interface definition files, plus the scripts used to control compilation
--and installation of the library.
--
-- Activities other than copying, distribution and modification are not
--covered by this License; they are outside its scope. The act of
--running a program using the Library is not restricted, and output from
--such a program is covered only if its contents constitute a work based
--on the Library (independent of the use of the Library in a tool for
--writing it). Whether that is true depends on what the Library does
--and what the program that uses the Library does.
--
-- 1. You may copy and distribute verbatim copies of the Library's
--complete source code as you receive it, in any medium, provided that
--you conspicuously and appropriately publish on each copy an
--appropriate copyright notice and disclaimer of warranty; keep intact
--all the notices that refer to this License and to the absence of any
--warranty; and distribute a copy of this License along with the
--Library.
--
-- You may charge a fee for the physical act of transferring a copy,
--and you may at your option offer warranty protection in exchange for a
--fee.
--
-- 2. You may modify your copy or copies of the Library or any portion
--of it, thus forming a work based on the Library, and copy and
--distribute such modifications or work under the terms of Section 1
--above, provided that you also meet all of these conditions:
--
-- a) The modified work must itself be a software library.
--
-- b) You must cause the files modified to carry prominent notices
-- stating that you changed the files and the date of any change.
--
-- c) You must cause the whole of the work to be licensed at no
-- charge to all third parties under the terms of this License.
--
-- d) If a facility in the modified Library refers to a function or a
-- table of data to be supplied by an application program that uses
-- the facility, other than as an argument passed when the facility
-- is invoked, then you must make a good faith effort to ensure that,
-- in the event an application does not supply such function or
-- table, the facility still operates, and performs whatever part of
-- its purpose remains meaningful.
--
-- (For example, a function in a library to compute square roots has
-- a purpose that is entirely well-defined independent of the
-- application. Therefore, Subsection 2d requires that any
-- application-supplied function or table used by this function must
-- be optional: if the application does not supply it, the square
-- root function must still compute square roots.)
--
--These requirements apply to the modified work as a whole. If
--identifiable sections of that work are not derived from the Library,
--and can be reasonably considered independent and separate works in
--themselves, then this License, and its terms, do not apply to those
--sections when you distribute them as separate works. But when you
--distribute the same sections as part of a whole which is a work based
--on the Library, the distribution of the whole must be on the terms of
--this License, whose permissions for other licensees extend to the
--entire whole, and thus to each and every part regardless of who wrote
--it.
--
--Thus, it is not the intent of this section to claim rights or contest
--your rights to work written entirely by you; rather, the intent is to
--exercise the right to control the distribution of derivative or
--collective works based on the Library.
--
--In addition, mere aggregation of another work not based on the Library
--with the Library (or with a work based on the Library) on a volume of
--a storage or distribution medium does not bring the other work under
--the scope of this License.
--
-- 3. You may opt to apply the terms of the ordinary GNU General Public
--License instead of this License to a given copy of the Library. To do
--this, you must alter all the notices that refer to this License, so
--that they refer to the ordinary GNU General Public License, version 2,
--instead of to this License. (If a newer version than version 2 of the
--ordinary GNU General Public License has appeared, then you can specify
--that version instead if you wish.) Do not make any other change in
--these notices.
--
-- Once this change is made in a given copy, it is irreversible for
--that copy, so the ordinary GNU General Public License applies to all
--subsequent copies and derivative works made from that copy.
--
-- This option is useful when you wish to copy part of the code of
--the Library into a program that is not a library.
--
-- 4. You may copy and distribute the Library (or a portion or
--derivative of it, under Section 2) in object code or executable form
--under the terms of Sections 1 and 2 above provided that you accompany
--it with the complete corresponding machine-readable source code, which
--must be distributed under the terms of Sections 1 and 2 above on a
--medium customarily used for software interchange.
--
-- If distribution of object code is made by offering access to copy
--from a designated place, then offering equivalent access to copy the
--source code from the same place satisfies the requirement to
--distribute the source code, even though third parties are not
--compelled to copy the source along with the object code.
--
-- 5. A program that contains no derivative of any portion of the
--Library, but is designed to work with the Library by being compiled or
--linked with it, is called a "work that uses the Library". Such a
--work, in isolation, is not a derivative work of the Library, and
--therefore falls outside the scope of this License.
--
-- However, linking a "work that uses the Library" with the Library
--creates an executable that is a derivative of the Library (because it
--contains portions of the Library), rather than a "work that uses the
--library". The executable is therefore covered by this License.
--Section 6 states terms for distribution of such executables.
--
-- When a "work that uses the Library" uses material from a header file
--that is part of the Library, the object code for the work may be a
--derivative work of the Library even though the source code is not.
--Whether this is true is especially significant if the work can be
--linked without the Library, or if the work is itself a library. The
--threshold for this to be true is not precisely defined by law.
--
-- If such an object file uses only numerical parameters, data
--structure layouts and accessors, and small macros and small inline
--functions (ten lines or less in length), then the use of the object
--file is unrestricted, regardless of whether it is legally a derivative
--work. (Executables containing this object code plus portions of the
--Library will still fall under Section 6.)
--
-- Otherwise, if the work is a derivative of the Library, you may
--distribute the object code for the work under the terms of Section 6.
--Any executables containing that work also fall under Section 6,
--whether or not they are linked directly with the Library itself.
--
-- 6. As an exception to the Sections above, you may also combine or
--link a "work that uses the Library" with the Library to produce a
--work containing portions of the Library, and distribute that work
--under terms of your choice, provided that the terms permit
--modification of the work for the customer's own use and reverse
--engineering for debugging such modifications.
--
-- You must give prominent notice with each copy of the work that the
--Library is used in it and that the Library and its use are covered by
--this License. You must supply a copy of this License. If the work
--during execution displays copyright notices, you must include the
--copyright notice for the Library among them, as well as a reference
--directing the user to the copy of this License. Also, you must do one
--of these things:
--
-- a) Accompany the work with the complete corresponding
-- machine-readable source code for the Library including whatever
-- changes were used in the work (which must be distributed under
-- Sections 1 and 2 above); and, if the work is an executable linked
-- with the Library, with the complete machine-readable "work that
-- uses the Library", as object code and/or source code, so that the
-- user can modify the Library and then relink to produce a modified
-- executable containing the modified Library. (It is understood
-- that the user who changes the contents of definitions files in the
-- Library will not necessarily be able to recompile the application
-- to use the modified definitions.)
--
-- b) Use a suitable shared library mechanism for linking with the
-- Library. A suitable mechanism is one that (1) uses at run time a
-- copy of the library already present on the user's computer system,
-- rather than copying library functions into the executable, and (2)
-- will operate properly with a modified version of the library, if
-- the user installs one, as long as the modified version is
-- interface-compatible with the version that the work was made with.
--
-- c) Accompany the work with a written offer, valid for at
-- least three years, to give the same user the materials
-- specified in Subsection 6a, above, for a charge no more
-- than the cost of performing this distribution.
--
-- d) If distribution of the work is made by offering access to copy
-- from a designated place, offer equivalent access to copy the above
-- specified materials from the same place.
--
-- e) Verify that the user has already received a copy of these
-- materials or that you have already sent this user a copy.
--
-- For an executable, the required form of the "work that uses the
--Library" must include any data and utility programs needed for
--reproducing the executable from it. However, as a special exception,
--the materials to be distributed need not include anything that is
--normally distributed (in either source or binary form) with the major
--components (compiler, kernel, and so on) of the operating system on
--which the executable runs, unless that component itself accompanies
--the executable.
--
-- It may happen that this requirement contradicts the license
--restrictions of other proprietary libraries that do not normally
--accompany the operating system. Such a contradiction means you cannot
--use both them and the Library together in an executable that you
--distribute.
--
-- 7. You may place library facilities that are a work based on the
--Library side-by-side in a single library together with other library
--facilities not covered by this License, and distribute such a combined
--library, provided that the separate distribution of the work based on
--the Library and of the other library facilities is otherwise
--permitted, and provided that you do these two things:
--
-- a) Accompany the combined library with a copy of the same work
-- based on the Library, uncombined with any other library
-- facilities. This must be distributed under the terms of the
-- Sections above.
--
-- b) Give prominent notice with the combined library of the fact
-- that part of it is a work based on the Library, and explaining
-- where to find the accompanying uncombined form of the same work.
--
-- 8. You may not copy, modify, sublicense, link with, or distribute
--the Library except as expressly provided under this License. Any
--attempt otherwise to copy, modify, sublicense, link with, or
--distribute the Library is void, and will automatically terminate your
--rights under this License. However, parties who have received copies,
--or rights, from you under this License will not have their licenses
--terminated so long as such parties remain in full compliance.
--
-- 9. You are not required to accept this License, since you have not
--signed it. However, nothing else grants you permission to modify or
--distribute the Library or its derivative works. These actions are
--prohibited by law if you do not accept this License. Therefore, by
--modifying or distributing the Library (or any work based on the
--Library), you indicate your acceptance of this License to do so, and
--all its terms and conditions for copying, distributing or modifying
--the Library or works based on it.
--
-- 10. Each time you redistribute the Library (or any work based on the
--Library), the recipient automatically receives a license from the
--original licensor to copy, distribute, link with or modify the Library
--subject to these terms and conditions. You may not impose any further
--restrictions on the recipients' exercise of the rights granted herein.
--You are not responsible for enforcing compliance by third parties with
--this License.
--
-- 11. If, as a consequence of a court judgment or allegation of patent
--infringement or for any other reason (not limited to patent issues),
--conditions are imposed on you (whether by court order, agreement or
--otherwise) that contradict the conditions of this License, they do not
--excuse you from the conditions of this License. If you cannot
--distribute so as to satisfy simultaneously your obligations under this
--License and any other pertinent obligations, then as a consequence you
--may not distribute the Library at all. For example, if a patent
--license would not permit royalty-free redistribution of the Library by
--all those who receive copies directly or indirectly through you, then
--the only way you could satisfy both it and this License would be to
--refrain entirely from distribution of the Library.
--
--If any portion of this section is held invalid or unenforceable under any
--particular circumstance, the balance of the section is intended to apply,
--and the section as a whole is intended to apply in other circumstances.
--
--It is not the purpose of this section to induce you to infringe any
--patents or other property right claims or to contest validity of any
--such claims; this section has the sole purpose of protecting the
--integrity of the free software distribution system which is
--implemented by public license practices. Many people have made
--generous contributions to the wide range of software distributed
--through that system in reliance on consistent application of that
--system; it is up to the author/donor to decide if he or she is willing
--to distribute software through any other system and a licensee cannot
--impose that choice.
--
--This section is intended to make thoroughly clear what is believed to
--be a consequence of the rest of this License.
--
-- 12. If the distribution and/or use of the Library is restricted in
--certain countries either by patents or by copyrighted interfaces, the
--original copyright holder who places the Library under this License may add
--an explicit geographical distribution limitation excluding those countries,
--so that distribution is permitted only in or among countries not thus
--excluded. In such case, this License incorporates the limitation as if
--written in the body of this License.
--
-- 13. The Free Software Foundation may publish revised and/or new
--versions of the Lesser General Public License from time to time.
--Such new versions will be similar in spirit to the present version,
--but may differ in detail to address new problems or concerns.
--
--Each version is given a distinguishing version number. If the Library
--specifies a version number of this License which applies to it and
--"any later version", you have the option of following the terms and
--conditions either of that version or of any later version published by
--the Free Software Foundation. If the Library does not specify a
--license version number, you may choose any version ever published by
--the Free Software Foundation.
--
-- 14. If you wish to incorporate parts of the Library into other free
--programs whose distribution conditions are incompatible with these,
--write to the author to ask for permission. For software which is
--copyrighted by the Free Software Foundation, write to the Free
--Software Foundation; we sometimes make exceptions for this. Our
--decision will be guided by the two goals of preserving the free status
--of all derivatives of our free software and of promoting the sharing
--and reuse of software generally.
--
-- NO WARRANTY
--
-- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
--WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
--EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
--OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
--KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
--IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
--PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
--LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
--THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
--
-- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
--WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
--AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
--FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
--CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
--LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
--RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
--FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
--SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
--DAMAGES.
--
-- END OF TERMS AND CONDITIONS
--
-- How to Apply These Terms to Your New Libraries
--
-- If you develop a new library, and you want it to be of the greatest
--possible use to the public, we recommend making it free software that
--everyone can redistribute and change. You can do so by permitting
--redistribution under these terms (or, alternatively, under the terms of the
--ordinary General Public License).
--
-- To apply these terms, attach the following notices to the library. It is
--safest to attach them to the start of each source file to most effectively
--convey the exclusion of warranty; and each file should have at least the
--"copyright" line and a pointer to where the full notice is found.
--
-- <one line to give the library's name and a brief idea of what it does.>
-- Copyright (C) <year> <name of author>
--
-- This library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Lesser General Public
-- License as published by the Free Software Foundation; either
-- version 2.1 of the License, or (at your option) any later version.
--
-- This library 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 for more details.
--
-- You should have received a copy of the GNU Lesser General Public
-- License along with this library; if not, write to the Free Software
-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
--
--Also add information on how to contact you by electronic and paper mail.
--
--You should also get your employer (if you work as a programmer) or your
--school, if any, to sign a "copyright disclaimer" for the library, if
--necessary. Here is a sample; alter the names:
--
-- Yoyodyne, Inc., hereby disclaims all copyright interest in the
-- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
--
-- <signature of Ty Coon>, 1 April 1990
-- Ty Coon, President of Vice
--
--That's all there is to it!
--
--
--### Mozilla Public License 1.1
--
-- MOZILLA PUBLIC LICENSE
-- Version 1.1
--
-- ---------------
--
--1. Definitions.
--
-- 1.0.1. "Commercial Use" means distribution or otherwise making the
-- Covered Code available to a third party.
--
-- 1.1. "Contributor" means each entity that creates or contributes to
-- the creation of Modifications.
--
-- 1.2. "Contributor Version" means the combination of the Original
-- Code, prior Modifications used by a Contributor, and the Modifications
-- made by that particular Contributor.
--
-- 1.3. "Covered Code" means the Original Code or Modifications or the
-- combination of the Original Code and Modifications, in each case
-- including portions thereof.
--
-- 1.4. "Electronic Distribution Mechanism" means a mechanism generally
-- accepted in the software development community for the electronic
-- transfer of data.
--
-- 1.5. "Executable" means Covered Code in any form other than Source
-- Code.
--
-- 1.6. "Initial Developer" means the individual or entity identified
-- as the Initial Developer in the Source Code notice required by Exhibit
-- A.
--
-- 1.7. "Larger Work" means a work which combines Covered Code or
-- portions thereof with code not governed by the terms of this License.
--
-- 1.8. "License" means this document.
--
-- 1.8.1. "Licensable" means having the right to grant, to the maximum
-- extent possible, whether at the time of the initial grant or
-- subsequently acquired, any and all of the rights conveyed herein.
--
-- 1.9. "Modifications" means any addition to or deletion from the
-- substance or structure of either the Original Code or any previous
-- Modifications. When Covered Code is released as a series of files, a
-- Modification is:
-- A. Any addition to or deletion from the contents of a file
-- containing Original Code or previous Modifications.
--
-- B. Any new file that contains any part of the Original Code or
-- previous Modifications.
--
-- 1.10. "Original Code" means Source Code of computer software code
-- which is described in the Source Code notice required by Exhibit A as
-- Original Code, and which, at the time of its release under this
-- License is not already Covered Code governed by this License.
--
-- 1.10.1. "Patent Claims" means any patent claim(s), now owned or
-- hereafter acquired, including without limitation, method, process,
-- and apparatus claims, in any patent Licensable by grantor.
--
-- 1.11. "Source Code" means the preferred form of the Covered Code for
-- making modifications to it, including all modules it contains, plus
-- any associated interface definition files, scripts used to control
-- compilation and installation of an Executable, or source code
-- differential comparisons against either the Original Code or another
-- well known, available Covered Code of the Contributor's choice. The
-- Source Code can be in a compressed or archival form, provided the
-- appropriate decompression or de-archiving software is widely available
-- for no charge.
--
-- 1.12. "You" (or "Your") means an individual or a legal entity
-- exercising rights under, and complying with all of the terms of, this
-- License or a future version of this License issued under Section 6.1.
-- For legal entities, "You" includes any entity which controls, is
-- controlled by, or is under common control with You. For purposes of
-- this definition, "control" means (a) the power, direct or indirect,
-- to cause the direction or management of such entity, whether by
-- contract or otherwise, or (b) ownership of more than fifty percent
-- (50%) of the outstanding shares or beneficial ownership of such
-- entity.
--
--2. Source Code License.
--
-- 2.1. The Initial Developer Grant.
-- The Initial Developer hereby grants You a world-wide, royalty-free,
-- non-exclusive license, subject to third party intellectual property
-- claims:
-- (a) under intellectual property rights (other than patent or
-- trademark) Licensable by Initial Developer to use, reproduce,
-- modify, display, perform, sublicense and distribute the Original
-- Code (or portions thereof) with or without Modifications, and/or
-- as part of a Larger Work; and
--
-- (b) under Patents Claims infringed by the making, using or
-- selling of Original Code, to make, have made, use, practice,
-- sell, and offer for sale, and/or otherwise dispose of the
-- Original Code (or portions thereof).
--
-- (c) the licenses granted in this Section 2.1(a) and (b) are
-- effective on the date Initial Developer first distributes
-- Original Code under the terms of this License.
--
-- (d) Notwithstanding Section 2.1(b) above, no patent license is
-- granted: 1) for code that You delete from the Original Code; 2)
-- separate from the Original Code; or 3) for infringements caused
-- by: i) the modification of the Original Code or ii) the
-- combination of the Original Code with other software or devices.
--
-- 2.2. Contributor Grant.
-- Subject to third party intellectual property claims, each Contributor
-- hereby grants You a world-wide, royalty-free, non-exclusive license
--
-- (a) under intellectual property rights (other than patent or
-- trademark) Licensable by Contributor, to use, reproduce, modify,
-- display, perform, sublicense and distribute the Modifications
-- created by such Contributor (or portions thereof) either on an
-- unmodified basis, with other Modifications, as Covered Code
-- and/or as part of a Larger Work; and
--
-- (b) under Patent Claims infringed by the making, using, or
-- selling of Modifications made by that Contributor either alone
-- and/or in combination with its Contributor Version (or portions
-- of such combination), to make, use, sell, offer for sale, have
-- made, and/or otherwise dispose of: 1) Modifications made by that
-- Contributor (or portions thereof); and 2) the combination of
-- Modifications made by that Contributor with its Contributor
-- Version (or portions of such combination).
--
-- (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-- effective on the date Contributor first makes Commercial Use of
-- the Covered Code.
--
-- (d) Notwithstanding Section 2.2(b) above, no patent license is
-- granted: 1) for any code that Contributor has deleted from the
-- Contributor Version; 2) separate from the Contributor Version;
-- 3) for infringements caused by: i) third party modifications of
-- Contributor Version or ii) the combination of Modifications made
-- by that Contributor with other software (except as part of the
-- Contributor Version) or other devices; or 4) under Patent Claims
-- infringed by Covered Code in the absence of Modifications made by
-- that Contributor.
--
--3. Distribution Obligations.
--
-- 3.1. Application of License.
-- The Modifications which You create or to which You contribute are
-- governed by the terms of this License, including without limitation
-- Section 2.2. The Source Code version of Covered Code may be
-- distributed only under the terms of this License or a future version
-- of this License released under Section 6.1, and You must include a
-- copy of this License with every copy of the Source Code You
-- distribute. You may not offer or impose any terms on any Source Code
-- version that alters or restricts the applicable version of this
-- License or the recipients' rights hereunder. However, You may include
-- an additional document offering the additional rights described in
-- Section 3.5.
--
-- 3.2. Availability of Source Code.
-- Any Modification which You create or to which You contribute must be
-- made available in Source Code form under the terms of this License
-- either on the same media as an Executable version or via an accepted
-- Electronic Distribution Mechanism to anyone to whom you made an
-- Executable version available; and if made available via Electronic
-- Distribution Mechanism, must remain available for at least twelve (12)
-- months after the date it initially became available, or at least six
-- (6) months after a subsequent version of that particular Modification
-- has been made available to such recipients. You are responsible for
-- ensuring that the Source Code version remains available even if the
-- Electronic Distribution Mechanism is maintained by a third party.
--
-- 3.3. Description of Modifications.
-- You must cause all Covered Code to which You contribute to contain a
-- file documenting the changes You made to create that Covered Code and
-- the date of any change. You must include a prominent statement that
-- the Modification is derived, directly or indirectly, from Original
-- Code provided by the Initial Developer and including the name of the
-- Initial Developer in (a) the Source Code, and (b) in any notice in an
-- Executable version or related documentation in which You describe the
-- origin or ownership of the Covered Code.
--
-- 3.4. Intellectual Property Matters
-- (a) Third Party Claims.
-- If Contributor has knowledge that a license under a third party's
-- intellectual property rights is required to exercise the rights
-- granted by such Contributor under Sections 2.1 or 2.2,
-- Contributor must include a text file with the Source Code
-- distribution titled "LEGAL" which describes the claim and the
-- party making the claim in sufficient detail that a recipient will
-- know whom to contact. If Contributor obtains such knowledge after
-- the Modification is made available as described in Section 3.2,
-- Contributor shall promptly modify the LEGAL file in all copies
-- Contributor makes available thereafter and shall take other steps
-- (such as notifying appropriate mailing lists or newsgroups)
-- reasonably calculated to inform those who received the Covered
-- Code that new knowledge has been obtained.
--
-- (b) Contributor APIs.
-- If Contributor's Modifications include an application programming
-- interface and Contributor has knowledge of patent licenses which
-- are reasonably necessary to implement that API, Contributor must
-- also include this information in the LEGAL file.
--
-- (c) Representations.
-- Contributor represents that, except as disclosed pursuant to
-- Section 3.4(a) above, Contributor believes that Contributor's
-- Modifications are Contributor's original creation(s) and/or
-- Contributor has sufficient rights to grant the rights conveyed by
-- this License.
--
-- 3.5. Required Notices.
-- You must duplicate the notice in Exhibit A in each file of the Source
-- Code. If it is not possible to put such notice in a particular Source
-- Code file due to its structure, then You must include such notice in a
-- location (such as a relevant directory) where a user would be likely
-- to look for such a notice. If You created one or more Modification(s)
-- You may add your name as a Contributor to the notice described in
-- Exhibit A. You must also duplicate this License in any documentation
-- for the Source Code where You describe recipients' rights or ownership
-- rights relating to Covered Code. You may choose to offer, and to
-- charge a fee for, warranty, support, indemnity or liability
-- obligations to one or more recipients of Covered Code. However, You
-- may do so only on Your own behalf, and not on behalf of the Initial
-- Developer or any Contributor. You must make it absolutely clear than
-- any such warranty, support, indemnity or liability obligation is
-- offered by You alone, and You hereby agree to indemnify the Initial
-- Developer and every Contributor for any liability incurred by the
-- Initial Developer or such Contributor as a result of warranty,
-- support, indemnity or liability terms You offer.
--
-- 3.6. Distribution of Executable Versions.
-- You may distribute Covered Code in Executable form only if the
-- requirements of Section 3.1-3.5 have been met for that Covered Code,
-- and if You include a notice stating that the Source Code version of
-- the Covered Code is available under the terms of this License,
-- including a description of how and where You have fulfilled the
-- obligations of Section 3.2. The notice must be conspicuously included
-- in any notice in an Executable version, related documentation or
-- collateral in which You describe recipients' rights relating to the
-- Covered Code. You may distribute the Executable version of Covered
-- Code or ownership rights under a license of Your choice, which may
-- contain terms different from this License, provided that You are in
-- compliance with the terms of this License and that the license for the
-- Executable version does not attempt to limit or alter the recipient's
-- rights in the Source Code version from the rights set forth in this
-- License. If You distribute the Executable version under a different
-- license You must make it absolutely clear that any terms which differ
-- from this License are offered by You alone, not by the Initial
-- Developer or any Contributor. You hereby agree to indemnify the
-- Initial Developer and every Contributor for any liability incurred by
-- the Initial Developer or such Contributor as a result of any such
-- terms You offer.
--
-- 3.7. Larger Works.
-- You may create a Larger Work by combining Covered Code with other code
-- not governed by the terms of this License and distribute the Larger
-- Work as a single product. In such a case, You must make sure the
-- requirements of this License are fulfilled for the Covered Code.
--
--4. Inability to Comply Due to Statute or Regulation.
--
-- If it is impossible for You to comply with any of the terms of this
-- License with respect to some or all of the Covered Code due to
-- statute, judicial order, or regulation then You must: (a) comply with
-- the terms of this License to the maximum extent possible; and (b)
-- describe the limitations and the code they affect. Such description
-- must be included in the LEGAL file described in Section 3.4 and must
-- be included with all distributions of the Source Code. Except to the
-- extent prohibited by statute or regulation, such description must be
-- sufficiently detailed for a recipient of ordinary skill to be able to
-- understand it.
--
--5. Application of this License.
--
-- This License applies to code to which the Initial Developer has
-- attached the notice in Exhibit A and to related Covered Code.
--
--6. Versions of the License.
--
-- 6.1. New Versions.
-- Netscape Communications Corporation ("Netscape") may publish revised
-- and/or new versions of the License from time to time. Each version
-- will be given a distinguishing version number.
--
-- 6.2. Effect of New Versions.
-- Once Covered Code has been published under a particular version of the
-- License, You may always continue to use it under the terms of that
-- version. You may also choose to use such Covered Code under the terms
-- of any subsequent version of the License published by Netscape. No one
-- other than Netscape has the right to modify the terms applicable to
-- Covered Code created under this License.
--
-- 6.3. Derivative Works.
-- If You create or use a modified version of this License (which you may
-- only do in order to apply it to code which is not already Covered Code
-- governed by this License), You must (a) rename Your license so that
-- the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-- "MPL", "NPL" or any confusingly similar phrase do not appear in your
-- license (except to note that your license differs from this License)
-- and (b) otherwise make it clear that Your version of the license
-- contains terms which differ from the Mozilla Public License and
-- Netscape Public License. (Filling in the name of the Initial
-- Developer, Original Code or Contributor in the notice described in
-- Exhibit A shall not of themselves be deemed to be modifications of
-- this License.)
--
--7. DISCLAIMER OF WARRANTY.
--
-- COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-- WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-- WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-- DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-- THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-- IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-- YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-- COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-- OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-- ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
--
--8. TERMINATION.
--
-- 8.1. This License and the rights granted hereunder will terminate
-- automatically if You fail to comply with terms herein and fail to cure
-- such breach within 30 days of becoming aware of the breach. All
-- sublicenses to the Covered Code which are properly granted shall
-- survive any termination of this License. Provisions which, by their
-- nature, must remain in effect beyond the termination of this License
-- shall survive.
--
-- 8.2. If You initiate litigation by asserting a patent infringement
-- claim (excluding declatory judgment actions) against Initial Developer
-- or a Contributor (the Initial Developer or Contributor against whom
-- You file such action is referred to as "Participant") alleging that:
--
-- (a) such Participant's Contributor Version directly or indirectly
-- infringes any patent, then any and all rights granted by such
-- Participant to You under Sections 2.1 and/or 2.2 of this License
-- shall, upon 60 days notice from Participant terminate prospectively,
-- unless if within 60 days after receipt of notice You either: (i)
-- agree in writing to pay Participant a mutually agreeable reasonable
-- royalty for Your past and future use of Modifications made by such
-- Participant, or (ii) withdraw Your litigation claim with respect to
-- the Contributor Version against such Participant. If within 60 days
-- of notice, a reasonable royalty and payment arrangement are not
-- mutually agreed upon in writing by the parties or the litigation claim
-- is not withdrawn, the rights granted by Participant to You under
-- Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-- the 60 day notice period specified above.
--
-- (b) any software, hardware, or device, other than such Participant's
-- Contributor Version, directly or indirectly infringes any patent, then
-- any rights granted to You by such Participant under Sections 2.1(b)
-- and 2.2(b) are revoked effective as of the date You first made, used,
-- sold, distributed, or had made, Modifications made by that
-- Participant.
--
-- 8.3. If You assert a patent infringement claim against Participant
-- alleging that such Participant's Contributor Version directly or
-- indirectly infringes any patent where such claim is resolved (such as
-- by license or settlement) prior to the initiation of patent
-- infringement litigation, then the reasonable value of the licenses
-- granted by such Participant under Sections 2.1 or 2.2 shall be taken
-- into account in determining the amount or value of any payment or
-- license.
--
-- 8.4. In the event of termination under Sections 8.1 or 8.2 above,
-- all end user license agreements (excluding distributors and resellers)
-- which have been validly granted by You or any distributor hereunder
-- prior to termination shall survive termination.
--
--9. LIMITATION OF LIABILITY.
--
-- UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-- (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-- DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-- OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-- ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-- CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-- WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-- COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-- INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-- LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-- RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-- PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-- EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-- THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
--
--10. U.S. GOVERNMENT END USERS.
--
-- The Covered Code is a "commercial item," as that term is defined in
-- 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-- software" and "commercial computer software documentation," as such
-- terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-- C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-- all U.S. Government End Users acquire Covered Code with only those
-- rights set forth herein.
--
--11. MISCELLANEOUS.
--
-- This License represents the complete agreement concerning subject
-- matter hereof. If any provision of this License is held to be
-- unenforceable, such provision shall be reformed only to the extent
-- necessary to make it enforceable. This License shall be governed by
-- California law provisions (except to the extent applicable law, if
-- any, provides otherwise), excluding its conflict-of-law provisions.
-- With respect to disputes in which at least one party is a citizen of,
-- or an entity chartered or registered to do business in the United
-- States of America, any litigation relating to this License shall be
-- subject to the jurisdiction of the Federal Courts of the Northern
-- District of California, with venue lying in Santa Clara County,
-- California, with the losing party responsible for costs, including
-- without limitation, court costs and reasonable attorneys' fees and
-- expenses. The application of the United Nations Convention on
-- Contracts for the International Sale of Goods is expressly excluded.
-- Any law or regulation which provides that the language of a contract
-- shall be construed against the drafter shall not apply to this
-- License.
--
--12. RESPONSIBILITY FOR CLAIMS.
--
-- As between Initial Developer and the Contributors, each party is
-- responsible for claims and damages arising, directly or indirectly,
-- out of its utilization of rights under this License and You agree to
-- work with Initial Developer and Contributors to distribute such
-- responsibility on an equitable basis. Nothing herein is intended or
-- shall be deemed to constitute any admission of liability.
--
--13. MULTIPLE-LICENSED CODE.
--
-- Initial Developer may designate portions of the Covered Code as
-- "Multiple-Licensed". "Multiple-Licensed" means that the Initial
-- Developer permits you to utilize portions of the Covered Code under
-- Your choice of the NPL or the alternative licenses, if any, specified
-- by the Initial Developer in the file described in Exhibit A.
--
--EXHIBIT A -Mozilla Public License.
--
-- ``The contents of this file are subject to the Mozilla Public License
-- Version 1.1 (the "License"); you may not use this file except in
-- compliance with the License. You may obtain a copy of the License at
-- http://www.mozilla.org/MPL/
--
-- Software distributed under the License is distributed on an "AS IS"
-- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-- License for the specific language governing rights and limitations
-- under the License.
--
-- The Original Code is ______________________________________.
--
-- The Initial Developer of the Original Code is ________________________.
-- Portions created by ______________________ are Copyright (C) ______
-- _______________________. All Rights Reserved.
--
-- Contributor(s): ______________________________________.
--
-- Alternatively, the contents of this file may be used under the terms
-- of the _____ license (the "[___] License"), in which case the
-- provisions of [______] License are applicable instead of those
-- above. If you wish to allow use of your version of this file only
-- under the terms of the [____] License and not to allow others to use
-- your version of this file under the MPL, indicate your decision by
-- deleting the provisions above and replace them with the notice and
-- other provisions required by the [___] License. If you do not delete
-- the provisions above, a recipient may use your version of this file
-- under either the MPL or the [___] License."
--
-- [NOTE: The text of this Exhibit A may differ slightly from the text of
-- the notices in the Source Code files of the Original Code. You should
-- use the text of this Exhibit A rather than the text found in the
-- Original Code Source Code for Your Modifications.]
-+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-+and associated documentation files (the "Software"), to deal in the Software without restriction,
-+including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-+subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all copies or substantial
-+portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-+NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-+OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-\ No newline at end of file
---
-2.19.2
-
diff --git a/package/libgdiplus/0003-gifcodec.c-Include-copy-of-GifQuantizeBuffer-functio.patch b/package/libgdiplus/0003-gifcodec.c-Include-copy-of-GifQuantizeBuffer-functio.patch
deleted file mode 100644
index 80e944f07c..0000000000
--- a/package/libgdiplus/0003-gifcodec.c-Include-copy-of-GifQuantizeBuffer-functio.patch
+++ /dev/null
@@ -1,414 +0,0 @@
-From afde9145030ff4989f0d7933389c20244eaf8039 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
-Date: Thu, 1 Aug 2019 17:08:36 +0200
-Subject: [PATCH] gifcodec.c: Include copy of GifQuantizeBuffer function from
- giflib (#575)
-
-It was removed upstream so we need to include a copy of it.
-The upstream code is licensed as MIT.
-
-Fixes https://github.com/mono/libgdiplus/issues/546
-
-Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
----
- src/gifcodec.c | 377 +++++++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 369 insertions(+), 8 deletions(-)
-
-diff --git a/src/gifcodec.c b/src/gifcodec.c
-index 6f8dedb..29a9899 100644
---- a/src/gifcodec.c
-+++ b/src/gifcodec.c
-@@ -40,6 +40,374 @@ GUID gdip_gif_image_format_guid = {0xb96b3cb0U, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0
- #include "gifcodec.h"
-
-
-+/* START GifQuantizeBuffer copy from giflib
-+
-+The giflib 5.2.0 release notes mention:
-+
-+> The undocumented and deprecated GifQuantizeBuffer() entry point
-+> has been moved to the util library to reduce libgif size and attack
-+> surface. Applications needing this function are couraged to link the
-+> util library or make their own copy.
-+
-+Since the util library doesn't get installed in most distros we can't
-+link against it and need to make our own copy called LibgdiplusGifQuantizeBuffer.
-+This is taken from giflib 52b62de83d5facbbbde042b85bf3f61182e3bebd.
-+
-+> The GIFLIB distribution is Copyright (c) 1997 Eric S. Raymond
-+>
-+> Permission is hereby granted, free of charge, to any person obtaining a copy
-+> of this software and associated documentation files (the "Software"), to deal
-+> in the Software without restriction, including without limitation the rights
-+> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+> copies of the Software, and to permit persons to whom the Software is
-+> furnished to do so, subject to the following conditions:
-+>
-+> The above copyright notice and this permission notice shall be included in
-+> all copies or substantial portions of the Software.
-+>
-+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+> THE SOFTWARE.
-+
-+*/
-+
-+/*****************************************************************************
-+
-+ quantize.c - quantize a high resolution image into lower one
-+
-+ Based on: "Color Image Quantization for frame buffer Display", by
-+ Paul Heckbert SIGGRAPH 1982 page 297-307.
-+
-+ This doesn't really belong in the core library, was undocumented,
-+ and was removed in 4.2. Then it turned out some client apps were
-+ actually using it, so it was restored in 5.0.
-+
-+SPDX-License-Identifier: MIT
-+
-+******************************************************************************/
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include "gif_lib.h"
-+//#include "gif_lib_private.h"
-+
-+//#define ABS(x) ((x) > 0 ? (x) : (-(x)))
-+
-+#define COLOR_ARRAY_SIZE 32768
-+#define BITS_PER_PRIM_COLOR 5
-+#define MAX_PRIM_COLOR 0x1f
-+
-+static int SortRGBAxis;
-+
-+typedef struct QuantizedColorType {
-+ GifByteType RGB[3];
-+ GifByteType NewColorIndex;
-+ long Count;
-+ struct QuantizedColorType *Pnext;
-+} QuantizedColorType;
-+
-+typedef struct NewColorMapType {
-+ GifByteType RGBMin[3], RGBWidth[3];
-+ unsigned int NumEntries; /* # of QuantizedColorType in linked list below */
-+ unsigned long Count; /* Total number of pixels in all the entries */
-+ QuantizedColorType *QuantizedColors;
-+} NewColorMapType;
-+
-+static int SubdivColorMap(NewColorMapType * NewColorSubdiv,
-+ unsigned int ColorMapSize,
-+ unsigned int *NewColorMapSize);
-+static int SortCmpRtn(const void *Entry1, const void *Entry2);
-+
-+/******************************************************************************
-+ Quantize high resolution image into lower one. Input image consists of a
-+ 2D array for each of the RGB colors with size Width by Height. There is no
-+ Color map for the input. Output is a quantized image with 2D array of
-+ indexes into the output color map.
-+ Note input image can be 24 bits at the most (8 for red/green/blue) and
-+ the output has 256 colors at the most (256 entries in the color map.).
-+ ColorMapSize specifies size of color map up to 256 and will be updated to
-+ real size before returning.
-+ Also non of the parameter are allocated by this routine.
-+ This function returns GIF_OK if successful, GIF_ERROR otherwise.
-+******************************************************************************/
-+int
-+LibgdiplusGifQuantizeBuffer(unsigned int Width,
-+ unsigned int Height,
-+ int *ColorMapSize,
-+ GifByteType * RedInput,
-+ GifByteType * GreenInput,
-+ GifByteType * BlueInput,
-+ GifByteType * OutputBuffer,
-+ GifColorType * OutputColorMap) {
-+
-+ unsigned int Index, NumOfEntries;
-+ int i, j, MaxRGBError[3];
-+ unsigned int NewColorMapSize;
-+ long Red, Green, Blue;
-+ NewColorMapType NewColorSubdiv[256];
-+ QuantizedColorType *ColorArrayEntries, *QuantizedColor;
-+
-+ ColorArrayEntries = (QuantizedColorType *)malloc(
-+ sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE);
-+ if (ColorArrayEntries == NULL) {
-+ return GIF_ERROR;
-+ }
-+
-+ for (i = 0; i < COLOR_ARRAY_SIZE; i++) {
-+ ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR);
-+ ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) &
-+ MAX_PRIM_COLOR;
-+ ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR;
-+ ColorArrayEntries[i].Count = 0;
-+ }
-+
-+ /* Sample the colors and their distribution: */
-+ for (i = 0; i < (int)(Width * Height); i++) {
-+ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
-+ (2 * BITS_PER_PRIM_COLOR)) +
-+ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
-+ BITS_PER_PRIM_COLOR) +
-+ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
-+ ColorArrayEntries[Index].Count++;
-+ }
-+
-+ /* Put all the colors in the first entry of the color map, and call the
-+ * recursive subdivision process. */
-+ for (i = 0; i < 256; i++) {
-+ NewColorSubdiv[i].QuantizedColors = NULL;
-+ NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0;
-+ for (j = 0; j < 3; j++) {
-+ NewColorSubdiv[i].RGBMin[j] = 0;
-+ NewColorSubdiv[i].RGBWidth[j] = 255;
-+ }
-+ }
-+
-+ /* Find the non empty entries in the color table and chain them: */
-+ for (i = 0; i < COLOR_ARRAY_SIZE; i++)
-+ if (ColorArrayEntries[i].Count > 0)
-+ break;
-+ QuantizedColor = NewColorSubdiv[0].QuantizedColors = &ColorArrayEntries[i];
-+ NumOfEntries = 1;
-+ while (++i < COLOR_ARRAY_SIZE)
-+ if (ColorArrayEntries[i].Count > 0) {
-+ QuantizedColor->Pnext = &ColorArrayEntries[i];
-+ QuantizedColor = &ColorArrayEntries[i];
-+ NumOfEntries++;
-+ }
-+ QuantizedColor->Pnext = NULL;
-+
-+ NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled colors */
-+ NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */
-+ NewColorMapSize = 1;
-+ if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) !=
-+ GIF_OK) {
-+ free((char *)ColorArrayEntries);
-+ return GIF_ERROR;
-+ }
-+ if (NewColorMapSize < *ColorMapSize) {
-+ /* And clear rest of color map: */
-+ for (i = NewColorMapSize; i < *ColorMapSize; i++)
-+ OutputColorMap[i].Red = OutputColorMap[i].Green =
-+ OutputColorMap[i].Blue = 0;
-+ }
-+
-+ /* Average the colors in each entry to be the color to be used in the
-+ * output color map, and plug it into the output color map itself. */
-+ for (i = 0; i < NewColorMapSize; i++) {
-+ if ((j = NewColorSubdiv[i].NumEntries) > 0) {
-+ QuantizedColor = NewColorSubdiv[i].QuantizedColors;
-+ Red = Green = Blue = 0;
-+ while (QuantizedColor) {
-+ QuantizedColor->NewColorIndex = i;
-+ Red += QuantizedColor->RGB[0];
-+ Green += QuantizedColor->RGB[1];
-+ Blue += QuantizedColor->RGB[2];
-+ QuantizedColor = QuantizedColor->Pnext;
-+ }
-+ OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j;
-+ OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j;
-+ OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j;
-+ }
-+ }
-+
-+ /* Finally scan the input buffer again and put the mapped index in the
-+ * output buffer. */
-+ MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0;
-+ for (i = 0; i < (int)(Width * Height); i++) {
-+ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
-+ (2 * BITS_PER_PRIM_COLOR)) +
-+ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
-+ BITS_PER_PRIM_COLOR) +
-+ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
-+ Index = ColorArrayEntries[Index].NewColorIndex;
-+ OutputBuffer[i] = Index;
-+ if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i]))
-+ MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]);
-+ if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green - GreenInput[i]))
-+ MaxRGBError[1] = ABS(OutputColorMap[Index].Green - GreenInput[i]);
-+ if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i]))
-+ MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]);
-+ }
-+
-+#ifdef DEBUG
-+ fprintf(stderr,
-+ "Quantization L(0) errors: Red = %d, Green = %d, Blue = %d.\n",
-+ MaxRGBError[0], MaxRGBError[1], MaxRGBError[2]);
-+#endif /* DEBUG */
-+
-+ free((char *)ColorArrayEntries);
-+
-+ *ColorMapSize = NewColorMapSize;
-+
-+ return GIF_OK;
-+}
-+
-+/******************************************************************************
-+ Routine to subdivide the RGB space recursively using median cut in each
-+ axes alternatingly until ColorMapSize different cubes exists.
-+ The biggest cube in one dimension is subdivide unless it has only one entry.
-+ Returns GIF_ERROR if failed, otherwise GIF_OK.
-+*******************************************************************************/
-+static int
-+SubdivColorMap(NewColorMapType * NewColorSubdiv,
-+ unsigned int ColorMapSize,
-+ unsigned int *NewColorMapSize) {
-+
-+ unsigned int i, j, Index = 0;
-+ QuantizedColorType *QuantizedColor, **SortArray;
-+
-+ while (ColorMapSize > *NewColorMapSize) {
-+ /* Find candidate for subdivision: */
-+ long Sum, Count;
-+ int MaxSize = -1;
-+ unsigned int NumEntries, MinColor, MaxColor;
-+ for (i = 0; i < *NewColorMapSize; i++) {
-+ for (j = 0; j < 3; j++) {
-+ if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) &&
-+ (NewColorSubdiv[i].NumEntries > 1)) {
-+ MaxSize = NewColorSubdiv[i].RGBWidth[j];
-+ Index = i;
-+ SortRGBAxis = j;
-+ }
-+ }
-+ }
-+
-+ if (MaxSize == -1)
-+ return GIF_OK;
-+
-+ /* Split the entry Index into two along the axis SortRGBAxis: */
-+
-+ /* Sort all elements in that entry along the given axis and split at
-+ * the median. */
-+ SortArray = (QuantizedColorType **)malloc(
-+ sizeof(QuantizedColorType *) *
-+ NewColorSubdiv[Index].NumEntries);
-+ if (SortArray == NULL)
-+ return GIF_ERROR;
-+ for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors;
-+ j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL;
-+ j++, QuantizedColor = QuantizedColor->Pnext)
-+ SortArray[j] = QuantizedColor;
-+
-+ /*
-+ * Because qsort isn't stable, this can produce differing
-+ * results for the order of tuples depending on platform
-+ * details of how qsort() is implemented.
-+ *
-+ * We mitigate this problem by sorting on all three axes rather
-+ * than only the one specied by SortRGBAxis; that way the instability
-+ * can only become an issue if there are multiple color indices
-+ * referring to identical RGB tuples. Older versions of this
-+ * sorted on only the one axis.
-+ */
-+ qsort(SortArray, NewColorSubdiv[Index].NumEntries,
-+ sizeof(QuantizedColorType *), SortCmpRtn);
-+
-+ /* Relink the sorted list into one: */
-+ for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++)
-+ SortArray[j]->Pnext = SortArray[j + 1];
-+ SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL;
-+ NewColorSubdiv[Index].QuantizedColors = QuantizedColor = SortArray[0];
-+ free((char *)SortArray);
-+
-+ /* Now simply add the Counts until we have half of the Count: */
-+ Sum = NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count;
-+ NumEntries = 1;
-+ Count = QuantizedColor->Count;
-+ while (QuantizedColor->Pnext != NULL &&
-+ (Sum -= QuantizedColor->Pnext->Count) >= 0 &&
-+ QuantizedColor->Pnext->Pnext != NULL) {
-+ QuantizedColor = QuantizedColor->Pnext;
-+ NumEntries++;
-+ Count += QuantizedColor->Count;
-+ }
-+ /* Save the values of the last color of the first half, and first
-+ * of the second half so we can update the Bounding Boxes later.
-+ * Also as the colors are quantized and the BBoxes are full 0..255,
-+ * they need to be rescaled.
-+ */
-+ MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half */
-+ /* coverity[var_deref_op] */
-+ MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */
-+ MaxColor <<= (8 - BITS_PER_PRIM_COLOR);
-+ MinColor <<= (8 - BITS_PER_PRIM_COLOR);
-+
-+ /* Partition right here: */
-+ NewColorSubdiv[*NewColorMapSize].QuantizedColors =
-+ QuantizedColor->Pnext;
-+ QuantizedColor->Pnext = NULL;
-+ NewColorSubdiv[*NewColorMapSize].Count = Count;
-+ NewColorSubdiv[Index].Count -= Count;
-+ NewColorSubdiv[*NewColorMapSize].NumEntries =
-+ NewColorSubdiv[Index].NumEntries - NumEntries;
-+ NewColorSubdiv[Index].NumEntries = NumEntries;
-+ for (j = 0; j < 3; j++) {
-+ NewColorSubdiv[*NewColorMapSize].RGBMin[j] =
-+ NewColorSubdiv[Index].RGBMin[j];
-+ NewColorSubdiv[*NewColorMapSize].RGBWidth[j] =
-+ NewColorSubdiv[Index].RGBWidth[j];
-+ }
-+ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] =
-+ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] +
-+ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] - MinColor;
-+ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor;
-+
-+ NewColorSubdiv[Index].RGBWidth[SortRGBAxis] =
-+ MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis];
-+
-+ (*NewColorMapSize)++;
-+ }
-+
-+ return GIF_OK;
-+}
-+
-+/****************************************************************************
-+ Routine called by qsort to compare two entries.
-+*****************************************************************************/
-+
-+static int
-+SortCmpRtn(const void *Entry1,
-+ const void *Entry2) {
-+ QuantizedColorType *entry1 = (*((QuantizedColorType **) Entry1));
-+ QuantizedColorType *entry2 = (*((QuantizedColorType **) Entry2));
-+
-+ /* sort on all axes of the color space! */
-+ int hash1 = entry1->RGB[SortRGBAxis] * 256 * 256
-+ + entry1->RGB[(SortRGBAxis+1) % 3] * 256
-+ + entry1->RGB[(SortRGBAxis+2) % 3];
-+ int hash2 = entry2->RGB[SortRGBAxis] * 256 * 256
-+ + entry2->RGB[(SortRGBAxis+1) % 3] * 256
-+ + entry2->RGB[(SortRGBAxis+2) % 3];
-+
-+ return hash1 - hash2;
-+}
-+
-+/* END GifQuantizeBuffer copy from giflib */
-+
- /* Data structure used for callback */
- typedef struct
- {
-@@ -851,14 +1219,7 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file)
- v += 4;
- }
- }
-- if (
--#if GIFLIB_MAJOR >= 5
-- GifQuantizeBuffer(
--#else
-- QuantizeBuffer(
--#endif
-- bitmap_data->width, bitmap_data->height, &cmap_size,
-- red, green, blue, pixbuf, cmap->Colors) == GIF_ERROR) {
-+ if (LibgdiplusGifQuantizeBuffer(bitmap_data->width, bitmap_data->height, &cmap_size, red, green, blue, pixbuf, cmap->Colors) == GIF_ERROR) {
- goto error;
- }
- }
---
-2.20.1
-
diff --git a/package/libgdiplus/libgdiplus.hash b/package/libgdiplus/libgdiplus.hash
index d89b352d26..3a2e5ff25c 100644
--- a/package/libgdiplus/libgdiplus.hash
+++ b/package/libgdiplus/libgdiplus.hash
@@ -1,3 +1,3 @@
# Locally computed:
-sha256 6a75e4a476695cd6a1475fd6b989423ecf73978fd757673669771d8a6e13f756 libgdiplus-5.6.tar.gz
+sha256 1fd034f4b636214cc24e94c563cd10b3f3444d9f0660927b60e63fd4131d97fa libgdiplus-6.0.5.tar.gz
sha256 81317bf837e02a116dc20b032fa1d0cbf9ec357621f141ff2c2daf26c17cbb5d LICENSE
diff --git a/package/libgdiplus/libgdiplus.mk b/package/libgdiplus/libgdiplus.mk
index d120f6a314..be4a9168f9 100644
--- a/package/libgdiplus/libgdiplus.mk
+++ b/package/libgdiplus/libgdiplus.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBGDIPLUS_VERSION = 5.6
+LIBGDIPLUS_VERSION = 6.0.5
LIBGDIPLUS_SITE = $(call github,mono,libgdiplus,$(LIBGDIPLUS_VERSION))
LIBGDIPLUS_LICENSE = MIT