From c12ce23b9a2f525a69af99b58a43ecee91fcbc56 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 28 Sep 2022 17:29:48 -0400 Subject: [PATCH 1/4] noto-fonts-cjk: update to 20220127, adopt. --- srcpkgs/noto-fonts-cjk/template | 27 +++++++++++++++++---------- srcpkgs/noto-fonts-cjk/update | 3 +++ 2 files changed, 20 insertions(+), 10 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..70d8e74a6ec3 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 " +maintainer="classabbyamp " 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 a3678950cfb13eb89c4d77a58a9a459642ae32d4 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 28 Sep 2022 19:12:47 -0400 Subject: [PATCH 2/4] noto-fonts-ttf: update to 20220810, adopt. --- srcpkgs/noto-fonts-ttf/template | 37 +++++++++++++++++---------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/srcpkgs/noto-fonts-ttf/template b/srcpkgs/noto-fonts-ttf/template index 7367e0a46526..13b12d3c23d5 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 " +maintainer="classabbyamp " 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 bd0c224c1430fd0277c9010a104052062f45d60b Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 28 Sep 2022 19:26:31 -0400 Subject: [PATCH 3/4] 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* } From f868ee7f599c58c5711db116109f8bda440cc331 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 28 Sep 2022 21:18:54 -0400 Subject: [PATCH 4/4] noto-fonts-emoji: adopt. --- srcpkgs/noto-fonts-emoji/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/noto-fonts-emoji/template b/srcpkgs/noto-fonts-emoji/template index 1a7845a24856..0cb071ce267c 100644 --- a/srcpkgs/noto-fonts-emoji/template +++ b/srcpkgs/noto-fonts-emoji/template @@ -7,7 +7,7 @@ revision=1 wrksrc=noto-emoji-${version} depends="font-util" short_desc="Google Noto Emoji Fonts" -maintainer="Peter Bui " +maintainer="classabbyamp " license="OFL-1.1" homepage="https://www.google.com/get/noto/" distfiles="https://github.com/googlefonts/noto-emoji/archive/v${version}.tar.gz"