Makefile.fetch | 4 ++--
readlicense_oo/license/license.xml | 19 +++++++++++++++++++
2 files changed, 21 insertions(+), 2 deletions(-)
New commits:
commit 6008e771f0c098e07d8efcfa7932fed58432a1b9
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Feb 24 18:53:36 2025 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Feb 25 08:41:12 2025 +0100
license: zxcvbn-c
Change-Id: Ied2d6ac56aa3d0841f2a8241a9bb44dc44a860c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182105
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Jenkins
diff --git a/readlicense_oo/license/license.xml
b/readlicense_oo/license/license.xml
index fad2f85593ee..9e5bacd149f9 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -2277,6 +2277,25 @@
original software.</p>
<p>3. This notice may not be removed or altered from any source
distribution.</p>
</div>
+ <div class="ZXCVBN">
+ <h2>zxcvbn-c</h2>
+ <p>The following software may be included in this product: zxcvbn-c.
Use of any of this software is governed
+ by the terms of the license below:</p>
+ <p>MIT License</p>
+ <p>Copyright (c) 2015-2017 Tony Evans</p>
+ <p>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:</p>
+ <p>The above copyright notice and this permission notice shall be
included in all copies or substantial
+ portions of the Software.</p>
+ <p>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.</p>
+ </div>
<div class="ZXING">
<h2>ZXing-C++</h2>
<p>The following software may be included in this product: ZXing-C++.
Use of any of this software is governed
commit 0a835a608c80745315909ff5f4e72435d5a8f1c6
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Feb 24 18:42:56 2025 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Feb 25 08:40:59 2025 +0100
fetch frozen and zxcvbn_c optionally, system option exists
Change-Id: I8d6ac530a127a724adeca38826b1f0efe3953958
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182104
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/Makefile.fetch b/Makefile.fetch
index 58d1d0359fda..f96fc16f8926 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -126,7 +126,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,FONTCONFIG,FONTCONFIG_TARBALL) \
$(call fetch_Optional,FREEHAND,FREEHAND_TARBALL) \
$(call fetch_Optional,FREETYPE,FREETYPE_TARBALL) \
- FROZEN_TARBALL \
+ $(call fetch_Optional,FROZEN,FROZEN_TARBALL) \
$(call fetch_Optional,EPOXY,EPOXY_TARBALL) \
$(call fetch_Optional,GLM,GLM_TARBALL) \
$(call fetch_Optional,GPGMEPP,GPGME_TARBALL) \
@@ -172,7 +172,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,LXML,LXML_TARBALL) \
$(call
fetch_Optional,MARIADB_CONNECTOR_C,MARIADB_CONNECTOR_C_TARBALL) \
$(call fetch_Optional,MDDS,MDDS_TARBALL) \
- ZXCVBN_C_TARBALL \
+ $(call fetch_Optional,ZXCVBN,ZXCVBN_C_TARBALL) \
$(call fetch_Optional,ZXING,ZXING_TARBALL) \
$(call fetch_Optional,MDNSRESPONDER,MDNSRESPONDER_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_CALADEA_TARBALL) \
