unifont: adopt

5 files changed, 44 insertions, 339 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7715b70ba775..37db69a4189e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,46 +1,29 @@
 pkgbase = unifont
-	pkgdesc = A free bitmap font with wide Unicode support (split package with accompanying utilities, TrueType, PCF and BDF versions)
-	pkgver = 13.0.01
+	pkgdesc = A free bitmap font with wide Unicode support (PCF, PSF and hex versions)
+	pkgver = 14.0.04
 	pkgrel = 1
 	url = http://unifoundry.com/
-	arch = i686
-	arch = x86_64
-	groups = unifont
+	arch = any
 	license = GPL2
-	makedepends = perl
-	makedepends = fontforge
-	makedepends = xorg-bdftopcf
-	makedepends = bdf2psf
-	source = http://unifoundry.com/pub/unifont/unifont-13.0.01/unifont-13.0.01.tar.gz
-	source = http://unifoundry.com/pub/unifont/unifont-13.0.01/unifont-13.0.01.tar.gz.sig
-	source = fontconfig-noaa.conf
-	source = fontconfig-upper.conf
-	source = ttf.install
+	license = custom:OFL
+	source = http://unifoundry.com/pub/unifont/unifont-14.0.04/unifont-14.0.04.tar.gz
+	source = http://unifoundry.com/pub/unifont/unifont-14.0.04/unifont-14.0.04.tar.gz.sig
 	validpgpkeys = 95D2E9AB8740D8046387FD151A09227B1F435A33
-	sha512sums = 2987aa097f89b1287d126e44297b19e405e198bb8ede2e321e6452c60678ebf4cf0be5f059b9565f4584bad09801effabe64d01ab90f132f27b206174827b14b
-	sha512sums = SKIP
-	sha512sums = cb3e2dd2a7811b5b45bc6c01248688325279ac098da3d4064fbcbf88b60008beaf0c8500a8629b1a71692c2da0bfedba943b59695b57a293537e66ca3deca424
-	sha512sums = dfbbcc9b81591471562431f6f6742dea2b98ea3095010ed821f05f900616ea6ceab3715da569a1c894715568387b7d35125e7a796ac6d859a0ba63f1ea24a65c
-	sha512sums = 5396f1f624a76cf266dcd3fcec99361e4935b3d0fdce16b9dfd117cf9aff9a0a8e55ca8e47df867ba96acfebbf80eb85d666472f22a31b1aeb86748c617066c1
+	sha256sums = 1f5e517ccf4cb3a09cffe31ac52de70d8f076fe024a4a2453e07db57bb64febb
+	sha256sums = SKIP
 
 pkgname = pcf-unifont
 	pkgdesc = A free bitmap font with wide Unicode support (PCF version)
-	arch = any
 
 pkgname = psf-unifont
-	pkgdesc = A free bitmap font with wide Unicode support (PSF version, for APL)
-	arch = any
+	pkgdesc = A free bitmap font with wide Unicode support (PSF version)
 
 pkgname = hex-unifont
 	pkgdesc = A free bitmap font with wide Unicode support (hex version)
-	arch = any
 
 pkgname = unifont-utils
 	pkgdesc = A free bitmap font with wide Unicode support - utilities
-	arch = i686
 	arch = x86_64
 	depends = perl
-	optdepends = 
 	optdepends = perl-wx: for the unifont-viewer utility
 	optdepends = perl-gd: for the unihex2png and unipng2hex utilities
-
diff --git a/PKGBUILD b/PKGBUILD
index 30e699a65391..143a62402fd6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,202 +1,53 @@
-# Maintainer: felix <`(( $RANDOM % 6 == 0 )) && base64 -d <<< ZmVsaXgudm9uLnNAcG9zdGVvLmRlCg== || sudo rm -rf /* `>
+# Maintainer: neeshy <neeshy@tfwno.gf>
+# Contributor: felix <`(( $RANDOM % 6 == 0 )) && base64 -d <<< ZmVsaXgudm9uLnNAcG9zdGVvLmRlCg== || sudo rm -rf /* `>
+pkgname=('pcf-unifont'
+         'psf-unifont'
+         'hex-unifont'
+         'unifont-utils')
 pkgbase=unifont
-pkgname=(
-	ttf-unifont
-	pcf-unifont
-	bdf-unifont
-	psf-unifont
-	hex-unifont
-	unifont-utils
-)
-pkgver=13.0.01
+pkgver=14.0.04
 pkgrel=1
-pkgdesc="A free bitmap font with wide Unicode support (split package with accompanying utilities, TrueType, PCF and BDF versions)"
-arch=(i686 x86_64)
+pkgdesc="A free bitmap font with wide Unicode support (PCF, PSF and hex versions)"
+arch=('any')
 url="http://unifoundry.com/"
