From 03bdc9bda76d35707f12bb8d5ed1c8566a4e414c Mon Sep 17 00:00:00 2001
From: Stephen Gaito <stephen@perceptisys.co.uk>
Date: Thu, 21 Nov 2019 16:33:24 +0000
Subject: [PATCH] continued correcting buildscripts

---
 buildScripts/getBuildTools    |  1 +
 buildScripts/getDevLibraries  |  4 +++-
 buildScripts/installFontforge |  9 +++++++--
 buildScripts/installPoppler   | 12 ++++++------
 buildScripts/versionEnvs      |  6 ++++--
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/buildScripts/getBuildTools b/buildScripts/getBuildTools
index 711532d..5d02109 100755
--- a/buildScripts/getBuildTools
+++ b/buildScripts/getBuildTools
@@ -14,5 +14,6 @@ sudo apt $UNATTENDED install	\
   make				\
   gcc				\
   g++				\
+  gettext			\
   tree
 
diff --git a/buildScripts/getDevLibraries b/buildScripts/getDevLibraries
index 63d7a68..eab6818 100755
--- a/buildScripts/getDevLibraries
+++ b/buildScripts/getDevLibraries
@@ -13,5 +13,7 @@ sudo apt $UNATTENDED install	\
   libjpeg-dev			\
   poppler-data			\
   libpango1.0-dev		\
-  liblcms2-dev
+  liblcms2-dev			\
+  libxml2-dev			\
+  libuninameslist-dev
 
diff --git a/buildScripts/installFontforge b/buildScripts/installFontforge
index 7c57186..e5eb120 100755
--- a/buildScripts/installFontforge
+++ b/buildScripts/installFontforge
@@ -1,10 +1,15 @@
 #!/bin/bash
 
-echo "This installation assumes you have 'sudo' privileges"
+echo "WARNING: this will over-write any existing"
+echo "FontForge version you have installed on your system."
+echo "This may break other packages/applications."
+echo ""
+echo "This installation assumes you have 'sudo' privileges."
+echo ""
 echo "Type ctrl-c now if DO NOT want to continue"
 read -p "Type anything else to continue: "
 
-cd poppler
+cd fontforge
 sudo make install
 sudo ldconfig;
 
diff --git a/buildScripts/installPoppler b/buildScripts/installPoppler
index 605e0b3..6b5f540 100755
--- a/buildScripts/installPoppler
+++ b/buildScripts/installPoppler
@@ -14,19 +14,19 @@ read -p "Type anything else to continue: "
 cd poppler/build
 sudo make install
 
-cd
+cd ..
 
 sudo mkdir -p               /usr/include/poppler
-sudo cp poppler/poppler/*.h /usr/include/poppler
+sudo cp poppler/*.h /usr/include/poppler
 
 sudo mkdir -p               /usr/include/poppler/goo
-sudo cp poppler/goo/*.h     /usr/include/poppler/goo
+sudo cp goo/*.h     /usr/include/poppler/goo
 
 sudo mkdir -p               /usr/include/poppler/fofi
-sudo cp poppler/fofi/*.h    /usr/include/poppler/fofi
+sudo cp fofi/*.h    /usr/include/poppler/fofi
 
 sudo mkdir -p               /usr/include/poppler/splash
-sudo cp poppler/splash/*.h  /usr/include/poppler/splash
+sudo cp splash/*.h  /usr/include/poppler/splash
 
-sudo cp poppler/build/poppler/poppler-config.h \
+sudo cp build/poppler/poppler-config.h \
         /usr/include/poppler
diff --git a/buildScripts/versionEnvs b/buildScripts/versionEnvs
index c4e9ed4..30f7465 100644
--- a/buildScripts/versionEnvs
+++ b/buildScripts/versionEnvs
@@ -3,6 +3,8 @@
 # This bash script exports environment variables for the latest software
 # versions
 
-export POPPLER_VERSION=poppler-0.82.0
-export FONTFORGE_VERSION=20190801
+#export POPPLER_VERSION=poppler-0.82.0
+export POPPLER_VERSION=poppler-0.81.0
+#export FONTFORGE_VERSION=20190801
+export FONTFORGE_VERSION=20170731
 export PDF2HTMLEX_VERSION=newBuildSystem