otf-nerd-fonts-monacob-mono v3.0.1-2

3 files changed, 24 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ec8c944eba10..31781d61debf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,18 @@
 pkgbase = otf-nerd-fonts-monacob-mono
 	pkgdesc = MonacoB fonts patched with nerd-fonts
 	pkgver = 3.0.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/vjpr/monaco-bold
 	arch = any
 	license = custom:Apple
 	makedepends = fontforge
-	makedepends = subversion
 	source = COPYRIGHT
 	source = monacob-font-patcher.py
-	source = monaco-bold::git+https://github.com/vjpr/monaco-bold.git#commit=b77db4b6fc2e9df074f8db59cead862d7068e3d7
-	source = nerd-fonts-glyphs-3.0.1::svn+https://github.com/ryanoasis/nerd-fonts/tags/v3.0.1/src/glyphs
-	source = FontnameParser-3.0.1.py::https://github.com/ryanoasis/nerd-fonts/raw/v3.0.1/bin/scripts/name_parser/FontnameParser.py
-	source = FontnameTools-3.0.1.py::https://github.com/ryanoasis/nerd-fonts/raw/v3.0.1/bin/scripts/name_parser/FontnameTools.py
-	source = font-patcher-3.0.1.py::https://github.com/ryanoasis/nerd-fonts/raw/v3.0.1/font-patcher
+	source = monaco-bold-b77db4b6fc2e9df074f8db59cead862d7068e3d7.zip::https://github.com/vjpr/monaco-bold/archive/b77db4b6fc2e9df074f8db59cead862d7068e3d7.zip
+	source = FontPatcher-3.0.1.zip::https://github.com/ryanoasis/nerd-fonts/releases/download/v3.0.1/FontPatcher.zip
 	sha256sums = 4a9d48f5368ca3b5699f61c505412a8d734a57c5da00ac0ac5ea70881f615ef3
 	sha256sums = 153b3fcf2d418582d5293a50d8bf3e17f9f500db5633b7927a1921d4527b158d
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = c3d3ed3a0f61afa629554736705d961897d7319a3d052cabde2ab95aa6f92322
-	sha256sums = 9d1403fd270ae0a6d729e2f7acb5877dd4912756dc2af9665edcd366ecb37f31
-	sha256sums = 1e161afaf87485f1f4c154d177aceeb03be1c0e6badc66cc13fc528631a50221
+	sha256sums = 61c60ab9a43d3c807a377da6bb26fad2b15c0d5da9ba0d87295f4c436751886e
+	sha256sums = 654009e17265be3b698ad6b8d675dbc8410e36a5975fd774fb0b2d416d617c9a
 
 pkgname = otf-nerd-fonts-monacob-mono
diff --git a/.gitignore b/.gitignore
index 9932d16a2dc6..a7141d84066b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,6 @@
-monaco-bold/
-nerd-fonts-glyphs*/
+monaco-bold-*.zip
+FontPatcher-*.zip
 pkg/
 src/
-font-patcher-*
-FontnameParser-*
-FontnameTools-*
 *.tar
-*.tar.xz
-*.tar.zst
+*.tar.*
diff --git a/PKGBUILD b/PKGBUILD
index 4291fc65a450..13094b4d7b2c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,35 @@
 # Maintainer: gbr <gbr@protonmail.com>
 # Contributor: Karmenzind
 pkgname=otf-nerd-fonts-monacob-mono
+_commit=b77db4b6fc2e9df074f8db59cead862d7068e3d7
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc='MonacoB fonts patched with nerd-fonts'
 arch=('any')
 url='https://github.com/vjpr/monaco-bold'
 license=('custom:Apple')
