From d064d6c6da9a2c0b4c723c81a972a17aa3b7ab01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 21 Aug 2022 10:47:38 +0700 Subject: [PATCH] google-fonts-ttf: update to 20220819. --- .../google-fonts-ttf/files/dup-20190605.lst | 123 ------------------ srcpkgs/google-fonts-ttf/files/dup.lst | 31 ++++- srcpkgs/google-fonts-ttf/template | 25 ++-- 3 files changed, 43 insertions(+), 136 deletions(-) delete mode 100644 srcpkgs/google-fonts-ttf/files/dup-20190605.lst diff --git a/srcpkgs/google-fonts-ttf/files/dup-20190605.lst b/srcpkgs/google-fonts-ttf/files/dup-20190605.lst deleted file mode 100644 index d5150ac99fd..00000000000 --- a/srcpkgs/google-fonts-ttf/files/dup-20190605.lst +++ /dev/null @@ -1,123 +0,0 @@ -# conflicting fonts provided by google-fonts-ttf-20190605_2 -amiri-font /usr/share/fonts/TTF/Amiri-Bold.ttf -amiri-font /usr/share/fonts/TTF/Amiri-Regular.ttf -font-b612 /usr/share/fonts/TTF/B612-Bold.ttf -font-b612 /usr/share/fonts/TTF/B612-BoldItalic.ttf -font-b612 /usr/share/fonts/TTF/B612-Italic.ttf -font-b612 /usr/share/fonts/TTF/B612-Regular.ttf -font-b612 /usr/share/fonts/TTF/B612Mono-Bold.ttf -font-b612 /usr/share/fonts/TTF/B612Mono-BoldItalic.ttf -font-b612 /usr/share/fonts/TTF/B612Mono-Italic.ttf -font-b612 /usr/share/fonts/TTF/B612Mono-Regular.ttf -font-fira-ttf /usr/share/fonts/TTF/FiraMono-Bold.ttf -font-fira-ttf /usr/share/fonts/TTF/FiraMono-Medium.ttf -font-fira-ttf /usr/share/fonts/TTF/FiraMono-Regular.ttf -font-fira-ttf /usr/share/fonts/TTF/FiraSans-Bold.ttf -font-fira-ttf /usr/share/fonts/TTF/FiraSans-BoldItalic.ttf -font-fira-ttf /usr/share/fonts/TTF/FiraSans-ExtraBold.ttf -font-fira-ttf /usr/share/fonts/TTF/FiraSans-ExtraBoldItalic.ttf -font-fira-ttf /usr/share/fonts/TTF/FiraSans-ExtraLight.ttf -font-fira-ttf /usr/share/fonts/TTF/FiraSans-ExtraLightItalic.ttf -font-fira-ttf /usr/share/fonts/TTF/FiraSans-Italic.ttf -font-fira-ttf /usr/share/fonts/TTF/FiraSans-Light.ttf -font-fira-ttf /usr/share/fonts/TTF/FiraSans-LightItalic.ttf -font-fira-ttf /usr/share/fonts/TTF/FiraSans-Medium.ttf -font-fira-ttf /usr/share/fonts/TTF/FiraSans-MediumItalic.ttf -font-fira-ttf /usr/share/fonts/TTF/FiraSans-Regular.ttf -font-fira-ttf /usr/share/fonts/TTF/FiraSans-SemiBold.ttf -font-fira-ttf /usr/share/fonts/TTF/FiraSans-SemiBoldItalic.ttf -font-fira-ttf /usr/share/fonts/TTF/FiraSans-Thin.ttf -font-fira-ttf /usr/share/fonts/TTF/FiraSans-ThinItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexMono-Bold.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexMono-BoldItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexMono-ExtraLight.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexMono-ExtraLightItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexMono-Italic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexMono-Light.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexMono-LightItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexMono-Medium.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexMono-MediumItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexMono-Regular.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexMono-SemiBold.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexMono-SemiBoldItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexMono-Thin.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexMono-ThinItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSans-Bold.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSans-BoldItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSans-ExtraLight.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSans-ExtraLightItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSans-Italic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSans-Light.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSans-LightItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSans-Medium.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSans-MediumItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSans-Regular.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSans-SemiBold.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSans-SemiBoldItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSans-Thin.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSans-ThinItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSansCondensed-Bold.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSansCondensed-BoldItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSansCondensed-ExtraLight.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSansCondensed-ExtraLightItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSansCondensed-Italic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSansCondensed-Light.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSansCondensed-LightItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSansCondensed-Medium.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSansCondensed-MediumItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSansCondensed-Regular.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSansCondensed-SemiBold.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSansCondensed-SemiBoldItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSansCondensed-Thin.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSansCondensed-ThinItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSerif-Bold.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSerif-BoldItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSerif-ExtraLight.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSerif-ExtraLightItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSerif-Italic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSerif-Light.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSerif-LightItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSerif-Medium.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSerif-MediumItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSerif-Regular.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSerif-SemiBold.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSerif-SemiBoldItalic.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSerif-Thin.ttf -font-ibm-plex-ttf /usr/share/fonts/TTF/IBMPlexSerif-ThinItalic.ttf -font-manjari /usr/share/fonts/TTF/Manjari-Bold.ttf -font-manjari /usr/share/fonts/TTF/Manjari-Regular.ttf -font-manjari /usr/share/fonts/TTF/Manjari-Thin.ttf -font-material-design-icons-ttf /usr/share/fonts/TTF/MaterialIcons-Regular.ttf -font-vollkorn-ttf /usr/share/fonts/TTF/Vollkorn-Italic.ttf -font-vollkorn-ttf /usr/share/fonts/TTF/Vollkorn-Regular.ttf -fonts-croscore-ttf /usr/share/fonts/TTF/Arimo-Bold.ttf -fonts-croscore-ttf /usr/share/fonts/TTF/Arimo-BoldItalic.ttf -fonts-croscore-ttf /usr/share/fonts/TTF/Arimo-Italic.ttf -fonts-croscore-ttf /usr/share/fonts/TTF/Arimo-Regular.ttf -fonts-croscore-ttf /usr/share/fonts/TTF/Cousine-Bold.ttf -fonts-croscore-ttf /usr/share/fonts/TTF/Cousine-BoldItalic.ttf -fonts-croscore-ttf /usr/share/fonts/TTF/Cousine-Italic.ttf -fonts-croscore-ttf /usr/share/fonts/TTF/Cousine-Regular.ttf -fonts-croscore-ttf /usr/share/fonts/TTF/Tinos-Bold.ttf -fonts-croscore-ttf /usr/share/fonts/TTF/Tinos-BoldItalic.ttf -fonts-croscore-ttf /usr/share/fonts/TTF/Tinos-Italic.ttf -fonts-croscore-ttf /usr/share/fonts/TTF/Tinos-Regular.ttf -fonts-roboto-ttf /usr/share/fonts/TTF/Roboto-Black.ttf -fonts-roboto-ttf /usr/share/fonts/TTF/Roboto-BlackItalic.ttf -fonts-roboto-ttf /usr/share/fonts/TTF/Roboto-Bold.ttf -fonts-roboto-ttf /usr/share/fonts/TTF/Roboto-BoldItalic.ttf -fonts-roboto-ttf /usr/share/fonts/TTF/Roboto-Italic.ttf -fonts-roboto-ttf /usr/share/fonts/TTF/Roboto-Light.ttf -fonts-roboto-ttf /usr/share/fonts/TTF/Roboto-LightItalic.ttf -fonts-roboto-ttf /usr/share/fonts/TTF/Roboto-Medium.ttf -fonts-roboto-ttf /usr/share/fonts/TTF/Roboto-MediumItalic.ttf -fonts-roboto-ttf /usr/share/fonts/TTF/Roboto-Regular.ttf -fonts-roboto-ttf /usr/share/fonts/TTF/Roboto-Thin.ttf -fonts-roboto-ttf /usr/share/fonts/TTF/Roboto-ThinItalic.ttf -fonts-roboto-ttf /usr/share/fonts/TTF/RobotoCondensed-Bold.ttf -fonts-roboto-ttf /usr/share/fonts/TTF/RobotoCondensed-BoldItalic.ttf -fonts-roboto-ttf /usr/share/fonts/TTF/RobotoCondensed-Italic.ttf -fonts-roboto-ttf /usr/share/fonts/TTF/RobotoCondensed-Light.ttf -fonts-roboto-ttf /usr/share/fonts/TTF/RobotoCondensed-LightItalic.ttf -fonts-roboto-ttf /usr/share/fonts/TTF/RobotoCondensed-Regular.ttf -ttf-material-icons /usr/share/fonts/TTF/MaterialIcons-Regular.ttf diff --git a/srcpkgs/google-fonts-ttf/files/dup.lst b/srcpkgs/google-fonts-ttf/files/dup.lst index 38ba131de63..ed88c5aff43 100644 --- a/srcpkgs/google-fonts-ttf/files/dup.lst +++ b/srcpkgs/google-fonts-ttf/files/dup.lst @@ -1,5 +1,26 @@ -font-firacode /usr/share/fonts/TTF/FiraCode-Bold.ttf -font-firacode /usr/share/fonts/TTF/FiraCode-Retina.ttf -font-firacode /usr/share/fonts/TTF/FiraCode-Regular.ttf -font-firacode /usr/share/fonts/TTF/FiraCode-Light.ttf -font-firacode /usr/share/fonts/TTF/FiraCode-Medium.ttf +apache/arimo +apache/cousine +apache/roboto +apache/tinos +ofl/amiri +ofl/amiriquran +ofl/amiriqurancolored +ofl/b612 +ofl/b612mono +ofl/firacode +ofl/firamono +ofl/firasans +ofl/ibmplexmono +ofl/ibmplexsans +ofl/ibmplexsansarabic +ofl/ibmplexsanscondensed +ofl/ibmplexsansdevanagari +ofl/ibmplexsanshebrew +ofl/ibmplexsanskr +ofl/ibmplexsansthai +ofl/ibmplexsansthailooped +ofl/ibmplexserif +ofl/manjari +ofl/opensans +ofl/sourcesans3 +ofl/vollkorn diff --git a/srcpkgs/google-fonts-ttf/template b/srcpkgs/google-fonts-ttf/template index 63c5c0448a0..e05ab559099 100644 --- a/srcpkgs/google-fonts-ttf/template +++ b/srcpkgs/google-fonts-ttf/template @@ -1,26 +1,35 @@ # Template file for 'google-fonts-ttf' pkgname=google-fonts-ttf -version=20210628 +version=20220819 revision=1 -_githash=90395889ed44cbd1bce429834020bb81c4d6e88b +_githash=4d93a40d26493aa652ce200dab43ed80e2194213 wrksrc="fonts-${_githash}" # Those fonts were provided by google-fonts-ttf depends="font-util cantarell-fonts noto-fonts-ttf amiri-font fonts-croscore-ttf font-b612 font-fira-ttf font-ibm-plex-ttf font-manjari font-material-design-icons-ttf + ttf-opensans source-sans-pro fonts-roboto-ttf font-vollkorn-ttf ttf-ubuntu-font-family" -short_desc="TrueType fonts from the Google Fonts project" +short_desc="Google's Collection of Fonts" maintainer="Orphaned " license="Apache-2.0, OFL-1.1" homepage="https://www.google.com/fonts" distfiles="https://github.com/google/fonts/archive/${_githash}.tar.gz" -checksum=e60f6e4f72bd5f236d299768212ddfa8cd7e149122afed0a9fde551b6ac3415c +checksum=c57a6b1ad81d97b002f740721528084c54cf88c0e3dfe3436d780d814f0268af font_dirs="/usr/share/fonts/TTF" +post_extract() { + # https://github.com/google/fonts/issues/2106#issuecomment-520067314 + rm -r ofl/adobeblank + xargs rm -r <"$FILESDIR/dup.lst" + # ttf-ubuntu-font-family + rm -r ufl +} + + do_install() { vmkdir usr/share/fonts/TTF - find ofl -type f -name '*.ttf' -exec install -Dm644 '{}' ${DESTDIR}/usr/share/fonts/TTF \; - cd "$DESTDIR" - sed -n 's,^[a-z].* /,,p' "$FILESDIR/dup"*.lst | xargs rm -f - cd "$wrksrc" + find apache ofl \ + -type f -name '*.ttf' -exec \ + install -Dm644 '{}' ${DESTDIR}/usr/share/fonts/TTF \; }