corrected build scripts

.travis.yml.off

@@ -6,44 +6,14 @@ os:
   - linux
 #  - osx
 
-dist: bionic
+dist: xenial
 
-env:
+services:
-  global:
+  - docker
-    - POPPLER_SOURCE="https://gitlab.freedesktop.org/poppler/poppler.git"
-  matrix:
-    - PDF2HTMLEX_RELEASE="v0.18.7-poppler-0.81.0" POPPLER_RELEASE="poppler-0.81.0"
-    - PDF2HTMLEX_RELEASE="v0.18.0-poppler-0.74.0-ubuntu-19.04" POPPLER_RELEASE="poppler-0.74.0"
-    - PDF2HTMLEX_RELEASE="v0.16.0-poppler-0.62.0-ubuntu-18.04" POPPLER_RELEASE="poppler-0.62.0"
 
 compiler: gcc
 
-addons:
+#addons:
-  apt:
-    update: true
-    packages:
-      - build-essential
-      - autoconf
-      - git
-      - pkg-config
-      - cmake
-      - make
-      - gcc
-      - g++
-      # - ca-certificates
-      # - libfreetype6-dev
-      # Poppler-specific packages
-      - libfontforge-dev
-      - libfontconfig-dev
-      - libjpeg-dev
-      - libpng-dev
-      - libnss3-dev
-      # pdf2htmlEX-specific packages
-      - default-jre
-      - libcairo-dev
-      - libspiro-dev
-      - libpango1.0-dev
-      - poppler-data
 #  homebrew:
 #    packages:
 #      - autoconf
@@ -74,15 +44,7 @@ matrix:
 #  allow_failures:
 #    - os: osx # Until the build passes, then re-enable.
 
-before_install:
-  - ./.travisScripts/copyScriptsToBin
-  - $HOME/bin/buildPoppler.sh
-  - $HOME/bin/installPoppler.sh
-  #- $HOME/setupTests.sh
-
 script:
-  - git checkout ${PDF2HTMLEX_RELEASE}
+  - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-  - git branch
+  - ./buildScripts/doItAll
-  - $HOME/bin/dobuild
+  - docker push $DOCKER_USERNAME/pdf2htmlex
-  - $HOME/bin/doinstall --noWait
-  - /usr/local/bin/pdf2htmlEX -v

buildScripts/createAppImage

@@ -25,7 +25,7 @@ wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/$LI
 chmod a+x $LINUX_DEPLOY_APP_IMAGE
 
 ./$LINUX_DEPLOY_APP_IMAGE		\
-  -e appDir/usr/bin/pdf2htmlEX		\
+  -e appDir/usr/local/bin/pdf2htmlEX	\
   --create-desktop-file			\
   -i ../pdf2htmlEX/logo/pdf2htmlEX.svg	\
   --appdir=appDir			\

pdf2htmlEX/CMakeLists.txt

@@ -20,7 +20,7 @@ add_custom_target(dist
 find_package(PkgConfig)
 
 
-pkg_check_modules(POPPLER REQUIRED poppler>=0.25.0)
+pkg_check_modules(POPPLER REQUIRED poppler>=0.81.0)
 include_directories(${POPPLER_INCLUDE_DIRS})
 link_directories(${POPPLER_LIBRARY_DIRS})
 set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${POPPLER_LIBRARIES})
@@ -55,7 +55,7 @@ if(ENABLE_SVG)
 endif()
 
 # fontforge starts using pkg-config 'correctly' since 2.0.0
-pkg_check_modules(FONTFORGE REQUIRED libfontforge>=2.0.0)
+pkg_check_modules(FONTFORGE REQUIRED libfontforge>=2.0.20170731)
 include_directories(${FONTFORGE_INCLUDE_DIRS})
 link_directories(${FONTFORGE_LIBRARY_DIRS})
 set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${FONTFORGE_LIBRARIES})