From b5a9c40aa849adbe23306cdf565257231a704378 Mon Sep 17 00:00:00 2001
From: Trenton H <797416+stumpylog@users.noreply.github.com>
Date: Tue, 7 Nov 2023 09:07:03 -0800
Subject: [PATCH] Builds qpdf 11.6.3

---
 qpdf.dockerfile | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/qpdf.dockerfile b/qpdf.dockerfile
index a923c4d..ca8f61b 100644
--- a/qpdf.dockerfile
+++ b/qpdf.dockerfile
@@ -25,7 +25,7 @@ ARG COMMON_BUILD_PACKAGES="\
   packaging-dev \
   libtool"
 
-ENV DEB_BUILD_OPTIONS="terse nocheck nodoc parallel=2"
+ENV DEB_BUILD_OPTIONS="terse nocheck nodoc parallel=8"
 
 WORKDIR /usr/src
 
@@ -60,7 +60,9 @@ RUN set -eux \
     && echo "Building amd64" \
       && dpkg-buildpackage --build=binary --unsigned-source --unsigned-changes --post-clean \
     && echo "Removing debug files" \
-      && rm -f ../*dbgsym*
+      && rm -f ../*dbgsym* \
+    && echo "Get build package versions" \
+      && dpkg-query -f '${Package;-40}${Version}\n' -W > ../pkg-list.txt
 
 #
 # Stage: aarch64-builder
@@ -68,7 +70,7 @@ RUN set -eux \
 #  - Sets aarch64 specific environment
 #  - Builds qpdf for aarch64 (cross compile)
 #
-FROM amd64-builder as aarch64-builder
+FROM pre-build as aarch64-builder
 
 ARG ARM64_PACKAGES="\
   crossbuild-essential-arm64 \
@@ -88,4 +90,17 @@ RUN set -eux \
     && echo "Building arm64" \
       && dpkg-buildpackage --build=binary --unsigned-source --unsigned-changes --post-clean --host-arch arm64 \
     && echo "Removing debug files" \
-      && rm -f ../*dbgsym*
+      && rm -f ../*dbgsym* \
+    && echo "Get build package versions" \
+      && dpkg-query -f '${Package;-40}${Version}\n' -W > ../pkg-list.txt
+
+FROM debian:bookworm-slim as package
+
+WORKDIR /usr/src/qpdf
+
+COPY --from=amd64-builder /usr/src/*.deb .
+COPY --from=amd64-builder /usr/src/pkg-list.txt amd64-pkg-list.txt
+COPY --from=aarch64-builder /usr/src/*.deb .
+COPY --from=aarch64-builder /usr/src/pkg-list.txt aarch64-pkg-list.txt
+
+ENTRYPOINT [ "/usr/bin/bash" ]