From a98a70f5c0b52be17f8487ef9d21a7923ea48887 Mon Sep 17 00:00:00 2001 From: iigs <2274777+iigs@users.noreply.github.com> Date: Thu, 3 Oct 2024 20:13:25 +0000 Subject: [PATCH] noto-emoji: update to 2.047 --- components/fonts/noto-emoji/Makefile | 10 +-- .../fonts/noto-emoji/manifests/sample-manifest.p5m | 2 +- components/fonts/noto-emoji/noto-emoji.license | 92 ---------------------- components/fonts/noto-emoji/pkg5 | 2 +- 4 files changed, 7 insertions(+), 99 deletions(-) delete mode 100644 components/fonts/noto-emoji/noto-emoji.license diff --git a/components/fonts/noto-emoji/Makefile b/components/fonts/noto-emoji/Makefile index 6919c7a8b4..13b1aab16e 100644 --- a/components/fonts/noto-emoji/Makefile +++ b/components/fonts/noto-emoji/Makefile @@ -26,16 +26,16 @@ BUILD_STYLE= archive include ../../../make-rules/shared-macros.mk COMPONENT_NAME= noto-emoji -COMPONENT_VERSION= 2.42 -HUMAN_VERSION= 2.042 +COMPONENT_VERSION= 2.47 +HUMAN_VERSION= 2.047 COMPONENT_SUMMARY= Open source emoji library that provides standard Unicode emoji support COMPONENT_SRC= $(COMPONENT_NAME)-$(HUMAN_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).zip COMPONENT_PROJECT_URL= https://github.com/googlefonts/$(COMPONENT_NAME) COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)/archive/v$(HUMAN_VERSION).zip -COMPONENT_ARCHIVE_HASH= sha256:6743379d289c1f664ce18620b02b8949ee5b349f155cf8987cb9cd042eee18b9 -COMPONENT_LICENSE= SIL Open Font License 1.1 -COMPONENT_LICENSE_FILE= $(COMPONENT_NAME).license +COMPONENT_ARCHIVE_HASH= sha256:30bd0d396b74b0d549f562c241b7ad3947e6c8c3b42484bb22350d57b6977e1b +COMPONENT_LICENSE= OFL +COMPONENT_LICENSE_FILE= LICENSE FONT_TYPE = TTF include $(WS_MAKE_RULES)/font.mk diff --git a/components/fonts/noto-emoji/manifests/sample-manifest.p5m b/components/fonts/noto-emoji/manifests/sample-manifest.p5m index 20c18141f6..ae9cd9d949 100644 --- a/components/fonts/noto-emoji/manifests/sample-manifest.p5m +++ b/components/fonts/noto-emoji/manifests/sample-manifest.p5m @@ -10,7 +10,7 @@ # # -# Copyright 2023 +# Copyright 2024 # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) diff --git a/components/fonts/noto-emoji/noto-emoji.license b/components/fonts/noto-emoji/noto-emoji.license deleted file mode 100644 index d952d62c06..0000000000 --- a/components/fonts/noto-emoji/noto-emoji.license +++ /dev/null @@ -1,92 +0,0 @@ -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/components/fonts/noto-emoji/pkg5 b/components/fonts/noto-emoji/pkg5 index 1b2571d67d..5e886e0e30 100644 --- a/components/fonts/noto-emoji/pkg5 +++ b/components/fonts/noto-emoji/pkg5 @@ -4,4 +4,4 @@ "system/font/truetype/noto-emoji" ], "name": "noto-emoji" -} \ No newline at end of file +} -- 2.11.4.GIT