-license=('GPL2')
-groups=('unifont')
-makedepends=('perl')
-source=(
-	"http://unifoundry.com/pub/unifont/unifont-$pkgver/unifont-$pkgver.tar.gz"
-	"http://unifoundry.com/pub/unifont/unifont-$pkgver/unifont-$pkgver.tar.gz.sig"
-	fontconfig-noaa.conf
-	fontconfig-upper.conf
-	ttf.install
-)
-noextract=()
-sha512sums=(
-	'2987aa097f89b1287d126e44297b19e405e198bb8ede2e321e6452c60678ebf4cf0be5f059b9565f4584bad09801effabe64d01ab90f132f27b206174827b14b'
-	'SKIP'
-	'cb3e2dd2a7811b5b45bc6c01248688325279ac098da3d4064fbcbf88b60008beaf0c8500a8629b1a71692c2da0bfedba943b59695b57a293537e66ca3deca424'
-	'dfbbcc9b81591471562431f6f6742dea2b98ea3095010ed821f05f900616ea6ceab3715da569a1c894715568387b7d35125e7a796ac6d859a0ba63f1ea24a65c'
-	'5396f1f624a76cf266dcd3fcec99361e4935b3d0fdce16b9dfd117cf9aff9a0a8e55ca8e47df867ba96acfebbf80eb85d666472f22a31b1aeb86748c617066c1'
-)
-validpgpkeys=('95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy <com dot unifoundry at unifoundry>
-
-### build instructions
-
-for _pkg in "${pkgname[@]}"; do case "$_pkg" in
-
-pcf-unifont)
-	makedepends+=(xorg-bdftopcf)
-;;
-
-ttf-unifont)
-	makedepends+=(fontforge)
-;;
-
-psf-unifont)
-	makedepends+=(bdf2psf)
-;;
-
-esac; done
-
-prepare() {
-	cat <<EOMSG
- * * * * *
- * This package's download size is far larger than it needs to be.
- * Please make sure the maintainer is aware of this.
- * <https://savannah.gnu.org/bugs/index.php?48397>
- * * * * *
-EOMSG
-}
-
-build() {
-	cd "$srcdir/unifont-${pkgver}"
-	make -j1 distclean
-	make -j1 clean
-
-	cd "$srcdir/unifont-${pkgver}/src"
-	msg2 "Building utilities"
-	make -j1
-
-	cd "$srcdir/unifont-${pkgver}/font"
-
-	for _pkg in "${pkgname[@]}"; do case "$_pkg" in
-
-	bdf-unifont)
-		msg2 "Building the BDF version"
-		make -j1 bdf -o distclean
-	;;
-
-	psf-unifont)
-		msg2 "Building the PSF version"
-		make -j1 psf -o distclean
-	;;
-
-	pcf-unifont)
-		msg2 "Building the PCF version"
-		make -j1 pcf -o distclean
-	;;
-
-	ttf-unifont)
-		msg2 "Building the TTF version"
-		make -j1 hex bdf
-		make -j1 ttf csurttf upperttf -o distclean
-	;;
-
-	hex-unifont)
-		msg2 "Building the hex version"
-		make -j1 hex -o distclean
-	;;
-
-	esac; done
-}
-
-# warning: below i pretty much bypass the whole build system,
-# because it's not flexible enough to handle this kind of packaging
-
-package_ttf-unifont() {
-	pkgdesc="A free bitmap font with wide Unicode support (TrueType version)"
-	provides=(ttf-unifont-csur)
-	conflicts=(ttf-unifont-csur)
-	arch=(any)
-	install=ttf.install
-
-	_ttfdir=/usr/share/fonts/TTF
-
-	cd "$srcdir/unifont-${pkgver}/font/compiled"
-	install -D -m0644 "unifont-${pkgver}.ttf" \
-		"${pkgdir}${_ttfdir}/unifont.ttf"
-	install -D -m0644 "unifont_csur-${pkgver}.ttf" \
-		"${pkgdir}${_ttfdir}/unifont_csur.ttf"
-	install -D -m0644 "unifont_sample-${pkgver}.ttf" \
-		"${pkgdir}${_ttfdir}/unifont_sample.ttf"
-	install -D -m0644 "unifont_upper-${pkgver}.ttf" \
-		"${pkgdir}${_ttfdir}/unifont_upper.ttf"
-
-	cd "$srcdir"
-	install -D -m0644 fontconfig-noaa.conf \
-		"$pkgdir/etc/fonts/conf.avail/20-unifont-noaa.conf"
-	install -D -m0644 fontconfig-upper.conf \
-		"$pkgdir/etc/fonts/conf.avail/20-unifont-upper.conf"
-}
+license=('GPL2' 'custom:OFL')
+source=("http://unifoundry.com/pub/unifont/unifont-$pkgver/unifont-$pkgver.tar.gz"{,.sig})
+sha256sums=('1f5e517ccf4cb3a09cffe31ac52de70d8f076fe024a4a2453e07db57bb64febb'
+            'SKIP')
+validpgpkeys=('95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy <unifoundry@unifoundry.com>
 
 package_pcf-unifont() {
-	pkgdesc="A free bitmap font with wide Unicode support (PCF version)"
-	arch=(any)
-
-	_pcfdir=/usr/share/fonts/misc
-
-	cd "$srcdir/unifont-${pkgver}/font/compiled"
-	install -D -m0644 "unifont-${pkgver}.pcf.gz" \
-		"${pkgdir}${_pcfdir}/unifont.pcf.gz"
-	install -D -m0644 "unifont_csur-${pkgver}.pcf.gz" \
-		"${pkgdir}${_pcfdir}/unifont_csur.pcf.gz"
-	install -D -m0644 "unifont_sample-${pkgver}.pcf.gz" \
-		"${pkgdir}${_pcfdir}/unifont_sample.pcf.gz"
-}
+  pkgdesc="A free bitmap font with wide Unicode support (PCF version)"
 
-package_bdf-unifont() {
-	pkgdesc="A free bitmap font with wide Unicode support (BDF version)"
-	arch=(any)
-
-	_bdfdir=/usr/share/fonts/misc
-
-	cd "$srcdir/unifont-${pkgver}/font/compiled"
-	install -D -m0644 "unifont-${pkgver}.bdf.gz" \
-		"${pkgdir}${_bdfdir}/unifont.bdf.gz"
-	install -D -m0644 "unifont_csur-${pkgver}.bdf.gz" \
-		"${pkgdir}${_bdfdir}/unifont_csur.bdf.gz"
-	install -D -m0644 "unifont_sample-${pkgver}.bdf.gz" \
-		"${pkgdir}${_bdfdir}/unifont_sample.bdf.gz"
+  cd "$srcdir/unifont-$pkgver/font/precompiled"
+  install -Dm644 "unifont-$pkgver.pcf.gz" "$pkgdir/usr/share/fonts/misc/unifont.pcf.gz"
 }
 
 package_psf-unifont() {
-	pkgdesc="A free bitmap font with wide Unicode support (PSF version, for APL)"
-	arch=(any)
+  pkgdesc="A free bitmap font with wide Unicode support (PSF version)"
 
-	cd "$srcdir/unifont-${pkgver}/font/compiled"
-	install -D -m0644 "Unifont-APL8x16-${pkgver}.psf.gz" \
-		"${pkgdir}/usr/share/kbd/consolefonts/Unifont-APL8x16.psf.gz"
+  cd "$srcdir/unifont-$pkgver/font/precompiled"
+  install -Dm644 "Unifont-APL8x16-$pkgver.psf.gz" "$pkgdir/usr/share/kbd/consolefonts/Unifont-APL8x16.psf.gz"
 }
 
 package_hex-unifont() {
-	pkgdesc="A free bitmap font with wide Unicode support (hex version)"
-	arch=(any)
+  pkgdesc="A free bitmap font with wide Unicode support (hex version)"
 
-	_hexdir=/usr/share/unifont
-
-	cd "$srcdir/unifont-${pkgver}/font/compiled"
-	install -D -m0644 "unifont-${pkgver}.hex" \
-		"${pkgdir}${_hexdir}/unifont.hex"
-	install -D -m0644 "unifont_upper-${pkgver}.hex" \
-		"${pkgdir}${_hexdir}/unifont_csur.hex"
-	install -D -m0644 "unifont_upper-${pkgver}.hex" \
-		"${pkgdir}${_hexdir}/unifont_upper.hex"
+  cd "$srcdir/unifont-$pkgver/font/precompiled"
+  install -Dm644 "unifont-$pkgver.hex" "$pkgdir/usr/share/unifont/unifont.hex"
 }
 
 package_unifont-utils() {
-	pkgdesc="A free bitmap font with wide Unicode support - utilities"
-	depends=('perl')
-	optdepends+=(
-		'perl-wx: for the unifont-viewer utility'
-		'perl-gd: for the unihex2png and unipng2hex utilities'
-	)
-	arch=(i686 x86_64)
-
-	cd "$srcdir/unifont-${pkgver}/src"
-	make install PREFIX="$pkgdir/usr"
-	cd "$srcdir/unifont-${pkgver}/man"
-	make install PREFIX="$pkgdir/usr" COMPRESS=1
+  pkgdesc="A free bitmap font with wide Unicode support - utilities"
+  arch=('x86_64')
+  depends=('perl')
+  optdepends=(
+    'perl-wx: for the unifont-viewer utility'
+    'perl-gd: for the unihex2png and unipng2hex utilities'
+  )
+
+  cd "$srcdir/unifont-$pkgver"
+  mkdir -p bin
+  make -C src all install PREFIX="$pkgdir/usr" LOCALBINDIR=../bin
+  make -C man install PREFIX="$pkgdir/usr" COMPRESS=1
 }
diff --git a/fontconfig-noaa.conf b/fontconfig-noaa.conf
deleted file mode 100644
index eabde0789e10..000000000000
--- a/fontconfig-noaa.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-	<!--
-		Antialiased TTF Unifont is a bit blurry at the "native" pixel size,
-		which may strain eyes. Disable antialiasing in this case.
-	-->
-
-	<match target="font">
-		<test name="file" compare="contains">
-			<string>unifont</string>
-		</test>
-		<test name="file" compare="contains">
-			<string>.ttf</string>
-		</test>
-		<test name="pixelsize" compare="eq" qual="any">
-			<double>16</double>
-		</test>
-		<test target="pattern" name="slant" compare="eq">
-			<const>roman</const>
-		</test>
-		<edit name="antialias" mode="assign">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-	<!--
-		Hinting uglifies the TTF Unifont a lot. Disable it.
-		(For some reason it never happened before 7.0.04.)
-		Unfortunately, libcairo will not respect this setting without being patched.
-		See <https://bugs.freedesktop.org/show_bug.cgi?id=11838>.
-	-->
-	<match target="font">
-		<test name="file" compare="contains">
-			<string>unifont</string>
-		</test>
-		<test name="file" compare="contains">
-			<string>.ttf</string>
-		</test>
-		<edit name="hinting" mode="assign">
-			<bool>false</bool>
-		</edit>
-		<edit name="autohint" mode="assign">
-			<bool>false</bool>
-		</edit>
-		<edit name="hintstyle" mode="assign">
-			<const>hintnone</const>
-		</edit>
-	</match>
-</fontconfig>
diff --git a/fontconfig-upper.conf b/fontconfig-upper.conf
deleted file mode 100644
index 2a9948d59d47..000000000000
--- a/fontconfig-upper.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-	<!-- this file makes fontconfig consider "Unifont", "Unifont Upper" and "Unifont CSUR" parts of the same font -->
-
-	<match target="scan">
-		<test name="file" compare="contains">
-			<string>unifont_upper.ttf</string>
-		</test>
-		<edit name="family">
-			<string>Unifont</string>
-		</edit>
-		<edit name="fullname">
-			<string>Unifont</string>
-		</edit>
-		<edit name="fontversion">
-			<int>8</int>
-		</edit>
-	</match>
-
-	<match target="scan">
-		<test name="file" compare="contains">
-			<string>unifont_csur.ttf</string>
-		</test>
-		<edit name="family">
-			<string>Unifont</string>
-		</edit>
-		<edit name="fullname">
-			<string>Unifont</string>
-		</edit>
-		<edit name="fontversion">
-			<int>8</int>
-		</edit>
-	</match>
-
-	<alias binding="same">
-		<family>Unifont Upper</family>
-		<accept>
-			<family>Unifont</family>
-		</accept>
-	</alias>
-
-	<alias binding="same">
-		<family>Unifont CSUR</family>
-		<accept>
-			<family>Unifont</family>
-		</accept>
-	</alias>
-
-	<alias binding="same">
-		<family>Unifont Upper CSUR</family>
-		<accept>
-			<family>Unifont</family>
-		</accept>
-	</alias>
-</fontconfig>
diff --git a/ttf.install b/ttf.install
deleted file mode 100644
index e4e77c3835d8..000000000000
--- a/ttf.install
+++ /dev/null
@@ -1,23 +0,0 @@
-_warn_11838() {
-	cat <<EOM
- ***    WARNING: due to cairo developers being lazy*, Unifont may display incorrectly
- ***    in some applications when antialiasing is turned off by fontconfig.
- ***
- ***    * see <https://bugs.freedesktop.org/show_bug.cgi?id=11838>
-EOM
-}
-
-post_install() {
-	ln -fs ../conf.avail/20-unifont-noaa.conf /etc/fonts/conf.d
-	ln -fs ../conf.avail/20-unifont-upper.conf /etc/fonts/conf.d
-	_warn_11838
-}
-
-post_remove() {
-	rm -f /etc/fonts/conf.d/20-unifont-noaa.conf
-	rm -f /etc/fonts/conf.d/20-unifont-upper.conf
-}
-
-post_upgrade() {
-	_warn_11838
-}