diff options
| author |   Marco Genasci <fedeliallalinea@gmail.com> | 2021-12-12 18:43:07 +0100 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2021-12-12 18:48:36 +0000 |
| commit | 804c291fd052088c649652a91fca2c0e6db6bb7c (patch) | |
| tree | f8bf944dad277f317f5003cd42cae20b55262c30 /app-text | |
| parent | dev-python/xarray: Stabilize 0.20.1 ppc64, #828970 (diff) | |
| download | gentoo-804c291fd052088c649652a91fca2c0e6db6bb7c.tar.gz gentoo-804c291fd052088c649652a91fca2c0e6db6bb7c.tar.bz2 gentoo-804c291fd052088c649652a91fca2c0e6db6bb7c.zip | |
app-text/poppler: add upstream patch for -png use flag compilation
Closes: https://bugs.gentoo.org/828578
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Marco Genasci <fedeliallalinea@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23270
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/poppler/files/poppler-21.12.0-include-csetjmp.patch | 27 | ||||
| -rw-r--r-- | app-text/poppler/poppler-21.12.0.ebuild | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/app-text/poppler/files/poppler-21.12.0-include-csetjmp.patch b/app-text/poppler/files/poppler-21.12.0-include-csetjmp.patch new file mode 100644 index 000000000000..0f0029269673 --- /dev/null +++ b/app-text/poppler/files/poppler-21.12.0-include-csetjmp.patch @@ -0,0 +1,27 @@ +https://bugs.gentoo.org/828578 +https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/1016 + +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 + +--- + 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 + diff --git a/app-text/poppler/poppler-21.12.0.ebuild b/app-text/poppler/poppler-21.12.0.ebuild index 9da7f4e63ab3..4b6f8bce95bf 100644 --- a/app-text/poppler/poppler-21.12.0.ebuild +++ b/app-text/poppler/poppler-21.12.0.ebuild @@ -63,6 +63,7 @@ PATCHES=( "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch" "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" + "${FILESDIR}/${P}-include-csetjmp.patch" ) src_prepare() { |