summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorpkfbcedkrz2022-06-01 14:17:00 -0400
committerpkfbcedkrz2022-06-01 14:17:00 -0400
commitf2a6a62fad7ccb676b547c11cf39c7ac7dd0769a (patch)
treeb2cf4e6b4d62e6aa107741cf10ab23425f87fc6f
parente020ab8c28b7d0ace36aa3e2e06d78e4663bdf42 (diff)
downloadaur-f2a6a62fad7ccb676b547c11cf39c7ac7dd0769a.tar.gz
use fonttosfnt-git to generate otb from bdf source
-rw-r--r--.SRCINFO27
-rw-r--r--PKGBUILD50
2 files changed, 36 insertions, 41 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b435a40f8cc..5fab573a7b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
pkgbase = xorg-fonts-100dpi-otb
pkgdesc = X.org 100dpi fonts (OTB version)
pkgver = 1.0.3
- pkgrel = 6
- url = https://xorg.freedesktop.org/
+ pkgrel = 7
+ url = https://gitlab.freedesktop.org/
arch = any
license = custom
- makedepends = fonttosfnt
+ makedepends = fonttosfnt-git
makedepends = xorg-bdftopcf
makedepends = xorg-font-util
makedepends = xorg-mkfontscale
@@ -14,16 +14,15 @@ pkgbase = xorg-fonts-100dpi-otb
provides = xorg-fonts-100dpi
conflicts = xorg-fonts-100dpi
replaces = xorg-fonts-100dpi
- source = https://xorg.freedesktop.org//releases/individual/font/font-adobe-100dpi-1.0.3.tar.bz2
- source = https://xorg.freedesktop.org//releases/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2
- source = https://xorg.freedesktop.org//releases/individual/font/font-bh-100dpi-1.0.3.tar.bz2
- source = https://xorg.freedesktop.org//releases/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
- source = https://xorg.freedesktop.org//releases/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2
- md5sums = 1347c3031b74c9e91dc4dfa53b12f143
- md5sums = 66fb6de561648a6dce2755621d6aea17
- md5sums = 9f11ade089d689b9d59e0f47d26f39cd
- md5sums = c8b73a53dcefe3e8d3907d3500e484a9
- md5sums = 6b223a54b15ecbd5a1bc52312ad790d8
+ source = https://gitlab.freedesktop.org//xorg/font/adobe-100dpi/-/archive/master/adobe-100dpi-master.tar.gz
+ source = https://gitlab.freedesktop.org//xorg/font/adobe-utopia-100dpi/-/archive/master/adobe-utopia-100dpi-master.tar.gz
+ source = https://gitlab.freedesktop.org//xorg/font/bh-100dpi/-/archive/master/bh-100dpi-master.tar.gz
+ source = https://gitlab.freedesktop.org//xorg/font/bh-lucidatypewriter-100dpi/-/archive/master/bh-lucidatypewriter-100dpi-master.tar.gz
+ source = https://gitlab.freedesktop.org//xorg/font/bitstream-100dpi/-/archive/master/bitstream-100dpi-master.tar.gz
+ md5sums = a123d7677bd4dd6c3962f6bee81770e9
+ md5sums = 93631f400edfdf199baef8fdf6756316
+ md5sums = 4e0c07a09e5c1297c8b9490073a928f3
+ md5sums = 23b51799bd440e92e7f70a97943a0272
+ md5sums = 01533309f836494a2bf7c09ca64c1212
pkgname = xorg-fonts-100dpi-otb
-
diff --git a/PKGBUILD b/PKGBUILD
index b061548559d..be6c26b1a60 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,39 @@
-# Maintainer: Ryan Farley <ryan.farley@gmx.com>
-# Contributor: AndyRTR <andyrtr@archlinux.org>
+# Maintainer: pkfbcedkrz <pkfbcedkrz@gmail.com>
+# Contributor: Ryan Farley <ryan.farley@gmx.com>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=xorg-fonts-100dpi-otb
pkgver=1.0.3
-pkgrel=6
+pkgrel=7
pkgdesc="X.org 100dpi fonts (OTB version)"
arch=('any')
-url="https://xorg.freedesktop.org/"
+url="https://gitlab.freedesktop.org/"
license=('custom')
-makedepends=('fonttosfnt' 'xorg-bdftopcf' 'xorg-font-util' 'xorg-mkfontscale' 'xorg-util-macros')
+makedepends=('fonttosfnt-git' 'xorg-bdftopcf' 'xorg-font-util' 'xorg-mkfontscale' 'xorg-util-macros')
depends=('xorg-fonts-alias-100dpi')
replaces=('xorg-fonts-100dpi')
provides=('xorg-fonts-100dpi')
conflicts=('xorg-fonts-100dpi')
-source=(${url}/releases/individual/font/font-adobe-100dpi-1.0.3.tar.bz2
- ${url}/releases/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2
- ${url}/releases/individual/font/font-bh-100dpi-1.0.3.tar.bz2
- ${url}/releases/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
- ${url}/releases/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2)
-md5sums=('1347c3031b74c9e91dc4dfa53b12f143'
- '66fb6de561648a6dce2755621d6aea17'
- '9f11ade089d689b9d59e0f47d26f39cd'
- 'c8b73a53dcefe3e8d3907d3500e484a9'
- '6b223a54b15ecbd5a1bc52312ad790d8')
+source=(${url}/xorg/font/adobe-100dpi/-/archive/master/adobe-100dpi-master.tar.gz
+ ${url}/xorg/font/adobe-utopia-100dpi/-/archive/master/adobe-utopia-100dpi-master.tar.gz
+ ${url}/xorg/font/bh-100dpi/-/archive/master/bh-100dpi-master.tar.gz
+ ${url}/xorg/font/bh-lucidatypewriter-100dpi/-/archive/master/bh-lucidatypewriter-100dpi-master.tar.gz
+ ${url}/xorg/font/bitstream-100dpi/-/archive/master/bitstream-100dpi-master.tar.gz)
+md5sums=('a123d7677bd4dd6c3962f6bee81770e9'
+ '93631f400edfdf199baef8fdf6756316'
+ '4e0c07a09e5c1297c8b9490073a928f3'
+ '23b51799bd440e92e7f70a97943a0272'
+ '01533309f836494a2bf7c09ca64c1212')
build() {
cd "${srcdir}"
- for dir in font-*-100dpi*; do
+ for dir in *; do
if [ -d "${dir}" ]; then
- pushd ${dir}
- ./configure --prefix=/usr \
- --with-fontdir=/usr/share/fonts/100dpi
- make
+ pushd "${dir}"
shopt -s nullglob
- for f in *.pcf.gz; do
- fonttosfnt -r -o "${f/pcf.gz/otb}" "$f"
+ for f in *.bdf; do
+ fonttosfnt -b -c -g 2 -m 2 -o "${f/bdf/otb}" "$f"
done
shopt -u nullglob
popd
@@ -46,10 +44,10 @@ build() {
package() {
cd "${srcdir}"
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- for dir in font-*-100dpi*; do
+ install -m755 -d "${pkgdir}/usr/share/fonts/100dpi"
+ for dir in *; do
if [ -d "${dir}" ]; then
- pushd ${dir}
- make DESTDIR="${pkgdir}" install
+ pushd "${dir}"
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-100dpi-*}"
shopt -s nullglob
for f in *.otb; do
@@ -59,6 +57,4 @@ package() {
popd
fi
done
- rm -f "${pkgdir}"/usr/share/fonts/100dpi/fonts.*
- rm "${pkgdir}"/usr/share/fonts/100dpi/*.pcf.gz
}