From a372a988fdcdf84c8ba2e47f021802fc3ffb9089 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Sat, 11 Dec 2021 17:16:05 -0500 Subject: Switch build from docbook manual to sphinx Also remove linearization from qpdf-manual.pdf. It's a small file, and removing the dependency on the qpdf executable significantly shortens build times. --- appimage/Dockerfile | 6 ++++-- appimage/build-appimage | 9 +++++---- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'appimage') diff --git a/appimage/Dockerfile b/appimage/Dockerfile index c607ca21..51221908 100644 --- a/appimage/Dockerfile +++ b/appimage/Dockerfile @@ -1,11 +1,13 @@ -FROM ubuntu:16.04 +FROM ubuntu:18.04 +ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get -y install screen autoconf git sudo \ build-essential zlib1g-dev libjpeg-dev libgnutls28-dev \ - docbook-xsl fop xsltproc \ + python3-pip texlive-latex-extra latexmk \ inkscape imagemagick busybox-static wget fuse && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* +RUN pip3 install sphinx COPY entrypoint /entrypoint RUN chmod +x /entrypoint ENTRYPOINT [ "/entrypoint" ] diff --git a/appimage/build-appimage b/appimage/build-appimage index 03039ed1..04fa805b 100755 --- a/appimage/build-appimage +++ b/appimage/build-appimage @@ -43,24 +43,25 @@ if [ "x$1" == "x--sign" ]; then fi -# Check if we are on Ubuntu Trusty +# Check Ubuntu Distribution _osversion=$(cat /etc/os-release | grep PRETTY_NAME | awk -F'=' '{print $2}' | sed 's#"##g') # Warn users building the AppImage locally: -if [[ ! $_osversion =~ Ubuntu\ 16.04.*\ LTS ]]; then +if [[ ! $_osversion =~ Ubuntu\ 18.04.*\ LTS ]]; then set +x echo "" # 0 1 2 3 4 5 6 7 # 01234567890123456789012345678901234567890123456789012345678901234567890123456789 echo "+===========================================================================+" echo "|| WARNING: You are about to build a QPDF AppImage on a system which is ||" - echo "|| NOT Ubuntu 16.04 LTS ('Xenial'). ||" + echo "|| NOT Ubuntu 18.04 LTS. ||" echo "|| ||" echo "|| It is recommended that you use a distribution that is at least a ||" echo "|| few years old to maximize the number of Linux distributions the ||" echo "|| resulting AppImage will work on. AppImages often don't work on ||" echo "|| distributions older than the one they were built on because of ||" - echo "|| standard library differences. ||" + echo "|| standard library differences. The oldest supported Ubuntu LTS is ||" + echo "|| a good option. ||" echo "+===========================================================================+" echo "" set -x -- cgit v1.2.3-54-g00ecf