From 85340fc7b437f38fed6fa1c9b6dbd2f46f562680 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 27 Jul 2020 22:22:40 +0200 Subject: [PATCH] Update Noto to latest release. Tested with an Haiku install, no obvious problems found. - The Noto Mono font is now completely gone. - The directory layout in the archive changed a bit so the recipe is adjusted. - Do we want to provide the "display" variant in the main package or should we move it out? - There are now a "Symbols2" and a "Music" font we may want to add to the font fallback system (but really, let's get a real font selection system instead) --- .../{noto-20170920.recipe => noto-2.7.recipe} | 16 ++- media-fonts/noto/noto-20171026.recipe | 107 ------------------ 2 files changed, 7 insertions(+), 116 deletions(-) rename media-fonts/noto/{noto-20170920.recipe => noto-2.7.recipe} (85%) delete mode 100644 media-fonts/noto/noto-20171026.recipe diff --git a/media-fonts/noto/noto-20170920.recipe b/media-fonts/noto/noto-2.7.recipe similarity index 85% rename from media-fonts/noto/noto-20170920.recipe rename to media-fonts/noto/noto-2.7.recipe index 6996620d4..6c453e226 100644 --- a/media-fonts/noto/noto-20170920.recipe +++ b/media-fonts/noto/noto-2.7.recipe @@ -53,14 +53,13 @@ Oriya Sinhala Tamil, Telugu, Thaana, Tibetan" HOMEPAGE="https://www.google.com/get/noto/" -COPYRIGHT="2015, 2016, 2017 Google Inc. +COPYRIGHT="2015-2019 Google Inc. 2014, 2015 Adobe Systems Incorporated (http://www.adobe.com/)" LICENSE="SIL Open Font License v1.1" -REVISION="4" -srcGitRev="5a89b487c648c34c2b6d1b9ebb73bb3fab1df4b2" -SOURCE_URI="https://github.com/googlei18n/noto/archive/$srcGitRev.tar.gz" -CHECKSUM_SHA256="9b997df64075f2607d44a080dbe8d4c5890a7210c9ca755aa06244f4a4c23880" -SOURCE_DIR="noto-fonts-$srcGitRev" +REVISION="1" +SOURCE_URI="https://github.com/googlefonts/noto-fonts/archive/v2.7-NotoSlimVF.tar.gz" +SOURCE_DIR="noto-fonts-2.7-NotoSlimVF" +CHECKSUM_SHA256="edcf0d838ae0aeac580bd2cc322d493e1eb42179bf2cbba7caf024501e1fc25f" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -90,8 +89,7 @@ INSTALL() FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} - rm -f hinted/*UI-*.ttf # remove unneeded UI versions - cp hinted/*.ttf ${FONTDIR} + cp hinted/!(*UI)/*.ttf ${FONTDIR} packageEntries chroscore \ ${FONTDIR}/Arimo*.ttf \ @@ -102,5 +100,5 @@ INSTALL() ${FONTDIR}/*Condensed*.ttf packageEntries regional \ - ${FONTDIR}/Noto!(*Display*.ttf|Mono-*.ttf|Sans-*.ttf|SansMono-*.ttf|Serif-*.ttf|*Symbols*.ttf|SansThai-*.ttf|SerifThai-*.ttf) + ${FONTDIR}/Noto!(*Display*.ttf|Sans-*.ttf|SansMono-*.ttf|Serif-*.ttf|*Symbols*.ttf|SansThai-*.ttf|SerifThai-*.ttf) } diff --git a/media-fonts/noto/noto-20171026.recipe b/media-fonts/noto/noto-20171026.recipe deleted file mode 100644 index 8efc1753b..000000000 --- a/media-fonts/noto/noto-20171026.recipe +++ /dev/null @@ -1,107 +0,0 @@ -SUMMARY="The Noto font" -DESCRIPTION="The Noto fonts have superseded the Droid fonts, which were \ -originally designed for the use in Google's Android. Noto's aim is to be a \ -free for everyone, with beautiful glyphs for all languages, looking good \ -especially when multiple styles and weights and even languages are mixed on \ -a page. - -This package contains the 'sans-serif' and 'serif' typefaces in various \ -styles for the latin, cyrillic and thai alphabets, as well as a 'monospaced' \ -version. Also included is an unhinted 'symbols' font." - -SUMMARY_chroscore="The Noto font (Chrome OS core font)" -DESCRIPTION_chroscore="The Noto fonts have superseded the Droid fonts, which \ -were originally designed for the use in Google's Android. Noto's aim is to be \ -a free for everyone, with beautiful glyphs for all languages, looking good \ -especially when multiple styles and weights and even languages are mixed on \ -a page. - -This package contains the Chrome OS core fonts: Arimo and Cousine have a \ -'sans-serif' typeface, Tinos is a 'serif' font." - -SUMMARY_condensed="The Noto font (condensed variants)" -DESCRIPTION_condensed="The Noto fonts have superseded the Droid fonts, which \ -were originally designed for the use in Google's Android. Noto's aim is to be \ -a free for everyone, with beautiful glyphs for all languages, looking good \ -especially when multiple styles and weights and even languages are mixed on \ -a page. - -This package contains the condensed variants of the core Noto fonts." - -SUMMARY_regional="The Noto font (special language/region version)" -DESCRIPTION_regional="The Noto fonts have superseded the Droid fonts, \ -which were originally designed for the use in Google's Android. \ -Noto's aim is to be a free for everyone, \ -with beautiful glyphs for all languages, looking good \ -especially when multiple styles and weights and even languages are mixed on \ -a page. - -This package contains the Noto fonts ('sans-serif' and where applicable \ -'serif') for: - -Arabic, Armenian -Bengali -Cham -Devanagari -Ethiopic -Georgian, Gujarati, Gurmukhi -Hebrew, Hindi -Kannada, Khmer -Lao -Malayalam, Myanmar -Oriya -Sinhala -Tamil, Telugu, Thaana, Tibetan" -HOMEPAGE="https://www.google.com/get/noto/" -COPYRIGHT="2015, 2016, 2017 Google Inc. -2014, 2015 Adobe Systems Incorporated (http://www.adobe.com/)" -LICENSE="SIL Open Font License v1.1" -REVISION="5" -srcGitRev="95558bd828a48c17a5cbe7f9d971495afcd16abd" -SOURCE_URI="https://github.com/googlei18n/noto/archive/$srcGitRev.tar.gz" -CHECKSUM_SHA256="41b6eded5544d9c38ac9b897d43e582f1cc49e62c5e4e7fa6955a306b67f3c68" -SOURCE_DIR="noto-fonts-$srcGitRev" - -ARCHITECTURES="?any" -DISABLE_SOURCE_PACKAGE=yes - -PROVIDES=" - noto = $portVersion - " - -PROVIDES_chroscore=" - noto_chroscore = $portVersion - " - -PROVIDES_condensed=" - noto_condensed = $portVersion - " - -PROVIDES_regional=" - noto_regional = $portVersion - " - -# Enable bash extended globbing to more easily exclude non-regional fonts from -# the regional package. -shopt -s extglob - -INSTALL() -{ - FONTDIR=$fontsDir/ttfonts - mkdir -p ${FONTDIR} - - rm -f hinted/*UI-*.ttf # remove unneeded UI versions - rm -f hinted/NotoMono-Regular.ttf # remove, was superseded by NotoSansMono - cp hinted/*.ttf ${FONTDIR} - - packageEntries chroscore \ - ${FONTDIR}/Arimo*.ttf \ - ${FONTDIR}/Cousine*.ttf \ - ${FONTDIR}/Tinos*.ttf - - packageEntries condensed \ - ${FONTDIR}/*Condensed*.ttf - - packageEntries regional \ - ${FONTDIR}/Noto!(*Display*.ttf|Mono-*.ttf|Sans-*.ttf|SansMono-*.ttf|Serif-*.ttf|*Symbols*.ttf|SansThai-*.ttf|SerifThai-*.ttf) -}