new version with built in ttf2cxf

3 files changed, 18 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2b89eae07afb..0b0f98c6a39e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Mar 24 00:35:05 UTC 2016
+# Tue Nov  1 14:40:49 UTC 2016
 pkgbase = f-engrave
 	pkgdesc = Supports Engraving and V-Carving
-	pkgver = 1.57
+	pkgver = 1.59
 	pkgrel = 1
 	url = http://www.scorchworks.com/Fengrave/fengrave.html
 	arch = i686
@@ -10,11 +10,10 @@ pkgbase = f-engrave
 	license = GPLv3
 	makedepends = dos2unix
 	depends = python
-	optdepends = ttf2cxf: for reading True Type Fonts
-	source = http://www.scorchworks.com/Fengrave/F-Engrave-1.57_src.zip
+	source = http://www.scorchworks.com/Fengrave/F-Engrave-1.59_src.zip
 	source = arch.patch
-	md5sums = 43b968be47690494e00bb2e1669553e1
-	md5sums = 7db385c158cfdf726522a1c5c34aeb9d
+	md5sums = 08821a74f7e371c2f22f5ec5a0d9771d
+	md5sums = f1844c9323b52b92f8e12f922ff50965
 
 pkgname = f-engrave
 
diff --git a/PKGBUILD b/PKGBUILD
index c8e2a3f5325a..0cc260a94330 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
-# Maintainer: Grey Christoforo <first name [at] last name [dot] net>
+# Maintainer: Grey Christoforo <first name at last name dat net>
 
 pkgname=f-engrave
-pkgver=1.57
+pkgver=1.59
 pkgrel=1
 pkgdesc="Supports Engraving and V-Carving"
 url="http://www.scorchworks.com/Fengrave/fengrave.html"
@@ -9,10 +9,9 @@ arch=('i686' 'x86_64')
 license=('GPLv3')
 makedepends=('dos2unix')
 depends=('python')
-optdepends=('ttf2cxf: for reading True Type Fonts')
 source=(http://www.scorchworks.com/Fengrave/F-Engrave-${pkgver}_src.zip arch.patch)
-md5sums=('43b968be47690494e00bb2e1669553e1'
-         '7db385c158cfdf726522a1c5c34aeb9d')
+md5sums=('08821a74f7e371c2f22f5ec5a0d9771d'
+         'f1844c9323b52b92f8e12f922ff50965')
 
 prepare() {
   cd F-Engrave-${pkgver}_src
@@ -20,9 +19,16 @@ prepare() {
   dos2unix ${pkgname}-${pkgver/./}.py
 }
 
+build() {
+  cd F-Engrave-${pkgver}_src/TTF2CXF_STREAM
+  make
+}
+
 package() {
   cd F-Engrave-${pkgver}_src
   install -Dm755 ${pkgname}-${pkgver/./}.py "$pkgdir/usr/bin/${pkgname}"
+  cd TTF2CXF_STREAM
+  install -Dm755 ttf2cxf_stream "$pkgdir/usr/bin/ttf2cxf_stream"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/arch.patch b/arch.patch
index eddad5fd6d8a..21c185f63373 100644
--- a/arch.patch
+++ b/arch.patch
@@ -1,14 +1,5 @@
---- f-engrave-157.py	2015-09-07 23:11:36.000000000 +0100
-+++ f-engrave-157.py.new	2015-09-15 14:18:05.078678057 +0100
-@@ -1617,7 +1617,7 @@
-             stdout, stderr = p.communicate()

-             if VERSION == 3:

-                 stdout = bytes.decode(stdout)

--            if str.find(stdout.upper(),'TTF2CXF') != -1:

-+            if str.find(stdout.upper(),'TTF FILE') != -1:

-                 self.TTF_AVAIL = TRUE

-             else:

-                 self.TTF_AVAIL = FALSE

+--- f-engrave-159.py	2015-09-07 23:11:36.000000000 +0100
++++ f-engrave-159.py.new	2015-09-15 14:18:05.078678057 +0100
 @@ -1801,7 +1801,7 @@
          self.H_CALC.set("max_use")

          self.plotbox.set("no_box")