From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] google-fonts-ttf: update to 20210628.
Date: Thu, 01 Jul 2021 03:46:30 +0200 [thread overview]
Message-ID: <20210701014630.E6uEaxsbJ41pX3SohnuThkG3JQHltyUtB_67AidR-hs@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31695@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 829 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/klorophatu/void-packages master
https://github.com/void-linux/void-packages/pull/31695
google-fonts-ttf: update to 20210628.
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
Fixes https://github.com/void-linux/void-packages/issues/31604
@asergi
A patch file from https://github.com/void-linux/void-packages/pull/31695.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-31695.patch --]
[-- Type: text/x-diff, Size: 11126 bytes --]
From 99d3775c5860c1375060bb8589efde4f0f555411 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 1 Jul 2021 08:31:31 +0700
Subject: [PATCH] google-fonts-ttf: update to 20210628.
Close: #31695
---
.../google-fonts-ttf/files/dup-20190605.lst | 123 ++++++++++++++++++
srcpkgs/google-fonts-ttf/files/dup.lst | 5 +
srcpkgs/google-fonts-ttf/template | 32 +++--
3 files changed, 143 insertions(+), 17 deletions(-)
create mode 100644 srcpkgs/google-fonts-ttf/files/dup-20190605.lst
create mode 100644 srcpkgs/google-fonts-ttf/files/dup.lst
diff --git a/srcpkgs/google-fonts-ttf/files/dup-20190605.lst b/srcpkgs/google-fonts-ttf/files/dup-20190605.lst
new file mode 100644
index 000000000000..d5150ac99fd5
--- /dev/null
+++ b/srcpkgs/google-fonts-ttf/files/dup-20190605.lst
@@ -0,0 +1,123 @@
+# 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
new file mode 100644
index 000000000000..38ba131de638
--- /dev/null
+++ b/srcpkgs/google-fonts-ttf/files/dup.lst
@@ -0,0 +1,5 @@
+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
diff --git a/srcpkgs/google-fonts-ttf/template b/srcpkgs/google-fonts-ttf/template
index 1edd6677dc2e..63c5c0448a00 100644
--- a/srcpkgs/google-fonts-ttf/template
+++ b/srcpkgs/google-fonts-ttf/template
@@ -1,28 +1,26 @@
# Template file for 'google-fonts-ttf'
pkgname=google-fonts-ttf
-version=20190605
-revision=2
-_githash=87776223497b72be361b5c08ba16e9c659209f37
+version=20210628
+revision=1
+_githash=90395889ed44cbd1bce429834020bb81c4d6e88b
wrksrc="fonts-${_githash}"
-depends="font-util cantarell-fonts noto-fonts-ttf"
+# 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
+ fonts-roboto-ttf font-vollkorn-ttf ttf-ubuntu-font-family"
short_desc="TrueType fonts from the Google Fonts project"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="Apache-2.0, OFL-1.1, custom:UFL-1.0"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0, OFL-1.1"
homepage="https://www.google.com/fonts"
distfiles="https://github.com/google/fonts/archive/${_githash}.tar.gz"
-checksum=84b24d1efa96316f2aab9be9d5352923ab8c2622a15d38bdff22c518c6a1deb1
-conflicts="fonts-croscore-ttf>=0 font-fira-ttf>=0 font-sourcecodepro>=0
- ttf-ubuntu-font-family>=0 font-vollkorn-ttf>=0"
+checksum=e60f6e4f72bd5f236d299768212ddfa8cd7e149122afed0a9fde551b6ac3415c
font_dirs="/usr/share/fonts/TTF"
do_install() {
vmkdir usr/share/fonts/TTF
- find . -type f -name '*.ttf' -exec install -Dm644 '{}' ${DESTDIR}/usr/share/fonts/TTF \;
-}
-
-post_install() {
- # remove cantarell and noto fonts
- rm -f ${DESTDIR}/usr/share/fonts/TTF/Cantarell-*.ttf
- rm -f ${DESTDIR}/usr/share/fonts/TTF/Noto*-*.ttf
- vlicense ufl/ubuntu/LICENCE.txt
+ 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"
}
next prev parent reply other threads:[~2021-07-01 1:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-28 17:12 [PR PATCH] " klorophatu
2021-07-01 1:46 ` sgn [this message]
2021-07-01 1:46 ` sgn
2021-07-02 13:04 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210701014630.E6uEaxsbJ41pX3SohnuThkG3JQHltyUtB_67AidR-hs@z \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).