-depends=()
-makedepends=('fontforge' 'subversion')
+makedepends=('fontforge')
 source=('COPYRIGHT'
         'monacob-font-patcher.py'
-        'monaco-bold::git+https://github.com/vjpr/monaco-bold.git#commit=b77db4b6fc2e9df074f8db59cead862d7068e3d7'
-        "nerd-fonts-glyphs-${pkgver}::svn+https://github.com/ryanoasis/nerd-fonts/tags/v${pkgver}/src/glyphs"
-        "FontnameParser-${pkgver}.py::https://github.com/ryanoasis/nerd-fonts/raw/v${pkgver}/bin/scripts/name_parser/FontnameParser.py"
-        "FontnameTools-${pkgver}.py::https://github.com/ryanoasis/nerd-fonts/raw/v${pkgver}/bin/scripts/name_parser/FontnameTools.py"
-        "font-patcher-${pkgver}.py::https://github.com/ryanoasis/nerd-fonts/raw/v${pkgver}/font-patcher")
+        "monaco-bold-${_commit}.zip::https://github.com/vjpr/monaco-bold/archive/${_commit}.zip"
+        "FontPatcher-${pkgver}.zip::https://github.com/ryanoasis/nerd-fonts/releases/download/v${pkgver}/FontPatcher.zip")
 sha256sums=('4a9d48f5368ca3b5699f61c505412a8d734a57c5da00ac0ac5ea70881f615ef3'
             '153b3fcf2d418582d5293a50d8bf3e17f9f500db5633b7927a1921d4527b158d'
-            'SKIP'
-            'SKIP'
-            'c3d3ed3a0f61afa629554736705d961897d7319a3d052cabde2ab95aa6f92322'
-            '9d1403fd270ae0a6d729e2f7acb5877dd4912756dc2af9665edcd366ecb37f31'
-            '1e161afaf87485f1f4c154d177aceeb03be1c0e6badc66cc13fc528631a50221')
+            '61c60ab9a43d3c807a377da6bb26fad2b15c0d5da9ba0d87295f4c436751886e'
+            '654009e17265be3b698ad6b8d675dbc8410e36a5975fd774fb0b2d416d617c9a')
 
-prepare() {
-    mkdir -p "${srcdir}/monaco-patched"
-    find "${srcdir}/monaco-bold" -type f -name '*.otf' |
-        xargs python3 "${srcdir}/monacob-font-patcher.py" \
-        --output-dir "${srcdir}/monaco-patched" 2> /dev/null
-
-    # set up nerd fonts' font-patcher script and its dependencies
-    mkdir -p "${srcdir}/nerd-fonts-${pkgver}/bin/scripts/name_parser"
-    ln -sf "${srcdir}/FontnameParser-${pkgver}.py" "${srcdir}/nerd-fonts-${pkgver}/bin/scripts/name_parser/FontnameParser.py"
-    ln -sf "${srcdir}/FontnameTools-${pkgver}.py" "${srcdir}/nerd-fonts-${pkgver}/bin/scripts/name_parser/FontnameTools.py"
-    ln -sf "${srcdir}/font-patcher-${pkgver}.py" "${srcdir}/nerd-fonts-${pkgver}/font-patcher.py"
+build() {
+    # fix some small issues with monacoB
+    mkdir -p "${srcdir}/monacob-patched"
 
-    # set up glyphs
-    mkdir -p "${srcdir}/nerd-fonts-${pkgver}/src"
-    ln -sf "${srcdir}/nerd-fonts-glyphs-${pkgver}" "${srcdir}/nerd-fonts-${pkgver}/src/glyphs"
-}
+    find "${srcdir}/monaco-bold-"* -type f -name '*.otf' |
+        xargs python3 "${srcdir}/monacob-font-patcher.py" \
+        --output-dir "${srcdir}/monacob-patched" 2> /dev/null
 
-build() {
+    # patch monacoB with Nerd Fonts patcher
     mkdir -p "${srcdir}/nerd-patched"
-    find "${srcdir}/monaco-patched" -type f -name '*.otf' \
-        -exec fontforge -script "${srcdir}/nerd-fonts-${pkgver}/font-patcher.py" {} \
+    find "${srcdir}/monacob-patched" -type f -name '*.otf' \
+        -exec fontforge -script "${srcdir}/font-patcher" {} \
         --mono --careful --complete --progressbars --outputdir "${srcdir}/nerd-patched" \;
 }