diff --git a/docker/0001-pdfwrite-undo-commit-4dcfae36bb4dcbc4ef3b5e5afc98bcd.patch b/docker/0001-pdfwrite-undo-commit-4dcfae36bb4dcbc4ef3b5e5afc98bcd.patch deleted file mode 100644 index 00b597953eab1..0000000000000 --- a/docker/0001-pdfwrite-undo-commit-4dcfae36bb4dcbc4ef3b5e5afc98bcd.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5e69c48f4633163207b8174c51f6ff5987d0562e Mon Sep 17 00:00:00 2001 -From: Ken Sharp -Date: Tue, 4 Jun 2024 14:26:01 +0100 -Subject: [PATCH] pdfwrite - undo commit - 4dcfae36bb4dcbc4ef3b5e5afc98bcde0d6b9ddc - -Commit 4dcfae36bb4dcbc4ef3b5e5afc98bcde0d6b9ddc added detection for an -SMask when producing PDF/A-2 with ColorConversionStrategy set to a -device space other than DeviceGray. This was because the version of -veraPDF at the time gave an error on the SMask data. - -It appears the current version of veraPDF does not do so, and nor does -the Preflight in the current version of Acrobat. I still cannot find any -authoritative source for whether this is permitted or not. In my opinion -it should be because the SMask is used as an alpha channel, we do not -actually draw anything in DeviceGray. - -In the absence of any specific documentation, and given that standard -conformance checkers no longer complain, I'v put the code back the way -it was before so that we will carry the SMask through in DeviceGray. The -resulting PDF is conformant according to Acrobat Professional of this -date (2024.001.20604) and veraPDF 1.24.3. ---- - devices/vector/gdevpdfi.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/devices/vector/gdevpdfi.c b/devices/vector/gdevpdfi.c -index f1e244cf5..b6d18bc68 100644 ---- a/devices/vector/gdevpdfi.c -+++ b/devices/vector/gdevpdfi.c -@@ -1412,6 +1412,10 @@ pdf_begin_typed_image(gx_device_pdf *pdev, const gs_gstate * pgs, - - /* We don't want to change the colour space of a mask, or an SMask (both of which are Gray) */ - if (!is_mask) { -+#if 1 -+ if (image[0].pixel.ColorSpace != NULL && !(context == PDF_IMAGE_TYPE3_MASK)) -+ convert_to_process_colors = setup_image_colorspace(pdev, &image[0], pcs, &pcs_orig, names, &cs_value); -+#else - if (image[0].pixel.ColorSpace != NULL) { - if (context != PDF_IMAGE_TYPE3_MASK) - convert_to_process_colors = setup_image_colorspace(pdev, &image[0], pcs, &pcs_orig, names, &cs_value); -@@ -1428,6 +1432,7 @@ pdf_begin_typed_image(gx_device_pdf *pdev, const gs_gstate * pgs, - } - } - } -+#endif - - if (pim->BitsPerComponent > 8 && convert_to_process_colors) { - use_fallback = 1; --- -2.34.1 - diff --git a/docker/Dockerfile b/docker/Dockerfile index 6bbee6a779705..3dc50457d68c5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -59,14 +59,12 @@ fi RUN npm install -g less@4.2.0 # ghostscript -COPY docker/0001-pdfwrite-undo-commit-4dcfae36bb4dcbc4ef3b5e5afc98bcd.patch /tmp/0001-pdfwrite-undo-commit-4dcfae36bb4dcbc4ef3b5e5afc98bcd.patch -RUN GHOSTSCRIPT_VERSION=10031 \ - && GHOSTSCRIPT_FILE_NAME=ghostscript-10.03.1.tar.gz \ +RUN GHOSTSCRIPT_VERSION=10040 \ + && GHOSTSCRIPT_FILE_NAME=ghostscript-10.04.0.tar.gz \ && GHOSTSCRIPT_BASE_NAME=$(basename ${GHOSTSCRIPT_FILE_NAME} .tar.gz) \ && curl -sL -o /tmp/${GHOSTSCRIPT_FILE_NAME} https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${GHOSTSCRIPT_VERSION}/${GHOSTSCRIPT_FILE_NAME} \ && tar -xzf /tmp/${GHOSTSCRIPT_FILE_NAME} -C /tmp \ && cd /tmp/${GHOSTSCRIPT_BASE_NAME}/ \ - && patch -p1 < /tmp/0001-pdfwrite-undo-commit-4dcfae36bb4dcbc4ef3b5e5afc98bcd.patch \ && ./configure \ && make -j$(nproc) \ && make install \