updated how poppler-data in built

2019-12-17 16:01:02 +00:00 · 2019-12-17 16:01:02 +00:00 · 45e6d8e80b
parent 5fc7d42a16
commit 45e6d8e80b
4 changed files with 14 additions and 3 deletions
--- a/buildScripts/buildPoppler
+++ b/buildScripts/buildPoppler
@ -14,3 +14,7 @@ cd build
 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \
    -DENABLE_LIBOPENJPEG=none ..
 make $MAKE_PARALLEL
+
+cd ../../poppler-data
+
+make install prefix=/usr/local
--- a/buildScripts/createAppImage
+++ b/buildScripts/createAppImage
@ -25,7 +25,11 @@ sudo rm -rf install_manifest.txt

 make install DESTDIR=../../imageBuild/appDir

-cd ../../imageBuild
+cd ../../poppler-data
+
+make install DESTDIR=../../imageBuild/appDir
+
+cd ../imageBuild

 # force libfontconfig into AppImage (linuxdeploy blacklists libfontconfig)
 #
--- a/buildScripts/createDockerImage
+++ b/buildScripts/createDockerImage
@ -48,7 +48,11 @@ echo "export DOCKER_NAME=\"$DOCKER_NAME\""         >> buildScripts/reSourceVersi

  make install DESTDIR=../../imageBuild/dockerDir

-  cd ../../imageBuild/dockerDir
+  cd ../../poppler-data
+
+  make install DESTDIR=../../imageBuild/dockerDir
+
+  cd ../imageBuild/dockerDir

  copy_deps

--- a/buildScripts/getDevLibrariesApt
+++ b/buildScripts/getDevLibrariesApt
@ -19,7 +19,6 @@ sudo apt-get $UNATTENDED install	\
  libspiro-dev				\
  libpng-dev				\
  libjpeg-dev				\
-  poppler-data				\
  libpango1.0-dev			\
  liblcms2-dev				\
  libxml2-dev				\