diff options
author | Ross Burton <ross.burton@arm.com> | 2023-07-05 18:26:00 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-07-07 08:59:27 -0700 |
commit | f0eee676628a626b54ec23d14056ed1297af2926 (patch) | |
tree | fadaa1316f7681b1cb1ca537d1b4b5916634df45 | |
parent | 2c38a555a15da1d19b464f4bb5baa731a0f465e6 (diff) | |
download | meta-openembedded-f0eee676628a626b54ec23d14056ed1297af2926.tar.gz |
poppler: fix missing include
Backport a patch to ensure that stdio.h is included before jpeglib.h.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch | 41 | ||||
-rw-r--r-- | meta-oe/recipes-support/poppler/poppler_23.04.0.bb | 1 |
2 files changed, 42 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch b/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch new file mode 100644 index 000000000..70ba1cf12 --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 2986f06c7cc9d64a506ebe861b8bf38f73386e86 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jordan Abrahams-Whitehead <ajordanr@google.com> | ||
3 | Date: Tue, 16 May 2023 18:52:19 +0000 | ||
4 | Subject: [PATCH] Add missing #include <cstdio> prior to jpeglib.h | ||
5 | |||
6 | Fixes #1398 | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
10 | --- | ||
11 | goo/JpegWriter.cc | 2 +- | ||
12 | poppler/ImageEmbeddingUtils.cc | 1 + | ||
13 | 2 files changed, 2 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/goo/JpegWriter.cc b/goo/JpegWriter.cc | ||
16 | index ca69fd055..566ee38f8 100644 | ||
17 | --- a/goo/JpegWriter.cc | ||
18 | +++ b/goo/JpegWriter.cc | ||
19 | @@ -23,7 +23,7 @@ | ||
20 | #ifdef ENABLE_LIBJPEG | ||
21 | |||
22 | # include "poppler/Error.h" | ||
23 | - | ||
24 | +# include <cstdio> | ||
25 | extern "C" { | ||
26 | # include <jpeglib.h> | ||
27 | } | ||
28 | diff --git a/poppler/ImageEmbeddingUtils.cc b/poppler/ImageEmbeddingUtils.cc | ||
29 | index 0c13fe968..07b9dfb62 100644 | ||
30 | --- a/poppler/ImageEmbeddingUtils.cc | ||
31 | +++ b/poppler/ImageEmbeddingUtils.cc | ||
32 | @@ -14,6 +14,7 @@ | ||
33 | |||
34 | #include <memory> | ||
35 | #ifdef ENABLE_LIBJPEG | ||
36 | +# include <cstdio> | ||
37 | extern "C" { | ||
38 | # include <jpeglib.h> | ||
39 | } | ||
40 | -- | ||
41 | GitLab | ||
diff --git a/meta-oe/recipes-support/poppler/poppler_23.04.0.bb b/meta-oe/recipes-support/poppler/poppler_23.04.0.bb index 099be58a4..896176801 100644 --- a/meta-oe/recipes-support/poppler/poppler_23.04.0.bb +++ b/meta-oe/recipes-support/poppler/poppler_23.04.0.bb | |||
@@ -7,6 +7,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ | |||
7 | file://0001-Do-not-overwrite-all-our-build-flags.patch \ | 7 | file://0001-Do-not-overwrite-all-our-build-flags.patch \ |
8 | file://basename-include.patch \ | 8 | file://basename-include.patch \ |
9 | file://0001-cmake-Do-not-use-isystem.patch \ | 9 | file://0001-cmake-Do-not-use-isystem.patch \ |
10 | file://jpeg-stdio.patch \ | ||
10 | " | 11 | " |
11 | SRC_URI[sha256sum] = "b6d893dc7dcd4138b9e9df59a13c59695e50e80dc5c2cacee0674670693951a1" | 12 | SRC_URI[sha256sum] = "b6d893dc7dcd4138b9e9df59a13c59695e50e80dc5c2cacee0674670693951a1" |
12 | 13 | ||