From f24c01b45ce1ef538bd0a179eebde4d2511c3cb7 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 8 Oct 2017 16:21:56 +0200 Subject: [PATCH] Noto: include all non-regional fonts in the main package The previous recipe used imprecise pattern matching which led to some important fonts being put in the regional package. This in turn led to missing block characters in Terminal, breaking our progress bars, for example. --- media-fonts/noto/noto-20170920.recipe | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/media-fonts/noto/noto-20170920.recipe b/media-fonts/noto/noto-20170920.recipe index fab065888..c25857ccc 100644 --- a/media-fonts/noto/noto-20170920.recipe +++ b/media-fonts/noto/noto-20170920.recipe @@ -47,7 +47,7 @@ HOMEPAGE="https://www.google.com/get/noto/" COPYRIGHT="2014, 2015 Adobe Systems Incorporated (http://www.adobe.com/) 2015, 2016, 2017 Google Inc" LICENSE="SIL Open Font License v1.1" -REVISION="1" +REVISION="2" srcGitRev="5a89b487c648c34c2b6d1b9ebb73bb3fab1df4b2" SOURCE_URI="https://github.com/googlei18n/noto/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="9b997df64075f2607d44a080dbe8d4c5890a7210c9ca755aa06244f4a4c23880" @@ -68,12 +68,16 @@ 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 hinted/*UI-*.ttf # remove unneeded UI versions + rm -f hinted/*UI-*.ttf # remove unneeded UI versions cp hinted/*.ttf ${FONTDIR} packageEntries chroscore \ @@ -82,10 +86,5 @@ INSTALL() ${FONTDIR}/Tinos*.ttf packageEntries regional \ - ${FONTDIR}/NotoKufi[^-]*.ttf \ - ${FONTDIR}/NotoNaskh[^-U]*.ttf \ - ${FONTDIR}/NotoSans[^-U]*.ttf \ - ${FONTDIR}/NotoSerif[^-]*.ttf - - cp unhinted/NotoSansSymbols-Regular.ttf ${FONTDIR} + ${FONTDIR}/Noto!(*Display*.ttf|Mono-*.ttf|Sans-*.ttf|SansMono-*.ttf|Serif-*.ttf|*Symbols*.ttf) }