use fonttosfnt-git to generate otb from bdf source

2 files changed, 74 insertions, 84 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6111aecf9cb7..bbbab867f5ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = xorg-fonts-misc-otb
-	pkgdesc = X.org misc fonts (OTB version)
+	pkgdesc = X.org cyrillic fonts (OTB version)
 	pkgver = 1.0.3
-	pkgrel = 8
-	url = https://xorg.freedesktop.org/
+	pkgrel = 9
+	url = https://gitlab.freedesktop.org/
 	arch = any
 	license = custom
-	makedepends = fonttosfnt
+	makedepends = fonttosfnt-git
 	makedepends = xorg-bdftopcf
-	makedepends = xorg-mkfontscale
 	makedepends = xorg-font-util
+	makedepends = xorg-mkfontscale
 	makedepends = xorg-util-macros
 	depends = xorg-fonts-alias-misc
 	provides = font-misc-ethiopic
@@ -20,34 +20,33 @@ pkgbase = xorg-fonts-misc-otb
 	replaces = font-misc-ethiopic
 	replaces = font-misc-meltho
 	replaces = xorg-fonts-misc
-	source = https://xorg.freedesktop.org//releases/individual/font/font-arabic-misc-1.0.3.tar.bz2
-	source = https://xorg.freedesktop.org//releases/individual/font/font-cursor-misc-1.0.3.tar.bz2
-	source = https://xorg.freedesktop.org//releases/individual/font/font-daewoo-misc-1.0.3.tar.bz2
-	source = https://xorg.freedesktop.org//releases/individual/font/font-dec-misc-1.0.3.tar.bz2
-	source = https://xorg.freedesktop.org//releases/individual/font/font-isas-misc-1.0.3.tar.bz2
-	source = https://xorg.freedesktop.org//releases/individual/font/font-jis-misc-1.0.3.tar.bz2
-	source = https://xorg.freedesktop.org//releases/individual/font/font-micro-misc-1.0.3.tar.bz2
-	source = https://xorg.freedesktop.org//releases/individual/font/font-misc-ethiopic-1.0.3.tar.bz2
-	source = https://xorg.freedesktop.org//releases/individual/font/font-misc-meltho-1.0.3.tar.bz2
-	source = https://xorg.freedesktop.org//releases/individual/font/font-misc-misc-1.1.2.tar.bz2
-	source = https://xorg.freedesktop.org//releases/individual/font/font-mutt-misc-1.0.3.tar.bz2
-	source = https://xorg.freedesktop.org//releases/individual/font/font-schumacher-misc-1.1.2.tar.bz2
-	source = https://xorg.freedesktop.org//releases/individual/font/font-sony-misc-1.0.3.tar.bz2
-	source = https://xorg.freedesktop.org//releases/individual/font/font-sun-misc-1.0.3.tar.bz2
-	sha256sums = 505d9b12a7093389e67a925dfda6346bde26d114c67f0cdca7aeda6e5d3344f4
-	sha256sums = 17363eb35eece2e08144da5f060c70103b59d0972b4f4d77fd84c9a7a2dba635
-	sha256sums = bc65de70bee12698caa95b523d3b652c056347e17b68cc8b5d6bbdff235c4be8
-	sha256sums = e19ddf8b5f8de914d81675358fdfe37762e9ce524887cc983adef34f2850ff7b
-	sha256sums = 5824ab4b485951107dd245b8f7717d2822f1a6dbf6cea98f1ac7f49905c0a867
-	sha256sums = 2b18ce10b367ebafe95a17de799b6db9a24e2337188d124adaf68af05b1fac65
-	sha256sums = 9a3381c10f32d9511f0ad4179df395914c50779103c16cddf7017f5220ed8db6
-	sha256sums = 53cb1fd83afdbe7939c0eac34003676ee0e6023216892d98054db90b703c98a5
-	sha256sums = 3721323f13855cf7ca609115a1f7b182491e9b2b9c6e01eb1a2c7f8edd480791
-	sha256sums = b8e77940e4e1769dc47ef1805918d8c9be37c708735832a07204258bacc11794
-	sha256sums = bd5f7adb34367c197773a9801df5bce7b019664941900b2a31fbfe1ff2830f8f
-	sha256sums = e444028656e0767e2eddc6d9aca462b16a2be75a47244dbc199b2c44eca87e5a
-	sha256sums = 2043a326ba347c9da5ca1e9bc363e2521c3ea40b43b1f9662d333efd4867cff5
-	sha256sums = 481f4fcbbf7005658b080b3cf342c8c76de752e77f47958b2b383de73266d2e0
+	source = https://gitlab.freedesktop.org//xorg/font/arabic-misc/-/archive/master/arabic-misc-master.tar.gz
+	source = https://gitlab.freedesktop.org//xorg/font/cursor-misc/-/archive/master/cursor-misc-master.tar.gz
+	source = https://gitlab.freedesktop.org//xorg/font/daewoo-misc/-/archive/master/daewoo-misc-master.tar.gz
+	source = https://gitlab.freedesktop.org//xorg/font/dec-misc/-/archive/master/dec-misc-master.tar.gz
+	source = https://gitlab.freedesktop.org//xorg/font/isas-misc/-/archive/master/isas-misc-master.tar.gz
+	source = https://gitlab.freedesktop.org//xorg/font/jis-misc/-/archive/master/jis-misc-master.tar.gz
+	source = https://gitlab.freedesktop.org//xorg/font/micro-misc/-/archive/master/micro-misc-master.tar.gz
+	source = https://gitlab.freedesktop.org//xorg/font/misc-ethiopic/-/archive/master/misc-ethiopic-master.tar.gz
+	source = https://gitlab.freedesktop.org//xorg/font/misc-meltho/-/archive/master/misc-meltho-master.tar.gz
+	source = https://gitlab.freedesktop.org//xorg/font/misc-misc/-/archive/master/misc-misc-master.tar.gz
+	source = https://gitlab.freedesktop.org//xorg/font/mutt-misc/-/archive/master/mutt-misc-master.tar.gz
+	source = https://gitlab.freedesktop.org//xorg/font/schumacher-misc/-/archive/master/schumacher-misc-master.tar.gz
+	source = https://gitlab.freedesktop.org//xorg/font/sony-misc/-/archive/master/sony-misc-master.tar.gz
+	source = https://gitlab.freedesktop.org//xorg/font/sun-misc/-/archive/master/sun-misc-master.tar.gz
+	md5sums = 5a9c0a655d923a8f6a2b0ced2bcd4f21
+	md5sums = 7366b3db1f06cc3756144865aa529373
+	md5sums = 686d89f1131962296549b2301cee6c9e
+	md5sums = 0189edf130858cd8d328b23e2f76eaa7
+	md5sums = 456a4eb3a28a5e9e1147c49f6a003199
+	md5sums = dc4ce06a2e0f3c61622a4fef55d650e3
+	md5sums = c0253fefc9c1f8e0815f2ca3ed529e4e
+	md5sums = 5581234f77f3e297c0a6188b0528c7ed
+	md5sums = ae8ecb72cb2e147210f40b80ce655b4e
+	md5sums = 39a2f0bff999200b04ba1e7678d11219
+	md5sums = e5bcd3cefbc5e77474cf74aedf6a416b
+	md5sums = 37dffbac5f4524a0f742f4af22b5914b
+	md5sums = 4606e07f5e29e1eccdbf47a2f7c33842
+	md5sums = 084775f3656adad65965efc70d20d69f
 
 pkgname = xorg-fonts-misc-otb
