Add more fonts, install otf instead of converted ttf

3 files changed, 18 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b9726df09e4f..36d8cb410922 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Mon Apr 11 16:24:01 UTC 2016
 pkgbase = ttf-zelda
 	pkgdesc = A collection of fonts from the Legend of Zelda universe
-	pkgver = 1.0
+	pkgver = 1.1
 	pkgrel = 1
 	url = http://www.zeldauniverse.net/media/fonts/
 	install = zelda-ttf.install
@@ -24,8 +22,10 @@ pkgbase = ttf-zelda
 	source = http://www.zeldauniverse.net/media-files/typography/ZeldaDXTTBRK.ttf
 	source = http://www.zeldauniverse.net/media-files/typography/ReturnofGanon.ttf
 	source = http://www.zeldauniverse.net/wp-content/uploads/2012/01/skyward_sword_ancient_hylian___font_by_sarinilli-d4l1t18.zip
+	source = http://www.zeldauniverse.net/wp-content/uploads/2012/01/gerudo_typography___font___9_jan___12_minor_update_by_sarinilli-d4ln2mn.zip
+	source = https://zeldauniverse.net/wp-content/uploads/2014/01/HyliaSerif-v0.009.zip
+	source = https://zeldauniverse.net/wp-content/uploads/2014/01/Charlemagne.zip
 	source = zelda-ttf.install
-	source = otftottf.sh
 	md5sums = 3cf0469a6f23aefd25032f8bbc3587e5
 	md5sums = f6f44f2d7890f20ec62ecdae68c249f3
 	md5sums = 487390d5558cff7a17ce35d7d92a0540
@@ -39,8 +39,10 @@ pkgbase = ttf-zelda
 	md5sums = 630456bff8d3c11ea4511ef8b7184ae3
 	md5sums = 3c27910b481c2d2f780ce08ab2532038
 	md5sums = 7354ad6c714b905caec1cf1d7b6301c4
+	md5sums = bcad6b509e3fab3a5f9ec471dc3faf6b
+	md5sums = 6e1c9c08f72a51f5c36f590863676520
+	md5sums = b194178d07e97dd558660e4f20f40202
 	md5sums = 1f43fbf275c7ee8ee236d9f90c970819
-	md5sums = 529a3d904f5d2cbeacdba92999b6c44e
 
 pkgname = ttf-zelda
 
diff --git a/PKGBUILD b/PKGBUILD
index 05430fdbb271..12c101fab3c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Franklyn Tackitt <franklyn@tackitt.net>
 pkgname=ttf-zelda
-pkgver=1.0
+pkgver=1.1
 pkgrel=1
 pkgdesc="A collection of fonts from the Legend of Zelda universe"
 arch=('any')
@@ -24,8 +24,10 @@ source=("${_source_base_url}Triforce.ttf"
         "${_source_base_url}ZeldaDXTTBRK.ttf"
         "${_source_base_url}ReturnofGanon.ttf"
         "http://www.zeldauniverse.net/wp-content/uploads/2012/01/skyward_sword_ancient_hylian___font_by_sarinilli-d4l1t18.zip"
-        "zelda-ttf.install"
-        "otftottf.sh")
+        "http://www.zeldauniverse.net/wp-content/uploads/2012/01/gerudo_typography___font___9_jan___12_minor_update_by_sarinilli-d4ln2mn.zip"
+        "https://zeldauniverse.net/wp-content/uploads/2014/01/HyliaSerif-v0.009.zip"
+        "https://zeldauniverse.net/wp-content/uploads/2014/01/Charlemagne.zip"
+        "zelda-ttf.install")
 md5sums=('3cf0469a6f23aefd25032f8bbc3587e5'
          'f6f44f2d7890f20ec62ecdae68c249f3'
          '487390d5558cff7a17ce35d7d92a0540'
@@ -39,24 +41,15 @@ md5sums=('3cf0469a6f23aefd25032f8bbc3587e5'
          '630456bff8d3c11ea4511ef8b7184ae3'
          '3c27910b481c2d2f780ce08ab2532038'
          '7354ad6c714b905caec1cf1d7b6301c4'
-         '1f43fbf275c7ee8ee236d9f90c970819'
-         '529a3d904f5d2cbeacdba92999b6c44e')
+         'bcad6b509e3fab3a5f9ec471dc3faf6b'
+         '6e1c9c08f72a51f5c36f590863676520'
+         'b194178d07e97dd558660e4f20f40202'
+         '1f43fbf275c7ee8ee236d9f90c970819')
 
 install="zelda-ttf.install"
 
-build() {
-  cd "$srcdir"
-  for otf in *.otf; do
-    ./otftottf.sh $otf
-  done
-}
-
-check() {
-  msg "Checking"
-}
-
 package() {
   cd "$srcdir"
-  find . -name \*.ttf -exec install -Dm644 '{}' "$pkgdir/usr/share/fonts/TTF/{}" \;
-  find . -name \*.ttf -exec install -Dm644 '{}' "$pkgdir/usr/share/fonts/TTF/{}" \;
+  find . -iname \*.ttf -exec install -Dm644 '{}' "$pkgdir/usr/share/fonts/TTF/{}" \;
+  find . -iname \*.otf -exec install -Dm644 '{}' "$pkgdir/usr/share/fonts/TTF/{}" \;
 }
diff --git a/otftottf.sh b/otftottf.sh
deleted file mode 100755
index cd6a398e9243..000000000000
--- a/otftottf.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/fontforge -script
-Print("Opening "+$1);
-Open($1);
-Print("Saving "+$1:r+".ttf");
-Generate($1:r+".ttf");
-Quit(0);