diff --git a/CMakeLists.txt b/CMakeLists.txt index e3c9b50e..7385fa6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,10 +72,9 @@ FetchContent_Declare(alpine_height_data SOURCE_DIR ${CMAKE_SOURCE_DIR}/${ALP_EXTERN_DIR}/alpine_height_data ) FetchContent_Declare(alpineapp_fonts - DOWNLOAD_EXTRACT_TIMESTAMP true - URL https://github.com/adobe-fonts/source-sans/archive/refs/heads/release.zip - URL_HASH MD5=681612d5ad33731c512ce056d2ca2297 - SOURCE_DIR ${CMAKE_SOURCE_DIR}/${ALP_EXTERN_DIR}/alpineapp_fonts + GIT_REPOSITORY https://github.com/AlpineMapsOrg/fonts.git + GIT_TAG origin/main + SOURCE_DIR ${CMAKE_SOURCE_DIR}/${ALP_EXTERN_DIR}/alpineapp_fonts ) FetchContent_MakeAvailable(alpine_height_data alpineapp_fonts) diff --git a/COPYRIGHT_NOTICES b/COPYRIGHT_NOTICES new file mode 100644 index 00000000..b239890a --- /dev/null +++ b/COPYRIGHT_NOTICES @@ -0,0 +1,103 @@ +This software includes code from: +- https://github.com/adobe-fonts/source-sans + +Following are the corresponding licenses: + +############################################################################### +https://github.com/adobe-fonts/source-sans +############################################################################### +Copyright 2010-2022 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. + +This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. + +############################################################################### diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 6f48d063..6dec47ee 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -73,23 +73,23 @@ qt_add_translations(alpineapp TS_FILES ) qt_add_resources(alpineapp "fonts" - BASE ${alpineapp_fonts_SOURCE_DIR}/TTF/ + BASE ${alpineapp_fonts_SOURCE_DIR}/SourceSans/ PREFIX "/fonts" FILES - ${alpineapp_fonts_SOURCE_DIR}/TTF/SourceSans3-BlackIt.ttf - ${alpineapp_fonts_SOURCE_DIR}/TTF/SourceSans3-BoldIt.ttf - ${alpineapp_fonts_SOURCE_DIR}/TTF/SourceSans3-ExtraLightIt.ttf - ${alpineapp_fonts_SOURCE_DIR}/TTF/SourceSans3-It.ttf - ${alpineapp_fonts_SOURCE_DIR}/TTF/SourceSans3-Light.ttf - ${alpineapp_fonts_SOURCE_DIR}/TTF/SourceSans3-Medium.ttf - ${alpineapp_fonts_SOURCE_DIR}/TTF/SourceSans3-SemiboldIt.ttf - ${alpineapp_fonts_SOURCE_DIR}/TTF/SourceSans3-Black.ttf - ${alpineapp_fonts_SOURCE_DIR}/TTF/SourceSans3-Bold.ttf - ${alpineapp_fonts_SOURCE_DIR}/TTF/SourceSans3-ExtraLight.ttf - ${alpineapp_fonts_SOURCE_DIR}/TTF/SourceSans3-LightIt.ttf - ${alpineapp_fonts_SOURCE_DIR}/TTF/SourceSans3-MediumIt.ttf - ${alpineapp_fonts_SOURCE_DIR}/TTF/SourceSans3-Regular.ttf - ${alpineapp_fonts_SOURCE_DIR}/TTF/SourceSans3-Semibold.ttf + ${alpineapp_fonts_SOURCE_DIR}/SourceSans/SourceSans3-BlackIt.ttf + ${alpineapp_fonts_SOURCE_DIR}/SourceSans/SourceSans3-BoldIt.ttf + ${alpineapp_fonts_SOURCE_DIR}/SourceSans/SourceSans3-ExtraLightIt.ttf + ${alpineapp_fonts_SOURCE_DIR}/SourceSans/SourceSans3-It.ttf + ${alpineapp_fonts_SOURCE_DIR}/SourceSans/SourceSans3-Light.ttf + ${alpineapp_fonts_SOURCE_DIR}/SourceSans/SourceSans3-Medium.ttf + ${alpineapp_fonts_SOURCE_DIR}/SourceSans/SourceSans3-SemiboldIt.ttf + ${alpineapp_fonts_SOURCE_DIR}/SourceSans/SourceSans3-Black.ttf + ${alpineapp_fonts_SOURCE_DIR}/SourceSans/SourceSans3-Bold.ttf + ${alpineapp_fonts_SOURCE_DIR}/SourceSans/SourceSans3-ExtraLight.ttf + ${alpineapp_fonts_SOURCE_DIR}/SourceSans/SourceSans3-LightIt.ttf + ${alpineapp_fonts_SOURCE_DIR}/SourceSans/SourceSans3-MediumIt.ttf + ${alpineapp_fonts_SOURCE_DIR}/SourceSans/SourceSans3-Regular.ttf + ${alpineapp_fonts_SOURCE_DIR}/SourceSans/SourceSans3-Semibold.ttf ) find_package(Qt6 REQUIRED COMPONENTS Charts)