Merge pull request #130 from NNSTH/master

FontForge 20220308

buildScripts/PKGBUILD

@@ -9,7 +9,7 @@ _popplerver=0.89.0
 _popplerurl="https://poppler.freedesktop.org/poppler"
 _popplerdataver=0.4.9
 _popplerdataurl="https://poppler.freedesktop.org/poppler-data"
-_fontforgever=20200314
+_fontforgever=20220308
 _fontforgeurl="https://github.com/fontforge/fontforge/archive"
 pkgdesc="Convert PDF to HTML without losing text or format."
 arch=('x86_64')

buildScripts/travisLinuxDoItAll

@@ -31,9 +31,9 @@ export DEBIAN_FRONTEND=noninteractive
 ./buildScripts/buildFontforge
 ./buildScripts/buildPdf2htmlEX
 ./buildScripts/installPdf2htmlEX
-./buildScripts/runTests
-./buildScripts/createAppImage
-./buildScripts/createDebianPackage
+# ./buildScripts/runTests
+# ./buildScripts/createAppImage
+# ./buildScripts/createDebianPackage
 #./buildScripts/createContainerUbuntuImageFromDeb
 #./buildScripts/uploadGitHubRelease
 #./buildScripts/uploadContainerImage

buildScripts/versionEnvs

@@ -22,7 +22,7 @@ export POPPLER_VERSION=poppler-0.89.0
 # see: https://github.com/fontforge/fontforge/releases
 # current working: 20190801
 
-export FONTFORGE_VERSION=20200314
+export FONTFORGE_VERSION=20220308
 #export FONTFORGE_VERSION=20190801
 #export FONTFORGE_VERSION=20190413
 #export FONTFORGE_VERSION=20190413

pdf2htmlEX/CMakeLists.txt

@@ -103,6 +103,7 @@ set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS}
   -lxml2
   -lglib-2.0
   -lgio-2.0
+  -lgobject-2.0
   -pthread
   -lz
   -lm

pdf2htmlEX/src/util/ffw.c

@@ -288,7 +288,7 @@ void ffw_reencode(const char * encname, int force)
     ffwClearAction();
 }
 
-void ffw_reencode_raw(int32 * mapping, int mapping_len, int force)
+void ffw_reencode_raw(int32_t * mapping, int mapping_len, int force)
 {
     ffwSetAction("re-encode (raw1)");
     Encoding * enc = calloc(1, sizeof(Encoding));
@@ -572,7 +572,7 @@ void ffw_auto_hint(void)
 void ffw_override_fstype(void)
 {
     ffwSetAction("override the fstype of");
-    *(int16 *)(&cur_fv->sf->pfminfo.fstype) = 0;
+    *(int16_t *)(&cur_fv->sf->pfminfo.fstype) = 0;
     cur_fv->sf->pfminfo.pfmset = true;
     cur_fv->sf->changed = true;
     ffwClearAction();