From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] noto-fonts-{cjk,ttf}: update
Date: Thu, 29 Sep 2022 01:27:38 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39519@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 527 bytes --]
There is a new pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/noto-fonts
https://github.com/void-linux/void-packages/pull/39519
noto-fonts-{cjk,ttf}: update
- noto-fonts-cjk: update to 20220127.
- noto-fonts-ttf: update to 20220810.
- google-fonts-ttf: remove duplicate noto fonts
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/39519.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/noto-fonts-39519.patch --]
[-- Type: text/x-diff, Size: 6971 bytes --]
From f86fb1fc7b1d7cce14bed13c2ca3d088c7a17b52 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 28 Sep 2022 17:29:48 -0400
Subject: [PATCH 1/3] noto-fonts-cjk: update to 20220127.
---
srcpkgs/noto-fonts-cjk/template | 25 ++++++++++++++++---------
srcpkgs/noto-fonts-cjk/update | 3 +++
2 files changed, 19 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/noto-fonts-cjk/update
diff --git a/srcpkgs/noto-fonts-cjk/template b/srcpkgs/noto-fonts-cjk/template
index 22494e46b3e4..89cafd664d5a 100644
--- a/srcpkgs/noto-fonts-cjk/template
+++ b/srcpkgs/noto-fonts-cjk/template
@@ -1,21 +1,28 @@
# Template file for 'noto-fonts-cjk'
pkgname=noto-fonts-cjk
-version=20190416
-revision=2
-_githash=be6c059ac1587e556e2412b27f5155c8eb3ddbe6
-wrksrc="noto-cjk-${_githash}"
+# set to the date of the latest release packaged
+version=20220127
+revision=1
+# the sans and serif variants are released on separate tags
+_sans_version=2.004
+_serif_version=2.001
+create_wrksrc=yes
depends="font-util"
short_desc="Google Noto CJK Fonts"
maintainer="Peter Bui <pnutzh4x0r@gmail.com>"
license="OFL-1.1"
homepage="https://www.google.com/get/noto/help/cjk/"
-#changelog="https://raw.githubusercontent.com/googlefonts/noto-cjk/master/NEWS"
-#changelog_prior="https://raw.githubusercontent.com/googlefonts/noto-cjk/master/HISTORY"
-distfiles="https://codeload.github.com/googlefonts/noto-cjk/tar.gz/${_githash}>${pkgname}-${version}.tar.gz"
-checksum=2ad7fe638b1e99255c3d873dc7e0b8434a896f571abdec1a0698cfab3ef618fe
+changelog="https://raw.githubusercontent.com/googlefonts/noto-cjk/main/Sans/NEWS.md
+ https://raw.githubusercontent.com/googlefonts/noto-cjk/main/Serif/NEWS.md"
+distfiles="https://github.com/googlefonts/noto-cjk/releases/download/Sans${_sans_version}/03_NotoSansCJK-OTC.zip
+ https://github.com/googlefonts/noto-cjk/releases/download/Serif${_serif_version}/04_NotoSerifCJKOTC.zip"
+checksum="528f4e1b25ff3badb0321b38d015d954c4c0de926c7830ef50e4a1948f6a3eed
+ 2f0630f88752d50b11a427bdd71f20f7178219e647c56cbaf36c032dbe1ed9d0"
font_dirs="/usr/share/fonts/noto"
do_install() {
- install -Dm644 Noto*.ttc -t ${DESTDIR}/usr/share/fonts/noto
+ vmkdir usr/share/fonts/noto
+ vcopy "*.ttc" usr/share/fonts/noto
+ vcopy "OTC/*.ttc" usr/share/fonts/noto
vlicense LICENSE
}
diff --git a/srcpkgs/noto-fonts-cjk/update b/srcpkgs/noto-fonts-cjk/update
new file mode 100644
index 000000000000..2586e1641459
--- /dev/null
+++ b/srcpkgs/noto-fonts-cjk/update
@@ -0,0 +1,3 @@
+# not perfect, but good enough
+version="${_sans_version}"
+pattern='/archive/refs/tags/Sans\K[\d.]+(?=\.tar\.gz")'
From 69310cae9dd9475889bbb6d10f910f168289efb9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 28 Sep 2022 19:12:47 -0400
Subject: [PATCH 2/3] noto-fonts-ttf: update to 20220810.
---
srcpkgs/noto-fonts-ttf/template | 35 +++++++++++++++++----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/srcpkgs/noto-fonts-ttf/template b/srcpkgs/noto-fonts-ttf/template
index 7367e0a46526..d4e2580ee22b 100644
--- a/srcpkgs/noto-fonts-ttf/template
+++ b/srcpkgs/noto-fonts-ttf/template
@@ -1,21 +1,25 @@
# Template file for 'noto-fonts-ttf'
pkgname=noto-fonts-ttf
-version=20190926
-revision=2
-_githash=0fa1dfabd6e3746bb7463399e2813f60d3f1b256
+version=20220810
+revision=1
+_githash=2725c70baa8b0176c7577093ba1fc6179aa79478
wrksrc="noto-fonts-${_githash}"
depends="font-util"
short_desc="Google Noto TTF Fonts"
maintainer="Peter Bui <pbui@github.bx612.space>"
license="OFL-1.1"
homepage="https://www.google.com/get/noto/"
-distfiles="https://codeload.github.com/googlefonts/noto-fonts/tar.gz/${_githash}>${pkgname}-${version}.tar.gz"
-checksum=6ca2938b99e4316c6eabdab498f577efb979c4f2aeaf5a3a357ab4e3dcc2c2a5
+# XXX: change to https://github.com/notofonts/notofonts.github.io/tree/main/fonts when migration is complete
+# also see https://github.com/notofonts/noto-fonts/issues/2388
+distfiles="https://github.com/notofonts/noto-fonts/archive/${_githash}.tar.gz"
+checksum=c1238ca0fc1e954ee2be444cafd53c033b13fa93f8a1e88f7137e9e028e6891e
font_dirs="/usr/share/fonts/noto"
do_install() {
- install -Dm644 hinted/Noto*/* -t ${DESTDIR}/usr/share/fonts/noto
- install -Dm644 unhinted/Noto*/* -t ${DESTDIR}/usr/share/fonts/noto
+ # remove duplicates
+ rm hinted/ttf/NotoSansTifinagh/NotoSansTifinagh[AGHRST]*.ttf
+ vmkdir usr/share/fonts/noto
+ vcopy "hinted/ttf/Noto*/*" usr/share/fonts/noto
vlicense LICENSE
}
@@ -23,18 +27,15 @@ noto-fonts-ttf-extra_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - additional variants"
pkg_install() {
- vmove usr/share/fonts/noto/Noto*-ExtraCondensed*.ttf
- vmove usr/share/fonts/noto/Noto*-Condensed*.ttf
- vmove usr/share/fonts/noto/Noto*-SemiCondensed*.ttf
+ vmove "usr/share/fonts/noto/Noto*-*Condensed*.ttf"
- vmove usr/share/fonts/noto/Noto*-Thin*.ttf
- vmove usr/share/fonts/noto/Noto*-ExtraLight*.ttf
- vmove usr/share/fonts/noto/Noto*-Light*.ttf
+ vmove "usr/share/fonts/noto/Noto*-*Thin*.ttf"
+ vmove "usr/share/fonts/noto/Noto*-*Light*.ttf"
# keep *-Regular*
- vmove usr/share/fonts/noto/Noto*-Medium*.ttf
- vmove usr/share/fonts/noto/Noto*-SemiBold*.ttf
+ vmove "usr/share/fonts/noto/Noto*-*Medium*.ttf"
+ vmove "usr/share/fonts/noto/Noto*-*SemiBold*.ttf"
# keep *-Bold*
- vmove usr/share/fonts/noto/Noto*-ExtraBold*.ttf
- vmove usr/share/fonts/noto/Noto*-Black*.ttf
+ vmove "usr/share/fonts/noto/Noto*-*ExtraBold*.ttf"
+ vmove "usr/share/fonts/noto/Noto*-*Black*.ttf"
}
}
From 5e9f039c185947cb103cd993b380d49ca3165f1f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 28 Sep 2022 19:26:31 -0400
Subject: [PATCH 3/3] google-fonts-ttf: remove duplicate noto fonts
---
srcpkgs/google-fonts-ttf/files/dup.lst | 2 --
srcpkgs/google-fonts-ttf/template | 4 +++-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/google-fonts-ttf/files/dup.lst b/srcpkgs/google-fonts-ttf/files/dup.lst
index 6dbf0b0ea32b..ed88c5aff435 100644
--- a/srcpkgs/google-fonts-ttf/files/dup.lst
+++ b/srcpkgs/google-fonts-ttf/files/dup.lst
@@ -21,8 +21,6 @@ ofl/ibmplexsansthai
ofl/ibmplexsansthailooped
ofl/ibmplexserif
ofl/manjari
-ofl/notocoloremoji
-ofl/notocoloremojicompattest
ofl/opensans
ofl/sourcesans3
ofl/vollkorn
diff --git a/srcpkgs/google-fonts-ttf/template b/srcpkgs/google-fonts-ttf/template
index 190cccbc6160..d175da1e8f96 100644
--- a/srcpkgs/google-fonts-ttf/template
+++ b/srcpkgs/google-fonts-ttf/template
@@ -1,7 +1,7 @@
# Template file for 'google-fonts-ttf'
pkgname=google-fonts-ttf
version=20220819
-revision=2
+revision=3
_githash=4d93a40d26493aa652ce200dab43ed80e2194213
wrksrc="fonts-${_githash}"
# Those fonts were provided by google-fonts-ttf
@@ -24,6 +24,8 @@ post_extract() {
xargs rm -r <"$FILESDIR/dup.lst"
# ttf-ubuntu-font-family
rm -r ufl
+ # noto-fonts-ttf
+ rm -r ofl/noto*
}
next reply other threads:[~2022-09-28 23:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-28 23:27 classabbyamp [this message]
2022-09-29 0:02 ` classabbyamp
2022-09-29 0:13 ` pbui
2022-09-29 1:21 ` [PR PATCH] [Updated] " classabbyamp
2022-10-01 6:35 ` [PR PATCH] [Merged]: " classabbyamp
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39519@inbox.vuxu.org \
--to=classabbyamp@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).