From 45e6d8e80b1b79eccaec4c921c38a4f4f777177d Mon Sep 17 00:00:00 2001 From: Stephen Gaito Date: Tue, 17 Dec 2019 16:01:02 +0000 Subject: [PATCH] updated how poppler-data in built --- buildScripts/buildPoppler | 4 ++++ buildScripts/createAppImage | 6 +++++- buildScripts/createDockerImage | 6 +++++- buildScripts/getDevLibrariesApt | 1 - 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/buildScripts/buildPoppler b/buildScripts/buildPoppler index 52df3e9..baf305b 100755 --- 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 diff --git a/buildScripts/createAppImage b/buildScripts/createAppImage index 4ebebd6..6fe9eb8 100755 --- 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) # diff --git a/buildScripts/createDockerImage b/buildScripts/createDockerImage index 71e2287..e31daa4 100755 --- 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 diff --git a/buildScripts/getDevLibrariesApt b/buildScripts/getDevLibrariesApt index dadc2e4..ce518a2 100755 --- 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 \