| Message ID | 20211229225258.1124526-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/poppler: fix build without libpng | expand |
On Wed, 29 Dec 2021 23:52:58 +0100 Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > Fix the following build failure with libjpeg but without libpng raised > since bump to version 21.12.0 in commit > 1da4ead4c2286047228f710d233933dfc04c51f0: > > /home/giuliobenetti/autobuild/run/instance-2/output-1/build/poppler-21.12.0/poppler/ImageEmbeddingUtils.cc:298:5: error: 'jmp_buf' does not name a type > 298 | jmp_buf setjmpBuffer; > | ^~~~~~~ > > Fixes: > - http://autobuild.buildroot.org/results/360972af797bb1be80b0324796794817fe0ccf53 > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > ...h-when-WITH_JPEG-yes-and-WITH_PNG-no.patch | 27 +++++++++++++++++++ > 1 file changed, 27 insertions(+) > create mode 100644 package/poppler/0001-Include-setjmp-h-when-WITH_JPEG-yes-and-WITH_PNG-no.patch Applied to master, thanks. Thomas
diff --git a/package/poppler/0001-Include-setjmp-h-when-WITH_JPEG-yes-and-WITH_PNG-no.patch b/package/poppler/0001-Include-setjmp-h-when-WITH_JPEG-yes-and-WITH_PNG-no.patch new file mode 100644 index 0000000000..40af6a2e00 --- /dev/null +++ b/package/poppler/0001-Include-setjmp-h-when-WITH_JPEG-yes-and-WITH_PNG-no.patch @@ -0,0 +1,27 @@ +From 3ea6bca90d87d3f91556205c4e58ca425c6ac437 Mon Sep 17 00:00:00 2001 +From: Marco Genasci <fedeliallalinea@gmail.com> +Date: Sun, 12 Dec 2021 10:23:37 +0100 +Subject: [PATCH] Include setjmp.h when WITH_JPEG=yes and WITH_PNG=no + +[Retrieved from: +https://gitlab.freedesktop.org/poppler/poppler/-/commit/3ea6bca90d87d3f91556205c4e58ca425c6ac437] +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +--- + poppler/ImageEmbeddingUtils.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/poppler/ImageEmbeddingUtils.cc b/poppler/ImageEmbeddingUtils.cc +index 5c50f1269..c26b9eb2a 100644 +--- a/poppler/ImageEmbeddingUtils.cc ++++ b/poppler/ImageEmbeddingUtils.cc +@@ -16,6 +16,7 @@ + extern "C" { + # include <jpeglib.h> + } ++# include <csetjmp> + #endif + #ifdef ENABLE_LIBPNG + # include <png.h> +-- +GitLab +
Fix the following build failure with libjpeg but without libpng raised since bump to version 21.12.0 in commit 1da4ead4c2286047228f710d233933dfc04c51f0: /home/giuliobenetti/autobuild/run/instance-2/output-1/build/poppler-21.12.0/poppler/ImageEmbeddingUtils.cc:298:5: error: 'jmp_buf' does not name a type 298 | jmp_buf setjmpBuffer; | ^~~~~~~ Fixes: - http://autobuild.buildroot.org/results/360972af797bb1be80b0324796794817fe0ccf53 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- ...h-when-WITH_JPEG-yes-and-WITH_PNG-no.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/poppler/0001-Include-setjmp-h-when-WITH_JPEG-yes-and-WITH_PNG-no.patch