-
diff --git a/PKGBUILD b/PKGBUILD
index 899d530a8bda..705314d3f554 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,56 @@
-#Maintainer: Ryan Farley <ryan.farley@gmx.com>
-#Contributor: Jan de Groot <jgc@archlinux.org>
+# Maintainer: pkfbcedkrz <pkfbcedkrz@gmail.com>
+# Contributor: Ryan Farley <ryan.farley@gmx.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-fonts-misc-otb
 pkgver=1.0.3
-pkgrel=8
-pkgdesc="X.org misc fonts (OTB version)"
-arch=(any)
-url="https://xorg.freedesktop.org/"
+pkgrel=9
+pkgdesc="X.org cyrillic fonts (OTB version)"
+arch=('any')
+url="https://gitlab.freedesktop.org/"
 license=('custom')
-makedepends=('fonttosfnt' 'xorg-bdftopcf' 'xorg-mkfontscale' 'xorg-font-util' 'xorg-util-macros')
+makedepends=('fonttosfnt-git' 'xorg-bdftopcf' 'xorg-font-util' 'xorg-mkfontscale' 'xorg-util-macros')
 depends=('xorg-fonts-alias-misc')
 replaces=('font-misc-ethiopic' 'font-misc-meltho' 'xorg-fonts-misc')
 provides=('font-misc-ethiopic' 'font-misc-meltho' 'xorg-fonts-misc')
 conflicts=('font-misc-ethiopic' 'font-misc-meltho' 'xorg-fonts-misc')
