From 27f2565efdf9bf15482afb6acb9fbea782d12973 Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Thu, 16 May 2024 16:07:15 +0200 Subject: [PATCH 1/2] Ajout de la licence MapLibre dans les licences tierces --- Riot/Assets/third_party_licenses.html | 43 +++++++++++++++++++++++++++ changelog.d/1041.change | 1 + 2 files changed, 44 insertions(+) create mode 100644 changelog.d/1041.change diff --git a/Riot/Assets/third_party_licenses.html b/Riot/Assets/third_party_licenses.html index edaf6ab3c..d66348029 100644 --- a/Riot/Assets/third_party_licenses.html +++ b/Riot/Assets/third_party_licenses.html @@ -1934,6 +1934,49 @@ THE SOFTWARE.

+
  • + MapLibre (https://github.com/maptiler/maplibre-gl-native) +

    + BSD 2-Clause License +

    + Copyright (c) 2021 MapLibre contributors +
    + Copyright (c) 2018-2021 MapTiler.com +
    + Copyright (c) 2014-2020 Mapbox +

    + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +
    + +

    + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. +

    +
  • + + + + + + + + + + + + diff --git a/changelog.d/1041.change b/changelog.d/1041.change new file mode 100644 index 000000000..d1d4e2d2c --- /dev/null +++ b/changelog.d/1041.change @@ -0,0 +1 @@ +Ajout de la licence MapLibre dans les licences tierces \ No newline at end of file From 659d7561c0092cca96791a05eb86abc840b4d66b Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Thu, 16 May 2024 16:24:29 +0200 Subject: [PATCH 2/2] Remove unused line in licences file --- Riot/Assets/third_party_licenses.html | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Riot/Assets/third_party_licenses.html b/Riot/Assets/third_party_licenses.html index d66348029..f1adb1288 100644 --- a/Riot/Assets/third_party_licenses.html +++ b/Riot/Assets/third_party_licenses.html @@ -1965,18 +1965,6 @@ POSSIBILITY OF SUCH DAMAGE.

    - - - - - - - - - - - -