From 998182e53d416a8e0c6041f3512a021def3279ce Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:24 +1100 Subject: [PATCH 01/28] amiri-font: drop noarch --- srcpkgs/amiri-font/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/amiri-font/template b/srcpkgs/amiri-font/template index 039962190ae..396c9865c5c 100644 --- a/srcpkgs/amiri-font/template +++ b/srcpkgs/amiri-font/template @@ -1,8 +1,7 @@ # Template file for 'amiri-font' pkgname=amiri-font version=0.113 -revision=1 -archs=noarch +revision=2 wrksrc="Amiri-${version}" hostmakedepends="unzip" depends="font-util" From de94191ac063161286c137ec183fb8e17ea506ec Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:24 +1100 Subject: [PATCH 02/28] artwiz-fonts: drop noarch --- srcpkgs/artwiz-fonts/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/artwiz-fonts/template b/srcpkgs/artwiz-fonts/template index ceea828ee9c..37a29b49108 100644 --- a/srcpkgs/artwiz-fonts/template +++ b/srcpkgs/artwiz-fonts/template @@ -1,8 +1,7 @@ # Template file for 'artwiz-fonts' pkgname=artwiz-fonts version=1.3 -revision=4 -archs=noarch +revision=5 create_wrksrc=yes depends="font-util mkfontdir" short_desc="Small futuristic ASCII fonts for X" From 09985aaabfe49cf1719b597a6d0e513e8f787851 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:25 +1100 Subject: [PATCH 03/28] cantarell-fonts: drop noarch --- srcpkgs/cantarell-fonts/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/cantarell-fonts/template b/srcpkgs/cantarell-fonts/template index 8715c4773b3..f052bb14fd2 100644 --- a/srcpkgs/cantarell-fonts/template +++ b/srcpkgs/cantarell-fonts/template @@ -1,8 +1,7 @@ # Template file for 'cantarell-fonts' pkgname=cantarell-fonts version=0.201 -revision=1 -archs=noarch +revision=2 build_style=meson configure_args="-Dfontsdir=/usr/share/fonts/cantarell -Duseprebuilt=true -Dbuildappstream=true" hostmakedepends="gettext pkg-config meson appstream-glib" From 7e745afd42f72892548430a4e8bd3a84e0f5aacf Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:25 +1100 Subject: [PATCH 04/28] cherry-font: drop noarch --- srcpkgs/cherry-font/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/cherry-font/template b/srcpkgs/cherry-font/template index 496d45988d1..fc6ee3cb292 100644 --- a/srcpkgs/cherry-font/template +++ b/srcpkgs/cherry-font/template @@ -1,8 +1,7 @@ # Template file for 'cherry-font' pkgname=cherry-font version=1.4 -revision=1 -archs=noarch +revision=2 wrksrc="cherry-${version}" hostmakedepends="bdftopcf" depends="font-util" From dcad2061380bc368410098f17dea991512ac24be Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:25 +1100 Subject: [PATCH 05/28] dejavu-fonts-ttf: drop noarch, fix xlint --- srcpkgs/dejavu-fonts-ttf/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/dejavu-fonts-ttf/template b/srcpkgs/dejavu-fonts-ttf/template index 45141a8ddc6..729c4f66a28 100644 --- a/srcpkgs/dejavu-fonts-ttf/template +++ b/srcpkgs/dejavu-fonts-ttf/template @@ -3,13 +3,13 @@ pkgname=dejavu-fonts-ttf version=2.37 revision=2 depends="font-util" -font_dirs="/usr/share/fonts/TTF" short_desc="DejaVu family of TrueType fonts" maintainer="Orphaned " -homepage="http://dejavu-fonts.org/wiki/Main_Page" -license="MIT, Public domain" -distfiles="${SOURCEFORGE_SITE}/dejavu/$pkgname-$version.tar.bz2" +license="MIT, custom:Public Domain" +homepage="https://dejavu-fonts.github.io/" +distfiles="${SOURCEFORGE_SITE}/dejavu/${pkgname}-${version}.tar.bz2" checksum=fa9ca4d13871dd122f61258a80d01751d603b4d3ee14095d65453b4e846e17d7 +font_dirs="/usr/share/fonts/TTF" do_install() { vmkdir usr/share/fonts/TTF From 027d95be5f92b8084bbd014e74cc98a4cbf821cb Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:25 +1100 Subject: [PATCH 06/28] dina-font: drop noarch, fix xlint --- srcpkgs/dina-font/template | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/srcpkgs/dina-font/template b/srcpkgs/dina-font/template index 2d4a740eacc..a1777a33ea8 100644 --- a/srcpkgs/dina-font/template +++ b/srcpkgs/dina-font/template @@ -1,18 +1,16 @@ # Template file for 'dina-font' pkgname=dina-font version=2.93 -revision=2 -archs=noarch +revision=3 create_wrksrc=yes hostmakedepends="bdftopcf font-util unzip" depends="font-util" short_desc="Monospace bitmap font, primarily aimed at programmers" maintainer="Lee Wang " -license="Custom" +license="custom:Dina" homepage="http://www.donationcoder.com/Software/Jibz/Dina/index.html" distfiles="http://ftp.osuosl.org/pub/gentoo/distfiles/dina-${version}.zip" checksum=47792817b7716577727a488952b9892b16966a45dc3ba52e026d59b9d9e20695 - font_dirs="/usr/share/fonts/X11/misc" _ex_pt() { From 144e3427365249bc7caba282fca63506f7620949 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:26 +1100 Subject: [PATCH 07/28] ekushey-fonts-ttf: drop noarch --- srcpkgs/ekushey-fonts-ttf/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/ekushey-fonts-ttf/template b/srcpkgs/ekushey-fonts-ttf/template index 406a5f88969..4862d810d8c 100644 --- a/srcpkgs/ekushey-fonts-ttf/template +++ b/srcpkgs/ekushey-fonts-ttf/template @@ -1,8 +1,7 @@ # Template file for 'ekushey-fonts-ttf' pkgname=ekushey-fonts-ttf version=20191020 -revision=1 -archs=noarch +revision=2 build_style=fetch depends="font-util" short_desc="Bengali fonts from Ekushey project" From 753fe434e9622823505304b333c7a72cad4a6ec2 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:26 +1100 Subject: [PATCH 08/28] envypn-font: drop noarch --- srcpkgs/envypn-font/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/envypn-font/template b/srcpkgs/envypn-font/template index 9f3d7de3075..6c8ab2ff077 100644 --- a/srcpkgs/envypn-font/template +++ b/srcpkgs/envypn-font/template @@ -1,8 +1,7 @@ # Template file for 'envypn-font' pkgname=envypn-font version=1.7.1 -revision=3 -archs=noarch +revision=4 depends="font-util xbps-triggers" short_desc="Readable bitmap font inspired by Envy Code R" maintainer="Orphaned " From c1edb82c7e028667f9cf29f95f625cb906f0c312 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:26 +1100 Subject: [PATCH 09/28] figlet-fonts: drop noarch, install license --- srcpkgs/figlet-fonts/template | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/srcpkgs/figlet-fonts/template b/srcpkgs/figlet-fonts/template index 36746d35612..75052314023 100644 --- a/srcpkgs/figlet-fonts/template +++ b/srcpkgs/figlet-fonts/template @@ -1,18 +1,20 @@ # Template file for 'figlet-fonts' pkgname=figlet-fonts version=20150508 -revision=3 -archs=noarch +revision=4 +_figlet_version=2.2.5 create_wrksrc=yes depends="figlet perl" short_desc="Additional fonts for figlet" maintainer="Leah Neukirchen " -license="BSD" +license="BSD-3-Clause" homepage="http://www.figlet.org/fontdb.cgi" distfiles="ftp://ftp.figlet.org/pub/figlet/fonts/contributed.tar.gz - ftp://ftp.figlet.org/pub/figlet/fonts/international.tar.gz" + ftp://ftp.figlet.org/pub/figlet/fonts/international.tar.gz + ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-${_figlet_version}.tar.gz" checksum="2c569e052e638b28e4205023ae717f7b07e05695b728e4c80f4ce700354b18c8 - e6493f51c96f8671c29ab879a533c50b31ade681acfb59e50bae6b765e70c65a" + e6493f51c96f8671c29ab879a533c50b31ade681acfb59e50bae6b765e70c65a + bf88c40fd0f077dab2712f54f8d39ac952e4e9f2e1882f1195be9e5e4257417d" do_install() { vmkdir usr/share/figlet @@ -20,4 +22,5 @@ do_install() { cp international/*.flf $DESTDIR/usr/share/figlet vbin contributed/bdffonts/bdf2flf.pl bdf2flf rm "${DESTDIR}/usr/share/figlet/banner.flf" + vlicense "figlet-${_figlet_version}/LICENSE" } From 335fc5f9eb7c067723b60fec03219bc3822010b7 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:27 +1100 Subject: [PATCH 10/28] fonts-croscore-ttf: drop noarch, fix xlint --- srcpkgs/fonts-croscore-ttf/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/fonts-croscore-ttf/template b/srcpkgs/fonts-croscore-ttf/template index 2014d2fda6e..8072e5a0557 100644 --- a/srcpkgs/fonts-croscore-ttf/template +++ b/srcpkgs/fonts-croscore-ttf/template @@ -1,17 +1,16 @@ # Template file for 'fonts-croscore-ttf' pkgname=fonts-croscore-ttf version=1.31.0 -revision=2 -archs=noarch +revision=3 wrksrc="croscorefonts-${version}" depends="font-util xbps-triggers" -font_dirs="/usr/share/fonts/TTF" short_desc="TrueType fonts Arimo, Cousine, Tinos and SymbolNeu from Google" maintainer="Orphaned " license="Apache-2.0" homepage="http://www.google.com/fonts/" distfiles="http://gsdview.appspot.com/chromeos-localmirror/distfiles/croscorefonts-${version}.tar.bz2" checksum=672c3487883ec1ef83d9254240d4327b014212abc823d06d15816095867315e1 +font_dirs="/usr/share/fonts/TTF" do_install() { vmkdir usr/share/fonts/TTF From 3c9030e3752406dbbaa0fed15a9bb75bd828cb52 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:27 +1100 Subject: [PATCH 11/28] fonts-droid-ttf: drop noarch, fix xlint --- srcpkgs/fonts-droid-ttf/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/fonts-droid-ttf/template b/srcpkgs/fonts-droid-ttf/template index cae1c2979c2..f93c9b65cff 100644 --- a/srcpkgs/fonts-droid-ttf/template +++ b/srcpkgs/fonts-droid-ttf/template @@ -1,13 +1,10 @@ # Template file for 'fonts-droid-ttf' pkgname=fonts-droid-ttf version=20150613 -revision=1 -archs=noarch +revision=2 _githash=f5de525ee3547b8a69a21aec1e1a3175bc06f442 create_wrksrc=yes depends="font-util" -font_dirs="/usr/share/fonts/TTF" -conflicts="google-fonts-ttf" short_desc="General-purpose Android fonts (CJK support)" maintainer="travankor " license="Apache-2.0" @@ -15,6 +12,8 @@ homepage="http://www.droidfonts.com/droidfonts/" changelog="https://android.googlesource.com/platform/frameworks/base/+log/master/data/fonts" distfiles="https://android.googlesource.com/platform/frameworks/base/+archive/${_githash}/data/fonts.tar.gz" checksum=@722c954d839cc131c17161956c5117624ceeea3f90e01d4d8ad3d38f374000cc +conflicts="google-fonts-ttf" +font_dirs="/usr/share/fonts/TTF" do_install() { vmkdir usr/share/fonts/TTF From a1ca63556171e147516f9f19dbdb6b524275b781 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:27 +1100 Subject: [PATCH 12/28] fonts-nanum-ttf: drop noarch --- srcpkgs/fonts-nanum-ttf/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/fonts-nanum-ttf/template b/srcpkgs/fonts-nanum-ttf/template index 6a2e826673d..3bba3856b17 100644 --- a/srcpkgs/fonts-nanum-ttf/template +++ b/srcpkgs/fonts-nanum-ttf/template @@ -1,8 +1,7 @@ # Template file for 'fonts-nanum-ttf' pkgname=fonts-nanum-ttf version=20180306 -revision=1 -archs=noarch +revision=2 wrksrc=${pkgname%-*}-${version} depends="font-util" short_desc="Nanum Korean fonts" From bb91f11c5703ec7f2c8d41b743586e0d2c5ff4aa Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:27 +1100 Subject: [PATCH 13/28] fonts-roboto-ttf: drop noarch --- srcpkgs/fonts-roboto-ttf/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/fonts-roboto-ttf/template b/srcpkgs/fonts-roboto-ttf/template index 2a268ab3c74..1fd8f00e570 100644 --- a/srcpkgs/fonts-roboto-ttf/template +++ b/srcpkgs/fonts-roboto-ttf/template @@ -1,8 +1,7 @@ # Template file for 'fonts-roboto-ttf' pkgname=fonts-roboto-ttf version=2.138 -revision=1 -archs=noarch +revision=2 wrksrc=roboto-${version} depends="font-util" font_dirs="/usr/share/fonts/TTF" From ba595cdde6b1bb8fac1b6b131a466908a3f955e9 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:28 +1100 Subject: [PATCH 14/28] freefont-ttf: drop noarch --- srcpkgs/freefont-ttf/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/freefont-ttf/template b/srcpkgs/freefont-ttf/template index ec248d2f8c7..dca87f59871 100644 --- a/srcpkgs/freefont-ttf/template +++ b/srcpkgs/freefont-ttf/template @@ -1,8 +1,7 @@ # Template file for 'freefont-ttf' pkgname=freefont-ttf version=20120503 -revision=7 -archs=noarch +revision=8 wrksrc="freefont-${version}" hostmakedepends="unzip" depends="font-util xbps-triggers>=0.58" From c23e7542823906513d9b35eb71ff601e63afdbfb Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:28 +1100 Subject: [PATCH 15/28] gohufont: drop noarch --- srcpkgs/gohufont/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/gohufont/template b/srcpkgs/gohufont/template index c6e43d9c0d1..a44aa42b195 100644 --- a/srcpkgs/gohufont/template +++ b/srcpkgs/gohufont/template @@ -1,8 +1,7 @@ # Template file for 'gohufont' pkgname=gohufont version=2.1 -revision=2 -archs=noarch +revision=3 makedepends="font-util xbps-triggers" depends="$makedepends" short_desc="Programming monospace bitmap" From 54231b4f313c99cef12019f7e99ed967d318ea17 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:28 +1100 Subject: [PATCH 16/28] google-fonts-ttf: drop noarch, xlint, install license --- srcpkgs/google-fonts-ttf/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/google-fonts-ttf/template b/srcpkgs/google-fonts-ttf/template index 25ac61c5dbe..1edd6677dc2 100644 --- a/srcpkgs/google-fonts-ttf/template +++ b/srcpkgs/google-fonts-ttf/template @@ -1,27 +1,28 @@ # Template file for 'google-fonts-ttf' pkgname=google-fonts-ttf version=20190605 -revision=1 -archs=noarch +revision=2 _githash=87776223497b72be361b5c08ba16e9c659209f37 wrksrc="fonts-${_githash}" depends="font-util cantarell-fonts noto-fonts-ttf" -font_dirs="/usr/share/fonts/TTF" short_desc="TrueType fonts from the Google Fonts project" maintainer="Alessio Sergi " +license="Apache-2.0, OFL-1.1, custom:UFL-1.0" homepage="https://www.google.com/fonts" -license="Apache-2.0, OFL-1.1, UFL-1.0" 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" +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 } From 40ac2917bd70bee605f11e0539563d3a97b4d262 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:28 +1100 Subject: [PATCH 17/28] gsfonts: drop noarch --- srcpkgs/gsfonts/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/gsfonts/template b/srcpkgs/gsfonts/template index 5d76979e0ed..7bffdafc025 100644 --- a/srcpkgs/gsfonts/template +++ b/srcpkgs/gsfonts/template @@ -1,8 +1,7 @@ # Template file for 'gsfonts' pkgname=gsfonts version=8.11 -revision=5 -archs=noarch +revision=6 wrksrc=fonts makedepends="font-util font-misc-misc" depends="${makedepends}" From 0a732795959efd14252708bf670b14a6a18fa391 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:28 +1100 Subject: [PATCH 18/28] ipafont-fonts-otf: drop noarch --- srcpkgs/ipafont-fonts-otf/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/ipafont-fonts-otf/template b/srcpkgs/ipafont-fonts-otf/template index cd7a474d169..170ffd88351 100644 --- a/srcpkgs/ipafont-fonts-otf/template +++ b/srcpkgs/ipafont-fonts-otf/template @@ -1,9 +1,8 @@ # Template file for 'ipafont-fonts-otf' pkgname=ipafont-fonts-otf version=003.03 -revision=3 +revision=4 _pkgver=${version/./} -archs=noarch wrksrc="IPAfont${_pkgver}" hostmakedepends="unzip" depends="font-util xbps-triggers" From 6ca491db8dc864917520e6631f5a589a0ccb3047 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:29 +1100 Subject: [PATCH 19/28] liberation-fonts-ttf: drop noarch --- srcpkgs/liberation-fonts-ttf/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/liberation-fonts-ttf/template b/srcpkgs/liberation-fonts-ttf/template index 47663b2b29d..70de747a721 100644 --- a/srcpkgs/liberation-fonts-ttf/template +++ b/srcpkgs/liberation-fonts-ttf/template @@ -1,8 +1,7 @@ # Template file for 'liberation-fonts-ttf' pkgname=liberation-fonts-ttf version=2.1.1 -revision=1 -archs=noarch +revision=2 wrksrc=${pkgname%-*}-${version} build_style=gnu-makefile hostmakedepends="fontforge fonttools" From e0ab20e8ff4686aedfe1cc177c395308c34a92b1 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:29 +1100 Subject: [PATCH 20/28] msttcorefonts: drop noarch, fix xlint --- srcpkgs/msttcorefonts/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/msttcorefonts/template b/srcpkgs/msttcorefonts/template index 938e03315c1..c5a2fafcd20 100644 --- a/srcpkgs/msttcorefonts/template +++ b/srcpkgs/msttcorefonts/template @@ -1,16 +1,16 @@ # Template file for 'msttcorefonts' pkgname=msttcorefonts version=1.3.4 -revision=1 +revision=2 hostmakedepends="cabextract" short_desc="Microsoft Typography Project - corefonts" maintainer="Michael Aldridge " -# Referenced to the *.spec file, the template and mechanism are GPLv2 -# the fonts are licensed in accordance with the Microsoft Font License +# Referenced to the *.spec file, the template and mechanism are GPLv2. +# The fonts are licensed in accordance with the Microsoft Font License # Agreement which has since been removed from the MS website. A very # broken version of this original license "Licen.TXT" is included with # this package. -license="GPL-2" +license="GPL-2.0-or-later, custom:MFLA" homepage="http://corefonts.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/corefonts/wd97vwr32.exe \ ${SOURCEFORGE_SITE}/corefonts/webdin32.exe \ @@ -45,7 +45,6 @@ restricted=yes repository=nonfree # They're just fonts... -archs=noarch # Tell XBPS that these are fonts font_dirs="/usr/share/fonts/TTF" From 2c1efc4c6388abb1791b427bfee83b6a3fe80e95 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:29 +1100 Subject: [PATCH 21/28] nerd-fonts: drop noarch --- srcpkgs/nerd-fonts/template | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/srcpkgs/nerd-fonts/template b/srcpkgs/nerd-fonts/template index a2f2084738b..0481b3cfa7a 100644 --- a/srcpkgs/nerd-fonts/template +++ b/srcpkgs/nerd-fonts/template @@ -1,8 +1,7 @@ # Template file for 'nerd-fonts' pkgname=nerd-fonts version=2.1.0 -revision=2 -archs=noarch +revision=3 depends="font-util xbps-triggers nerd-fonts-ttf nerd-fonts-otf" short_desc="Iconic font aggregator, collection and patcher" maintainer="cinerea0 " @@ -32,7 +31,6 @@ do_install() { } nerd-fonts-otf_package() { - archs=noarch short_desc="Iconic font aggregator, collection and patcher - otf fonts" font_dirs="usr/share/fonts/NerdFonts/otf" depends="font-util xbps-triggers" @@ -42,7 +40,6 @@ nerd-fonts-otf_package() { } nerd-fonts-ttf_package() { - archs=noarch short_desc="Iconic font aggregator, collection and patcher - ttf fonts" font_dirs="usr/share/fonts/NerdFonts/ttf" depends="font-util xbps-triggers" From 0ebacc9cbc162fbe03a17c67f2f5d080a8dc9829 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:30 +1100 Subject: [PATCH 22/28] soundfont-fluid: drop noarch --- srcpkgs/soundfont-fluid/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/soundfont-fluid/template b/srcpkgs/soundfont-fluid/template index dfbe2f089a7..a1902eece15 100644 --- a/srcpkgs/soundfont-fluid/template +++ b/srcpkgs/soundfont-fluid/template @@ -1,8 +1,7 @@ # Template file for 'soundfont-fluid' pkgname=soundfont-fluid version=3.1 -revision=3 -archs=noarch +revision=4 wrksrc="fluid-soundfont-${version}" short_desc="FluidR3 Soundfont" maintainer="Nick Hahn " From 71e21135761bb9faa9d8fbad31ffbe4b5b1126aa Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:30 +1100 Subject: [PATCH 23/28] steam-fonts: drop noarch --- srcpkgs/steam-fonts/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/steam-fonts/template b/srcpkgs/steam-fonts/template index b0f2aa192b5..b3dca3829dd 100644 --- a/srcpkgs/steam-fonts/template +++ b/srcpkgs/steam-fonts/template @@ -1,8 +1,7 @@ # Template file for 'steam-fonts' pkgname=steam-fonts version=1.0.0 -revision=3 -archs=noarch +revision=4 hostmakedepends="unzip" depends="font-util" short_desc="Fonts to fix scrambled or missing text in steam menus" From 9fabd84e631a3959512b1b2b5f122091b4c66f0e Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:30 +1100 Subject: [PATCH 24/28] stlarch-font: drop noarch --- srcpkgs/stlarch-font/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/stlarch-font/template b/srcpkgs/stlarch-font/template index 1c123b7cf0e..f6d27e253fc 100644 --- a/srcpkgs/stlarch-font/template +++ b/srcpkgs/stlarch-font/template @@ -1,8 +1,7 @@ # Template file for 'stlarch-font' pkgname=stlarch-font version=1.5 -revision=2 -archs=noarch +revision=3 wrksrc="stlarch_font-${version}" makedepends="font-util" depends="${makedepends}" From 35927dc21cc57d8876587b8cbf03ed3c755bac34 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:31 +1100 Subject: [PATCH 25/28] terminus-font: drop noarch --- srcpkgs/terminus-font/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/terminus-font/template b/srcpkgs/terminus-font/template index 4a296a8f0ce..92864dd6450 100644 --- a/srcpkgs/terminus-font/template +++ b/srcpkgs/terminus-font/template @@ -1,8 +1,7 @@ # Template file for 'terminus-font' pkgname=terminus-font version=4.48 -revision=2 -archs=noarch +revision=3 build_style=gnu-configure configure_args="--x11dir=/usr/share/fonts/X11/misc --psfdir=/usr/share/kbd/consolefonts" From 5d80fe5b49c5390f7c3867407426240ced9f4ddf Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:31 +1100 Subject: [PATCH 26/28] termsyn-font: drop noarch --- srcpkgs/termsyn-font/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/termsyn-font/template b/srcpkgs/termsyn-font/template index 2d6f574bda5..ac413fb385e 100644 --- a/srcpkgs/termsyn-font/template +++ b/srcpkgs/termsyn-font/template @@ -1,8 +1,7 @@ # Template file for 'termsyn-font' pkgname=termsyn-font version=1.8.7 -revision=2 -archs=noarch +revision=3 wrksrc="termsyn-${version}" makedepends="font-util" depends="${makedepends}" From c5a4ff7fd46b075ccd46ad2e0b93bfe56dfc8670 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:31 +1100 Subject: [PATCH 27/28] tewi-font: drop noarch --- srcpkgs/tewi-font/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/tewi-font/template b/srcpkgs/tewi-font/template index 49e301745d3..082d7e44e19 100644 --- a/srcpkgs/tewi-font/template +++ b/srcpkgs/tewi-font/template @@ -1,8 +1,7 @@ # Template file for 'tewi-font' pkgname=tewi-font version=2.0.2 -revision=2 -archs=noarch +revision=3 hostmakedepends="bdftopcf python3" depends="font-util xbps-triggers" short_desc="Programming monospace bitmap font" From b1127935f109ee3bbdd7591bf3c5d731bb1b99ab Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sun, 25 Oct 2020 19:38:32 +1100 Subject: [PATCH 28/28] ttf-ubuntu-font-family: drop noarch --- srcpkgs/ttf-ubuntu-font-family/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ttf-ubuntu-font-family/template b/srcpkgs/ttf-ubuntu-font-family/template index 75d5ac88c83..dae30c4c704 100644 --- a/srcpkgs/ttf-ubuntu-font-family/template +++ b/srcpkgs/ttf-ubuntu-font-family/template @@ -1,14 +1,13 @@ # Template file for 'ttf-ubuntu-font-family' pkgname=ttf-ubuntu-font-family version=0.83 -revision=2 -archs=noarch +revision=3 wrksrc="ubuntu-font-family-${version}" hostmakedepends="unzip" depends="font-util" short_desc="Ubuntu font family" maintainer="Andrea Brancaleoni " -license="custom" +license="custom:UFL" homepage="https://design.ubuntu.com/font/" distfiles="https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-${version}.zip" checksum=456d7d42797febd0d7d4cf1b782a2e03680bb4a5ee43cc9d06bda172bac05b42