-source=(${url}/releases/individual/font/font-arabic-misc-${pkgver}.tar.bz2
-        ${url}/releases/individual/font/font-cursor-misc-${pkgver}.tar.bz2
-        ${url}/releases/individual/font/font-daewoo-misc-${pkgver}.tar.bz2
-        ${url}/releases/individual/font/font-dec-misc-${pkgver}.tar.bz2
-        ${url}/releases/individual/font/font-isas-misc-${pkgver}.tar.bz2
-        ${url}/releases/individual/font/font-jis-misc-${pkgver}.tar.bz2
-        ${url}/releases/individual/font/font-micro-misc-${pkgver}.tar.bz2
-        ${url}/releases/individual/font/font-misc-ethiopic-${pkgver}.tar.bz2
-        ${url}/releases/individual/font/font-misc-meltho-${pkgver}.tar.bz2
-        ${url}/releases/individual/font/font-misc-misc-1.1.2.tar.bz2
-        ${url}/releases/individual/font/font-mutt-misc-${pkgver}.tar.bz2
-        ${url}/releases/individual/font/font-schumacher-misc-1.1.2.tar.bz2
-        ${url}/releases/individual/font/font-sony-misc-${pkgver}.tar.bz2
-        ${url}/releases/individual/font/font-sun-misc-${pkgver}.tar.bz2)
-sha256sums=('505d9b12a7093389e67a925dfda6346bde26d114c67f0cdca7aeda6e5d3344f4'
-            '17363eb35eece2e08144da5f060c70103b59d0972b4f4d77fd84c9a7a2dba635'
-            'bc65de70bee12698caa95b523d3b652c056347e17b68cc8b5d6bbdff235c4be8'
-            'e19ddf8b5f8de914d81675358fdfe37762e9ce524887cc983adef34f2850ff7b'
-            '5824ab4b485951107dd245b8f7717d2822f1a6dbf6cea98f1ac7f49905c0a867'
-            '2b18ce10b367ebafe95a17de799b6db9a24e2337188d124adaf68af05b1fac65'
-            '9a3381c10f32d9511f0ad4179df395914c50779103c16cddf7017f5220ed8db6'
-            '53cb1fd83afdbe7939c0eac34003676ee0e6023216892d98054db90b703c98a5'
-            '3721323f13855cf7ca609115a1f7b182491e9b2b9c6e01eb1a2c7f8edd480791'
-            'b8e77940e4e1769dc47ef1805918d8c9be37c708735832a07204258bacc11794'
-            'bd5f7adb34367c197773a9801df5bce7b019664941900b2a31fbfe1ff2830f8f'
-            'e444028656e0767e2eddc6d9aca462b16a2be75a47244dbc199b2c44eca87e5a'
-            '2043a326ba347c9da5ca1e9bc363e2521c3ea40b43b1f9662d333efd4867cff5'
-            '481f4fcbbf7005658b080b3cf342c8c76de752e77f47958b2b383de73266d2e0')
+source=(${url}/xorg/font/arabic-misc/-/archive/master/arabic-misc-master.tar.gz
+        ${url}/xorg/font/cursor-misc/-/archive/master/cursor-misc-master.tar.gz
+        ${url}/xorg/font/daewoo-misc/-/archive/master/daewoo-misc-master.tar.gz
+        ${url}/xorg/font/dec-misc/-/archive/master/dec-misc-master.tar.gz
+        ${url}/xorg/font/isas-misc/-/archive/master/isas-misc-master.tar.gz
+        ${url}/xorg/font/jis-misc/-/archive/master/jis-misc-master.tar.gz
+        ${url}/xorg/font/micro-misc/-/archive/master/micro-misc-master.tar.gz
+        ${url}/xorg/font/misc-ethiopic/-/archive/master/misc-ethiopic-master.tar.gz
+        ${url}/xorg/font/misc-meltho/-/archive/master/misc-meltho-master.tar.gz
+        ${url}/xorg/font/misc-misc/-/archive/master/misc-misc-master.tar.gz
+        ${url}/xorg/font/mutt-misc/-/archive/master/mutt-misc-master.tar.gz
+        ${url}/xorg/font/schumacher-misc/-/archive/master/schumacher-misc-master.tar.gz
+        ${url}/xorg/font/sony-misc/-/archive/master/sony-misc-master.tar.gz
+        ${url}/xorg/font/sun-misc/-/archive/master/sun-misc-master.tar.gz)
+md5sums=('5a9c0a655d923a8f6a2b0ced2bcd4f21'
+         '7366b3db1f06cc3756144865aa529373'
+         '686d89f1131962296549b2301cee6c9e'
+         '0189edf130858cd8d328b23e2f76eaa7'
+         '456a4eb3a28a5e9e1147c49f6a003199'
+         'dc4ce06a2e0f3c61622a4fef55d650e3'
+         'c0253fefc9c1f8e0815f2ca3ed529e4e'
+         '5581234f77f3e297c0a6188b0528c7ed'
+         'ae8ecb72cb2e147210f40b80ce655b4e'
+         '39a2f0bff999200b04ba1e7678d11219'
+         'e5bcd3cefbc5e77474cf74aedf6a416b'
+         '37dffbac5f4524a0f742f4af22b5914b'
+         '4606e07f5e29e1eccdbf47a2f7c33842'
+         '084775f3656adad65965efc70d20d69f')
 
 build() {
   cd "${srcdir}"
   for dir in *; do
     if [ -d "${dir}" ]; then
       pushd "${dir}"
-      ./configure --prefix=/usr \
-          --with-fontdir=/usr/share/fonts/misc
-      make
       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
@@ -63,24 +61,17 @@ build() {
 package() {
   cd "${srcdir}"
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m755 -d "${pkgdir}/usr/share/fonts/misc"
   for dir in *; do
     if [ -d "${dir}" ]; then
       pushd "${dir}"
-      make DESTDIR="${pkgdir}" install
-      install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-*}
+      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-*}"
       shopt -s nullglob
-      for f in *.otb; do 
+      for f in *.otb; do
         install -m644 "$f" "${pkgdir}/usr/share/fonts/misc/${f}"
       done
       shopt -u nullglob
       popd
     fi
   done
-  rm -f ${pkgdir}/usr/share/fonts/*/fonts.*
-
-  
-  # move .otf files to proper directory - FS#44250
-  mv ${pkgdir}/usr/share/fonts/misc/*.otf ${pkgdir}/usr/share/fonts/OTF/
-  # we done with the PCF
-  rm ${pkgdir}/usr/share/fonts/misc/*.pcf.gz
 }