From 95eadf6c09a9d348da0366268a0108882500f174 Mon Sep 17 00:00:00 2001 From: Uwe Date: Mon, 21 Mar 2022 17:59:49 +0100 Subject: [PATCH] [Doc] update weblinks - link Freetype license --- src/Doc/ThirdPartyLibraries.html | 183 ++----------------------------- src/Gui/Splashscreen.cpp | 32 +++--- 2 files changed, 23 insertions(+), 192 deletions(-) diff --git a/src/Doc/ThirdPartyLibraries.html b/src/Doc/ThirdPartyLibraries.html index f7a06dea65..d9cfd9a6ed 100644 --- a/src/Doc/ThirdPartyLibraries.html +++ b/src/Doc/ThirdPartyLibraries.html @@ -46,178 +46,8 @@ List of Open Source components

FreeType

Web site: https://www.freetype.org/

-

License: FreeType is used under the FreeType License (FTL), a BSD-style license with a credit clause.

-
-                    The FreeType Project LICENSE
-                    ----------------------------
+

License: FreeType License: https://gitlab.freedesktop.org/freetype/freetype/-/blob/master/docs/FTL.TXT

- 2006-Jan-27 - - Copyright 1996-2002, 2006 by - David Turner, Robert Wilhelm, and Werner Lemberg - - - -Introduction -============ - - The FreeType Project is distributed in several archive packages; - some of them may contain, in addition to the FreeType font engine, - various tools and contributions which rely on, or relate to, the - FreeType Project. - - This license applies to all files found in such packages, and - which do not fall under their own explicit license. The license - affects thus the FreeType font engine, the test programs, - documentation and makefiles, at the very least. - - This license was inspired by the BSD, Artistic, and IJG - (Independent JPEG Group) licenses, which all encourage inclusion - and use of free software in commercial and freeware products - alike. As a consequence, its main points are that: - - o We don't promise that this software works. However, we will be - interested in any kind of bug reports. (`as is' distribution) - - o You can use this software for whatever you want, in parts or - full form, without having to pay us. (`royalty-free' usage) - - o You may not pretend that you wrote this software. If you use - it, or only parts of it, in a program, you must acknowledge - somewhere in your documentation that you have used the - FreeType code. (`credits') - - We specifically permit and encourage the inclusion of this - software, with or without modifications, in commercial products. - We disclaim all warranties covering The FreeType Project and - assume no liability related to The FreeType Project. - - - Finally, many people asked us for a preferred form for a - credit/disclaimer to use in compliance with this license. We thus - encourage you to use the following text: - - """ - Portions of this software are copyright © The FreeType - Project (www.freetype.org). All rights reserved. - """ - - Please replace with the value from the FreeType version you - actually use. - - -Legal Terms -=========== - -0. Definitions --------------- - - Throughout this license, the terms `package', `FreeType Project', - and `FreeType archive' refer to the set of files originally - distributed by the authors (David Turner, Robert Wilhelm, and - Werner Lemberg) as the `FreeType Project', be they named as alpha, - beta or final release. - - `You' refers to the licensee, or person using the project, where - `using' is a generic term including compiling the project's source - code as well as linking it to form a `program' or `executable'. - This program is referred to as `a program using the FreeType - engine'. - - This license applies to all files distributed in the original - FreeType Project, including all source code, binaries and - documentation, unless otherwise stated in the file in its - original, unmodified form as distributed in the original archive. - If you are unsure whether or not a particular file is covered by - this license, you must contact us to verify this. - - The FreeType Project is copyright (C) 1996-2000 by David Turner, - Robert Wilhelm, and Werner Lemberg. All rights reserved except as - specified below. - -1. No Warranty --------------- - - THE FREETYPE PROJECT IS PROVIDED `AS IS' WITHOUT WARRANTY OF ANY - KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - PURPOSE. IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS - BE LIABLE FOR ANY DAMAGES CAUSED BY THE USE OR THE INABILITY TO - USE, OF THE FREETYPE PROJECT. - -2. Redistribution ------------------ - - This license grants a worldwide, royalty-free, perpetual and - irrevocable right and license to use, execute, perform, compile, - display, copy, create derivative works of, distribute and - sublicense the FreeType Project (in both source and object code - forms) and derivative works thereof for any purpose; and to - authorize others to exercise some or all of the rights granted - herein, subject to the following conditions: - - o Redistribution of source code must retain this license file - (`FTL.TXT') unaltered; any additions, deletions or changes to - the original files must be clearly indicated in accompanying - documentation. The copyright notices of the unaltered, - original files must be preserved in all copies of source - files. - - o Redistribution in binary form must provide a disclaimer that - states that the software is based in part of the work of the - FreeType Team, in the distribution documentation. We also - encourage you to put an URL to the FreeType web page in your - documentation, though this isn't mandatory. - - These conditions apply to any software derived from or based on - the FreeType Project, not just the unmodified files. If you use - our work, you must acknowledge us. However, no fee need be paid - to us. - -3. Advertising --------------- - - Neither the FreeType authors and contributors nor you shall use - the name of the other for commercial, advertising, or promotional - purposes without specific prior written permission. - - We suggest, but do not require, that you use one or more of the - following phrases to refer to this software in your documentation - or advertising materials: `FreeType Project', `FreeType Engine', - `FreeType library', or `FreeType Distribution'. - - As you have not signed this license, you are not required to - accept it. However, as the FreeType Project is copyrighted - material, only this license, or another one contracted with the - authors, grants you the right to use, distribute, and modify it. - Therefore, by using, distributing, or modifying the FreeType - Project, you indicate that you understand and accept all the terms - of this license. - -4. Contacts ------------ - - There are two mailing lists related to FreeType: - - o freetype@nongnu.org - - Discusses general use and applications of FreeType, as well as - future and wanted additions to the library and distribution. - If you are looking for support, start in this list if you - haven't found anything to help you in the documentation. - - o freetype-devel@nongnu.org - - Discusses bugs, as well as engine internals, design issues, - specific licenses, porting, etc. - - Our home page can be found at - - http://www.freetype.org - - ---- end of FTL.TXT --- -

@@ -308,19 +138,20 @@ Additional BSD Notice purposes. +

Python

Web site: https://www.python.org/

License: https://docs.python.org/3.6/license.html

+
-

Qt for Python (formerly shiboken/PySide)

+

Qt for Python (Shiboken / PySide)

Web site: https://wiki.qt.io/Qt_for_Python

-
-

License:

Qt for Python is available under LGPLv3/GPLv2 -

+

License: LGPL version 3 / GPL version 2: LGPLv3 / GPLv2 +


@@ -353,7 +184,7 @@ Additional BSD Notice

Zipios++

-

Web site: https://zipios.sourceforge.net

+

Web site: http://zipios.sourceforge.net

License: LGPL v2.1: https://github.com/Zipios/Zipios/blob/main/COPYING

diff --git a/src/Gui/Splashscreen.cpp b/src/Gui/Splashscreen.cpp index 1e02bfde97..8b8645f19a 100644 --- a/src/Gui/Splashscreen.cpp +++ b/src/Gui/Splashscreen.cpp @@ -495,7 +495,7 @@ void AboutDialog::showLibraryInformation() // Boost li.name = QLatin1String("Boost"); li.href = baseurl + QLatin1String("#_TocBoost"); - li.url = QLatin1String("http://www.boost.org"); + li.url = QLatin1String("https://www.boost.org"); li.version = QLatin1String(BOOST_LIB_VERSION); libInfo << li; @@ -507,23 +507,23 @@ void AboutDialog::showLibraryInformation() libInfo << li; // Eigen3 - li.name = QLatin1String("Eigen3"); - li.href = baseurl + QLatin1String("#_TocEigen3"); - li.url = QLatin1String("http://eigen.tuxfamily.org"); + li.name = QLatin1String("Eigen"); + li.href = baseurl + QLatin1String("#_TocEigen"); + li.url = QLatin1String("https://eigen.tuxfamily.org"); li.version = QString::fromLatin1(FC_EIGEN3_VERSION); libInfo << li; // FreeType li.name = QLatin1String("FreeType"); li.href = baseurl + QLatin1String("#_TocFreeType"); - li.url = QLatin1String("http://freetype.org"); + li.url = QLatin1String("https://freetype.org"); li.version = QString::fromLatin1(FC_FREETYPE_VERSION); libInfo << li; // KDL li.name = QLatin1String("KDL"); li.href = baseurl + QLatin1String("#_TocKDL"); - li.url = QLatin1String("http://www.orocos.org/kdl"); + li.url = QLatin1String("https://www.orocos.org/kdl"); li.version.clear(); libInfo << li; @@ -538,7 +538,7 @@ void AboutDialog::showLibraryInformation() #if defined(HAVE_OCC_VERSION) li.name = QLatin1String("Open CASCADE Technology"); li.href = baseurl + QLatin1String("#_TocOCCT"); - li.url = QLatin1String("http://www.opencascade.com"); + li.url = QLatin1String("https://www.opencascade.com/open-cascade-technology/"); li.version = QLatin1String(OCC_VERSION_STRING_EXT); libInfo << li; #endif @@ -546,7 +546,7 @@ void AboutDialog::showLibraryInformation() // pcl li.name = QLatin1String("Point Cloud Library"); li.href = baseurl + QLatin1String("#_TocPcl"); - li.url = QLatin1String("http://www.pointclouds.org"); + li.url = QLatin1String("https://www.pointclouds.org"); li.version = QString::fromLatin1(FC_PCL_VERSION); libInfo << li; @@ -560,35 +560,35 @@ void AboutDialog::showLibraryInformation() // Python li.name = QLatin1String("Python"); li.href = baseurl + QLatin1String("#_TocPython"); - li.url = QLatin1String("http://www.python.org"); + li.url = QLatin1String("https://www.python.org"); li.version = QLatin1String(PY_VERSION); libInfo << li; // PySide - li.name = QLatin1String("PySide"); + li.name = QLatin1String("Qt for Python (PySide)"); li.href = baseurl + QLatin1String("#_TocPySide"); - li.url = QLatin1String("http://www.pyside.org"); + li.url = QLatin1String("https://wiki.qt.io/Qt_for_Python"); li.version = QString::fromLatin1(FC_PYSIDE_VERSION); libInfo << li; // Qt li.name = QLatin1String("Qt"); li.href = baseurl + QLatin1String("#_TocQt"); - li.url = QLatin1String("http://www.qt.io"); + li.url = QLatin1String("https://www.qt.io"); li.version = QLatin1String(QT_VERSION_STR); libInfo << li; // Salome SMESH li.name = QLatin1String("Salome SMESH"); li.href = baseurl + QLatin1String("#_TocSalomeSMESH"); - li.url = QLatin1String("http://salome-platform.org"); + li.url = QLatin1String("https://salome-platform.org"); li.version.clear(); libInfo << li; // Shiboken - li.name = QLatin1String("Shiboken"); + li.name = QLatin1String("Qt for Python (Shiboken)"); li.href = baseurl + QLatin1String("#_TocPySide"); - li.url = QLatin1String("http://www.pyside.org"); + li.url = QLatin1String("https://wiki.qt.io/Qt_for_Python"); li.version = QString::fromLatin1(FC_SHIBOKEN_VERSION); libInfo << li; @@ -616,7 +616,7 @@ void AboutDialog::showLibraryInformation() // zlib li.name = QLatin1String("zlib"); li.href = baseurl + QLatin1String("#_TocZlib"); - li.url = QLatin1String("http://zlib.net"); + li.url = QLatin1String("https://zlib.net"); li.version = QLatin1String(ZLIB_VERSION); libInfo << li;