* [PR PATCH] Font drop noarch - Part 2
@ 2020-10-30 22:48 fosslinux
2020-10-30 23:28 ` [PR PATCH] [Updated] " fosslinux
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: fosslinux @ 2020-10-30 22:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 323 bytes --]
There is a new pull request by fosslinux against master on the void-packages repository
https://github.com/fosslinux/void-packages font-drop-noarch
https://github.com/void-linux/void-packages/pull/25993
Font drop noarch - Part 2
A patch file from https://github.com/void-linux/void-packages/pull/25993.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-font-drop-noarch-25993.patch --]
[-- Type: text/x-diff, Size: 23057 bytes --]
From eb1f4baa74a0dc3a34d346ff38ff6c03295c6f5e Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:24 +1100
Subject: [PATCH 01/31] 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 674bc9e5df46deb35a71861cc6689212e85aa5b2 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:24 +1100
Subject: [PATCH 02/31] 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 471bbf9a4332a58826fda06f19617393ac8b635e Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:25 +1100
Subject: [PATCH 03/31] 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 79fa86591146718f95ef7fd7d354892962276ef1 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:25 +1100
Subject: [PATCH 04/31] 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 6a32dc79c2a9bde3fa03653548e22746dab33f25 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:25 +1100
Subject: [PATCH 05/31] dejavu-fonts-ttf: drop noarch
---
srcpkgs/dejavu-fonts-ttf/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/dejavu-fonts-ttf/template b/srcpkgs/dejavu-fonts-ttf/template
index 88bc1960c99..45141a8ddc6 100644
--- a/srcpkgs/dejavu-fonts-ttf/template
+++ b/srcpkgs/dejavu-fonts-ttf/template
@@ -1,8 +1,7 @@
# Template file for 'dejavu-fonts-ttf'
pkgname=dejavu-fonts-ttf
version=2.37
-revision=1
-archs=noarch
+revision=2
depends="font-util"
font_dirs="/usr/share/fonts/TTF"
short_desc="DejaVu family of TrueType fonts"
From bfa26cc31f6ad2836af2b30aad733bbb1d10668d Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:25 +1100
Subject: [PATCH 06/31] dina-font: drop noarch
---
srcpkgs/dina-font/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/dina-font/template b/srcpkgs/dina-font/template
index 2d4a740eacc..7baf7bab66b 100644
--- a/srcpkgs/dina-font/template
+++ b/srcpkgs/dina-font/template
@@ -1,8 +1,7 @@
# 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"
From 470ab7dfc996310e518649bc72ef31c110c287e3 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:26 +1100
Subject: [PATCH 07/31] 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 8764d2217bcb52a85a2bab29b0fc651fd15f7bc4 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:26 +1100
Subject: [PATCH 08/31] 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 <orphan@voidlinux.org>"
From ff28ea2d68b8bd2ddde9d1859f5bbceb9c8b969c Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:26 +1100
Subject: [PATCH 09/31] figlet-fonts: drop noarch
---
srcpkgs/figlet-fonts/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/figlet-fonts/template b/srcpkgs/figlet-fonts/template
index 36746d35612..f6725905790 100644
--- a/srcpkgs/figlet-fonts/template
+++ b/srcpkgs/figlet-fonts/template
@@ -1,8 +1,7 @@
# Template file for 'figlet-fonts'
pkgname=figlet-fonts
version=20150508
-revision=3
-archs=noarch
+revision=4
create_wrksrc=yes
depends="figlet perl"
short_desc="Additional fonts for figlet"
From f50c7481920c0f408b583610a753ad2048158723 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:27 +1100
Subject: [PATCH 10/31] fonts-croscore-ttf: drop noarch
---
srcpkgs/fonts-croscore-ttf/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/fonts-croscore-ttf/template b/srcpkgs/fonts-croscore-ttf/template
index 2014d2fda6e..4db0a6c256c 100644
--- a/srcpkgs/fonts-croscore-ttf/template
+++ b/srcpkgs/fonts-croscore-ttf/template
@@ -1,8 +1,7 @@
# 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"
From 6a2d9f20802bef10d803f40ea2ddb08f774b482e Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:27 +1100
Subject: [PATCH 11/31] fonts-droid-ttf: drop noarch
---
srcpkgs/fonts-droid-ttf/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/fonts-droid-ttf/template b/srcpkgs/fonts-droid-ttf/template
index cae1c2979c2..8e69923b15e 100644
--- a/srcpkgs/fonts-droid-ttf/template
+++ b/srcpkgs/fonts-droid-ttf/template
@@ -1,8 +1,7 @@
# 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"
From c5d3d3d3260cbfc429b6d96379dd6977e3efb7d5 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:27 +1100
Subject: [PATCH 12/31] 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 ba60daba692f377b475cb16cbaad2392cc506762 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:27 +1100
Subject: [PATCH 13/31] 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 da5f04f845d971a9ba181b7b4a9aefbe92be0c0c Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:28 +1100
Subject: [PATCH 14/31] 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 0bf5f9696fba08ac66d91cb53775519d87546a3f Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:28 +1100
Subject: [PATCH 15/31] 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 14605208e3f6ca1216e2e1bc3ff91c80c599a250 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:28 +1100
Subject: [PATCH 16/31] google-fonts-ttf: drop noarch
---
srcpkgs/google-fonts-ttf/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/google-fonts-ttf/template b/srcpkgs/google-fonts-ttf/template
index 25ac61c5dbe..79217880019 100644
--- a/srcpkgs/google-fonts-ttf/template
+++ b/srcpkgs/google-fonts-ttf/template
@@ -1,8 +1,7 @@
# 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"
From 53db758e7cba2ea7b4740f7e8e57491c6fd1b6be Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:28 +1100
Subject: [PATCH 17/31] 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 23da824a1426c7f317df6cfeff8c2344f758c3bb Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:28 +1100
Subject: [PATCH 18/31] 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 0dc2d49d405f75004646e9b583101654e3cff052 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:29 +1100
Subject: [PATCH 19/31] 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 cb58db7c935aedb80ab8f8e4fb78a87c27912401 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:29 +1100
Subject: [PATCH 20/31] msttcorefonts: drop noarch
---
srcpkgs/msttcorefonts/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/msttcorefonts/template b/srcpkgs/msttcorefonts/template
index 938e03315c1..f4445150adf 100644
--- a/srcpkgs/msttcorefonts/template
+++ b/srcpkgs/msttcorefonts/template
@@ -1,7 +1,7 @@
# 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 <maldridge@voidlinux.org>"
@@ -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 b5ebeb03946a7dfbc6e14a2e84223c9f5922d099 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:29 +1100
Subject: [PATCH 21/31] 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 <cinerea0@protonmail.com>"
@@ -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 d090b6dc013744bd7b835ccee90b001a14c7e2ba Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:29 +1100
Subject: [PATCH 22/31] noto-fonts-cjk: drop noarch
---
srcpkgs/noto-fonts-cjk/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/noto-fonts-cjk/template b/srcpkgs/noto-fonts-cjk/template
index 8f35b2e9307..22494e46b3e 100644
--- a/srcpkgs/noto-fonts-cjk/template
+++ b/srcpkgs/noto-fonts-cjk/template
@@ -1,8 +1,7 @@
# Template file for 'noto-fonts-cjk'
pkgname=noto-fonts-cjk
version=20190416
-revision=1
-archs=noarch
+revision=2
_githash=be6c059ac1587e556e2412b27f5155c8eb3ddbe6
wrksrc="noto-cjk-${_githash}"
depends="font-util"
From bc0871bb123a562cd6975daf39f340410439dfba Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:29 +1100
Subject: [PATCH 23/31] noto-fonts-emoji: drop noarch
---
srcpkgs/noto-fonts-emoji/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/noto-fonts-emoji/template b/srcpkgs/noto-fonts-emoji/template
index 5c467f27551..9d5c176ce14 100644
--- a/srcpkgs/noto-fonts-emoji/template
+++ b/srcpkgs/noto-fonts-emoji/template
@@ -1,8 +1,7 @@
# Template file for 'noto-fonts-emoji'
pkgname=noto-fonts-emoji
version=20200722
-revision=1
-archs=noarch
+revision=2
_githash=d5e261484286d33a1fe8a02676f5907ecc02106f
wrksrc="noto-emoji-${_githash}"
depends="font-util"
From 4e4eb0193c8329c95792842d3ec098b5e8fdd353 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:30 +1100
Subject: [PATCH 24/31] noto-fonts-ttf: drop noarch
---
srcpkgs/noto-fonts-ttf/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/noto-fonts-ttf/template b/srcpkgs/noto-fonts-ttf/template
index 59c5f03f8e6..7367e0a4652 100644
--- a/srcpkgs/noto-fonts-ttf/template
+++ b/srcpkgs/noto-fonts-ttf/template
@@ -1,8 +1,7 @@
# Template file for 'noto-fonts-ttf'
pkgname=noto-fonts-ttf
version=20190926
-revision=1
-archs=noarch
+revision=2
_githash=0fa1dfabd6e3746bb7463399e2813f60d3f1b256
wrksrc="noto-fonts-${_githash}"
depends="font-util"
From 907cce99088ddf50964bc667b2102db2b423dffe Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:30 +1100
Subject: [PATCH 25/31] 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 <nick.hahn@hotmail.de>"
From 6ce1b94ebddb6c38553aa4606948f07d7fa8f2b3 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:30 +1100
Subject: [PATCH 26/31] 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 2cfb804359718e21b0731c0fd235ca24a26ece4f Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:30 +1100
Subject: [PATCH 27/31] 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 780847f5d3ee4a4424e87c677f2753ca8d8bd2a7 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:31 +1100
Subject: [PATCH 28/31] 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 9070285c6bb9456dcfdc2834a06369cb4cec7c33 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:31 +1100
Subject: [PATCH 29/31] 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 9bcd57b8959aacdb2f0d854666be89d5a615e7eb Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:31 +1100
Subject: [PATCH 30/31] 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 6b606665bed6fc82bf2262581603718089abc331 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:32 +1100
Subject: [PATCH 31/31] ttf-ubuntu-font-family: drop noarch
---
srcpkgs/ttf-ubuntu-font-family/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/ttf-ubuntu-font-family/template b/srcpkgs/ttf-ubuntu-font-family/template
index 75d5ac88c83..b13634ea0fb 100644
--- a/srcpkgs/ttf-ubuntu-font-family/template
+++ b/srcpkgs/ttf-ubuntu-font-family/template
@@ -1,8 +1,7 @@
# 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"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] Font drop noarch - Part 2
2020-10-30 22:48 [PR PATCH] Font drop noarch - Part 2 fosslinux
@ 2020-10-30 23:28 ` fosslinux
2020-10-31 14:52 ` Chocimier
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: fosslinux @ 2020-10-30 23:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
There is an updated pull request by fosslinux against master on the void-packages repository
https://github.com/fosslinux/void-packages font-drop-noarch
https://github.com/void-linux/void-packages/pull/25993
Font drop noarch - Part 2
A patch file from https://github.com/void-linux/void-packages/pull/25993.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-font-drop-noarch-25993.patch --]
[-- Type: text/x-diff, Size: 25844 bytes --]
From 998182e53d416a8e0c6041f3512a021def3279ce Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <orphan@voidlinux.org>"
-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 <fosslinux@aussies.space>
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 <lee.wang.gretzky@gmail.com>"
-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 <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <orphan@voidlinux.org>"
From c1edb82c7e028667f9cf29f95f625cb906f0c312 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
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 <leah@vuxu.org>"
-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 <fosslinux@aussies.space>
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 <orphan@voidlinux.org>"
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 <fosslinux@aussies.space>
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 <travankor@tuta.io>"
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 <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <al3hex@gmail.com>"
+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 <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <maldridge@voidlinux.org>"
-# 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 <fosslinux@aussies.space>
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 <cinerea0@protonmail.com>"
@@ -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 <fosslinux@aussies.space>
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 <nick.hahn@hotmail.de>"
From 71e21135761bb9faa9d8fbad31ffbe4b5b1126aa Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <abc@pompel.me>"
-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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Font drop noarch - Part 2
2020-10-30 22:48 [PR PATCH] Font drop noarch - Part 2 fosslinux
2020-10-30 23:28 ` [PR PATCH] [Updated] " fosslinux
@ 2020-10-31 14:52 ` Chocimier
2020-10-31 23:10 ` fosslinux
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Chocimier @ 2020-10-31 14:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2577 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/25993#issuecomment-719944345
Comment:
Ipafont changed disfile url, some more xlint fixes.
Xbps-src cannot fetch nerd-fonts here.
``` diff
diff --git a/srcpkgs/fonts-roboto-ttf/template b/srcpkgs/fonts-roboto-ttf/template
index 1fd8f00e57..7c0f6b0edc 100644
--- a/srcpkgs/fonts-roboto-ttf/template
+++ b/srcpkgs/fonts-roboto-ttf/template
@@ -4,14 +4,14 @@ version=2.138
revision=2
wrksrc=roboto-${version}
depends="font-util"
-font_dirs="/usr/share/fonts/TTF"
-conflicts=google-fonts-ttf
short_desc="Google's signature family of fonts"
maintainer="travankor <travankor@tuta.io>"
license="Apache-2.0"
homepage="https://fonts.google.com/specimen/Roboto"
distfiles="https://github.com/google/roboto/archive/v${version}.tar.gz"
checksum=5427a734ba778333956093f85f5a67b7134ea925ef9dea236a2c5bd0d200341b
+font_dirs="/usr/share/fonts/TTF"
+conflicts=google-fonts-ttf
do_install() {
vmkdir usr/share/fonts/TTF
diff --git a/srcpkgs/ipafont-fonts-otf/template b/srcpkgs/ipafont-fonts-otf/template
index 170ffd8835..8e847fa24d 100644
--- a/srcpkgs/ipafont-fonts-otf/template
+++ b/srcpkgs/ipafont-fonts-otf/template
@@ -10,7 +10,7 @@ short_desc="Japanese OpenType font set"
maintainer="Georg Schabel <gescha@posteo.de>"
license="IPA"
homepage="http://ipafont.ipa.go.jp/"
-distfiles="https://oscdl.ipa.go.jp/IPAfont/IPAfont${_pkgver}.zip"
+distfiles="http://moji.or.jp/wp-content/ipafont/IPAfont/IPAfont${version//./}.zip"
checksum=f755ed79a4b8e715bed2f05a189172138aedf93db0f465b4e20c344a02766fe5
font_dirs="/usr/share/fonts/OTF"
diff --git a/srcpkgs/steam-fonts/template b/srcpkgs/steam-fonts/template
index b3dca3829d..3b9de3c61c 100644
--- a/srcpkgs/steam-fonts/template
+++ b/srcpkgs/steam-fonts/template
@@ -2,17 +2,16 @@
pkgname=steam-fonts
version=1.0.0
revision=4
-hostmakedepends="unzip"
+create_wrksrc=yes
depends="font-util"
short_desc="Fonts to fix scrambled or missing text in steam menus"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="proprietary"
+license="custom:proprietary"
homepage="https://support.steampowered.com/kb_article.php?ref=1974-YFKL-4947"
distfiles="https://support.steampowered.com/downloads/1974-YFKL-4947/SteamFonts.zip"
checksum=a03bcc9581f2896cac39967633fc43546af5ed9d73d505a10cae4016797dfeb1
font_dirs="/usr/share/fonts/steam-fonts"
restricted=yes
-create_wrksrc=yes
do_install() {
vmkdir usr/share/fonts/steam-fonts
```
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Font drop noarch - Part 2
2020-10-30 22:48 [PR PATCH] Font drop noarch - Part 2 fosslinux
2020-10-30 23:28 ` [PR PATCH] [Updated] " fosslinux
2020-10-31 14:52 ` Chocimier
@ 2020-10-31 23:10 ` fosslinux
2020-10-31 23:31 ` [PR PATCH] [Updated] " fosslinux
2020-11-02 17:22 ` [PR PATCH] [Merged]: " Chocimier
4 siblings, 0 replies; 6+ messages in thread
From: fosslinux @ 2020-10-31 23:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 211 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/25993#issuecomment-720000059
Comment:
I thought I tested these :( . Sorry for that!! I'll apply the patch.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] Font drop noarch - Part 2
2020-10-30 22:48 [PR PATCH] Font drop noarch - Part 2 fosslinux
` (2 preceding siblings ...)
2020-10-31 23:10 ` fosslinux
@ 2020-10-31 23:31 ` fosslinux
2020-11-02 17:22 ` [PR PATCH] [Merged]: " Chocimier
4 siblings, 0 replies; 6+ messages in thread
From: fosslinux @ 2020-10-31 23:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
There is an updated pull request by fosslinux against master on the void-packages repository
https://github.com/fosslinux/void-packages font-drop-noarch
https://github.com/void-linux/void-packages/pull/25993
Font drop noarch - Part 2
A patch file from https://github.com/void-linux/void-packages/pull/25993.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-font-drop-noarch-25993.patch --]
[-- Type: text/x-diff, Size: 27274 bytes --]
From 998182e53d416a8e0c6041f3512a021def3279ce Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <orphan@voidlinux.org>"
-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 <fosslinux@aussies.space>
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 <lee.wang.gretzky@gmail.com>"
-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 <fosslinux@aussies.space>
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 <fosslinux@aussies.space>
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 <orphan@voidlinux.org>"
From c1edb82c7e028667f9cf29f95f625cb906f0c312 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
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 <leah@vuxu.org>"
-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 <fosslinux@aussies.space>
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 <orphan@voidlinux.org>"
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 <fosslinux@aussies.space>
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 <travankor@tuta.io>"
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 <fosslinux@aussies.space>
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 9c0827441744b7743a89528649d1645eb1205144 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:27 +1100
Subject: [PATCH 13/28] fonts-roboto-ttf: drop noarch, fix xlint.
---
srcpkgs/fonts-roboto-ttf/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/fonts-roboto-ttf/template b/srcpkgs/fonts-roboto-ttf/template
index 2a268ab3c74..7c0f6b0edc5 100644
--- a/srcpkgs/fonts-roboto-ttf/template
+++ b/srcpkgs/fonts-roboto-ttf/template
@@ -1,18 +1,17 @@
# 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"
-conflicts=google-fonts-ttf
short_desc="Google's signature family of fonts"
maintainer="travankor <travankor@tuta.io>"
license="Apache-2.0"
homepage="https://fonts.google.com/specimen/Roboto"
distfiles="https://github.com/google/roboto/archive/v${version}.tar.gz"
checksum=5427a734ba778333956093f85f5a67b7134ea925ef9dea236a2c5bd0d200341b
+font_dirs="/usr/share/fonts/TTF"
+conflicts=google-fonts-ttf
do_install() {
vmkdir usr/share/fonts/TTF
From 6995c1e186a92cc70d0bbbba43fb42e224067fb1 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
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 070226eb0d157463d5388aed4e97a1d61f480bfc Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
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 2369e10db95483e8c0161d8da5f7123e822bf735 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
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 <al3hex@gmail.com>"
+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 9cdfe08e479dc5a3829dd6b7c4e5e0715f8ff285 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
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 de48ca34dd15c8291eff7704573d6a093e72ed3b Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:28 +1100
Subject: [PATCH 18/28] ipafont-fonts-otf: drop noarch, fix upstream location
---
srcpkgs/ipafont-fonts-otf/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ipafont-fonts-otf/template b/srcpkgs/ipafont-fonts-otf/template
index cd7a474d169..8e847fa24db 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"
@@ -11,7 +10,7 @@ short_desc="Japanese OpenType font set"
maintainer="Georg Schabel <gescha@posteo.de>"
license="IPA"
homepage="http://ipafont.ipa.go.jp/"
-distfiles="https://oscdl.ipa.go.jp/IPAfont/IPAfont${_pkgver}.zip"
+distfiles="http://moji.or.jp/wp-content/ipafont/IPAfont/IPAfont${version//./}.zip"
checksum=f755ed79a4b8e715bed2f05a189172138aedf93db0f465b4e20c344a02766fe5
font_dirs="/usr/share/fonts/OTF"
From 9155a858b9f51b8a38c49ced24a8320a77b5de52 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
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 f7a99500a13dab492750713f872dd49c3a97359a Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
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 <maldridge@voidlinux.org>"
-# 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 7e7aaab0620e8bab20bd25f3795e32de8e984644 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
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 <cinerea0@protonmail.com>"
@@ -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 32b8334b54e7c455a6a02abd310c4e66d152b6ed Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
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 <nick.hahn@hotmail.de>"
From aa1b0c94da97ad7f1176542f6444a9e4dc5b64c3 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 19:38:30 +1100
Subject: [PATCH 23/28] steam-fonts: drop noarch, fix xlint
---
srcpkgs/steam-fonts/template | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/steam-fonts/template b/srcpkgs/steam-fonts/template
index b0f2aa192b5..3b9de3c61c8 100644
--- a/srcpkgs/steam-fonts/template
+++ b/srcpkgs/steam-fonts/template
@@ -1,19 +1,17 @@
# Template file for 'steam-fonts'
pkgname=steam-fonts
version=1.0.0
-revision=3
-archs=noarch
-hostmakedepends="unzip"
+revision=4
+create_wrksrc=yes
depends="font-util"
short_desc="Fonts to fix scrambled or missing text in steam menus"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="proprietary"
+license="custom:proprietary"
homepage="https://support.steampowered.com/kb_article.php?ref=1974-YFKL-4947"
distfiles="https://support.steampowered.com/downloads/1974-YFKL-4947/SteamFonts.zip"
checksum=a03bcc9581f2896cac39967633fc43546af5ed9d73d505a10cae4016797dfeb1
font_dirs="/usr/share/fonts/steam-fonts"
restricted=yes
-create_wrksrc=yes
do_install() {
vmkdir usr/share/fonts/steam-fonts
From df4f53e7f74d5047f8fb72cffbf052ebf9976dd5 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
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 837401acb29532a800111cf5f1dddcab5dc32c64 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
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 0ff6b4b4926b485a2dd366e59aa0cb58d66f93f6 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
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 48529c2d82bc7231db9700dea1538c86207a888b Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
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 1a80089399356513165bb57c7525c5f8adc0ce53 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
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 <abc@pompel.me>"
-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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: Font drop noarch - Part 2
2020-10-30 22:48 [PR PATCH] Font drop noarch - Part 2 fosslinux
` (3 preceding siblings ...)
2020-10-31 23:31 ` [PR PATCH] [Updated] " fosslinux
@ 2020-11-02 17:22 ` Chocimier
4 siblings, 0 replies; 6+ messages in thread
From: Chocimier @ 2020-11-02 17:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 159 bytes --]
There's a merged pull request on the void-packages repository
Font drop noarch - Part 2
https://github.com/void-linux/void-packages/pull/25993
Description:
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-11-02 17:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-30 22:48 [PR PATCH] Font drop noarch - Part 2 fosslinux
2020-10-30 23:28 ` [PR PATCH] [Updated] " fosslinux
2020-10-31 14:52 ` Chocimier
2020-10-31 23:10 ` fosslinux
2020-10-31 23:31 ` [PR PATCH] [Updated] " fosslinux
2020-11-02 17:22 ` [PR PATCH] [Merged]: " Chocimier
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).