From 0b8bcf565c26086f73cb51d3bb1151e3853cffdc Mon Sep 17 00:00:00 2001
From: Stephen Gaito <stephen@perceptisys.co.uk>
Date: Thu, 21 Nov 2019 19:06:46 +0000
Subject: [PATCH] added patches

---
 .gitignore                                |  6 ++---
 buildScripts/getPdf2htmlEX                |  2 +-
 patches/fontforge-20170731-fixGDraw.patch | 32 +++++++++++++++++++++++
 3 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 patches/fontforge-20170731-fixGDraw.patch

diff --git a/.gitignore b/.gitignore
index d2f4091..f1f1335 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-fontforge*
-FontForge*
-poppler*
+fontforge
+*.tar.*
+poppler
 build
 compile_commands.json
 CMakeCache.txt
diff --git a/buildScripts/getPdf2htmlEX b/buildScripts/getPdf2htmlEX
index ff311bd..a3a375d 100755
--- a/buildScripts/getPdf2htmlEX
+++ b/buildScripts/getPdf2htmlEX
@@ -9,7 +9,7 @@ wget https://codeload.github.com/stephengaito/pdf2htmlEX/zip/$PDF2HTMLEX_VERSION
 
 mv $PDF2HTMLEX_VERSION $PDF2HTMLEX_VERSION.zip
 
-sudo apt get unzip
+sudo apt install unzip
 
 unzip $PDF2HTMLEX_VERSION.zip
 
diff --git a/patches/fontforge-20170731-fixGDraw.patch b/patches/fontforge-20170731-fixGDraw.patch
new file mode 100644
index 0000000..8d162d2
--- /dev/null
+++ b/patches/fontforge-20170731-fixGDraw.patch
@@ -0,0 +1,32 @@
+diff --git a/gdraw/drawboxborder.c b/gdraw/drawboxborder.c
+index 629968608..0b00e9dd5 100644
+--- a/gdraw/drawboxborder.c
++++ b/gdraw/drawboxborder.c
+@@ -24,6 +24,7 @@
+  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
++#include <fontforge-config.h>
+ #include <math.h>
+ #include <gdraw.h>
+ #include <ggadget.h>
+diff --git a/gdraw/gpsdraw.c b/gdraw/gpsdraw.c
+index 5e58b6208..099e41bbd 100644
+--- a/gdraw/gpsdraw.c
++++ b/gdraw/gpsdraw.c
+@@ -24,6 +24,7 @@
+  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
++#include "fontforge-config.h"
+ #include <stdio.h>
+ #include <math.h>
+ #include <time.h>
+@@ -31,7 +32,6 @@
+ #if !defined(__MINGW32__)
+ #include <sys/wait.h>
+ #endif
+-#include "fontforge-config.h"
+ #include <unistd.h>
+ 
+ #include "gpsdrawP.h"