From 802e27f025be15b51ed6cb65e22423c3e4d2213e Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 8 Aug 2024 05:37:48 -0400 Subject: [PATCH] noto-fonts-cjk: make into metapackage done with doing the weird versioning for sans/serif --- srcpkgs/noto-fonts-cjk-variable | 1 + .../files/70-noto-fonts-cjk.conf | 184 ------------------ srcpkgs/noto-fonts-cjk/template | 35 ++-- srcpkgs/noto-fonts-cjk/update | 4 +- 4 files changed, 13 insertions(+), 211 deletions(-) create mode 120000 srcpkgs/noto-fonts-cjk-variable delete mode 100644 srcpkgs/noto-fonts-cjk/files/70-noto-fonts-cjk.conf diff --git a/srcpkgs/noto-fonts-cjk-variable b/srcpkgs/noto-fonts-cjk-variable new file mode 120000 index 00000000000..23184a15424 --- /dev/null +++ b/srcpkgs/noto-fonts-cjk-variable @@ -0,0 +1 @@ +noto-fonts-cjk \ No newline at end of file diff --git a/srcpkgs/noto-fonts-cjk/files/70-noto-fonts-cjk.conf b/srcpkgs/noto-fonts-cjk/files/70-noto-fonts-cjk.conf deleted file mode 100644 index 459bf5181d2..00000000000 --- a/srcpkgs/noto-fonts-cjk/files/70-noto-fonts-cjk.conf +++ /dev/null @@ -1,184 +0,0 @@ - - - - Properly match Noto CJK font languages - - - ja - - - serif - - - Noto Serif CJK JP - - - - - - ko - - - serif - - - Noto Serif CJK KR - - - - - - zh-cn - - - serif - - - Noto Serif CJK SC - - - - - - zh-tw - - - serif - - - Noto Serif CJK TC - - - - - - zh-hk - - - serif - - - Noto Serif CJK HK - - - - - - ja - - - sans-serif - - - Noto Sans CJK JP - - - - - - ko - - - sans-serif - - - Noto Sans CJK KR - - - - - - zh-cn - - - sans-serif - - - Noto Sans CJK SC - - - - - - zh-tw - - - sans-serif - - - Noto Sans CJK TC - - - - - - zh-hk - - - sans-serif - - - Noto Sans CJK HK - - - - - - ja - - - monospace - - - Noto Sans Mono CJK JP - - - - - - ko - - - monospace - - - Noto Sans Mono CJK KR - - - - - - zh-cn - - - monospace - - - Noto Sans Mono CJK SC - - - - - - zh-tw - - - monospace - - - Noto Sans Mono CJK TC - - - - - - zh-hk - - - monospace - - - Noto Sans Mono CJK HK - - - diff --git a/srcpkgs/noto-fonts-cjk/template b/srcpkgs/noto-fonts-cjk/template index 72f88aef510..2c93af73c59 100644 --- a/srcpkgs/noto-fonts-cjk/template +++ b/srcpkgs/noto-fonts-cjk/template @@ -1,31 +1,18 @@ # Template file for 'noto-fonts-cjk' pkgname=noto-fonts-cjk -# set to the date of the latest release packaged -version=20230817 +reverts="20150616_1 20170601_1 20170601_2 20170601_3 20190416_1 20190416_2 + 20220127_1 20220127_2 20230817_1" +version=1 revision=1 -# the sans and serif variants are released on separate tags -_sans_version=2.004 -_serif_version=2.002 -create_wrksrc=yes -depends="font-util" -short_desc="Google Noto CJK Fonts" +build_style=meta +depends="noto-fonts-cjk-sans noto-fonts-cjk-serif" +short_desc="Google Noto CJK fonts (meta package)" maintainer="classabbyamp " license="OFL-1.1" -homepage="https://www.google.com/get/noto/help/cjk/" -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 - 941985d9fd860492d15640b53edc9668d568877140c524ccd83deb3d9b7a2950" -font_dirs="/usr/share/fonts/noto" +homepage="https://github.com/notofonts/noto-cjk" -do_install() { - vmkdir usr/share/fonts/noto - vcopy "*.ttc" usr/share/fonts/noto - vcopy "OTC/*.ttc" usr/share/fonts/noto - vinstall ${FILESDIR}/70-noto-fonts-cjk.conf 644 usr/share/fontconfig/conf.avail - vmkdir etc/fonts/conf.d - ln -sf /usr/share/fontconfig/conf.avail/70-noto-fonts-cjk.conf ${DESTDIR}/etc/fonts/conf.d/ - vlicense LICENSE +noto-fonts-cjk-variable_package() { + build_style=meta + short_desc="${short_desc/fonts/variable weight &}" + depends="noto-fonts-cjk-sans-variable noto-fonts-cjk-serif-variable" } diff --git a/srcpkgs/noto-fonts-cjk/update b/srcpkgs/noto-fonts-cjk/update index 2586e164145..4cf35d74f56 100644 --- a/srcpkgs/noto-fonts-cjk/update +++ b/srcpkgs/noto-fonts-cjk/update @@ -1,3 +1 @@ -# not perfect, but good enough -version="${_sans_version}" -pattern='/archive/refs/tags/Sans\K[\d.]+(?=\.tar\.gz")' +disabled="metapackage"