From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 34B15158086 for ; Sun, 12 Dec 2021 18:48:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A7ACE07A5; Sun, 12 Dec 2021 18:48:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E28ABE07A5 for ; Sun, 12 Dec 2021 18:48:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ECE8A343282 for ; Sun, 12 Dec 2021 18:48:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89C80177 for ; Sun, 12 Dec 2021 18:48:49 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1639334916.804c291fd052088c649652a91fca2c0e6db6bb7c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/poppler/files/poppler-21.12.0-include-csetjmp.patch app-text/poppler/poppler-21.12.0.ebuild X-VCS-Directories: app-text/poppler/files/ app-text/poppler/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 804c291fd052088c649652a91fca2c0e6db6bb7c X-VCS-Branch: master Date: Sun, 12 Dec 2021 18:48:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d91a9a65-9344-43ed-8675-93af019ed96a X-Archives-Hash: f7a0bc4b9b0fa5ed96afb1340e13f07e commit: 804c291fd052088c649652a91fca2c0e6db6bb7c Author: Marco Genasci gmail com> AuthorDate: Sun Dec 12 17:43:07 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Dec 12 18:48:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=804c291f 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 gmail.com> Closes: https://github.com/gentoo/gentoo/pull/23270 Signed-off-by: Sam James gentoo.org> .../files/poppler-21.12.0-include-csetjmp.patch | 27 ++++++++++++++++++++++ app-text/poppler/poppler-21.12.0.ebuild | 1 + 2 files changed, 28 insertions(+) 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 +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 + } ++# include + #endif + #ifdef ENABLE_LIBPNG + # include +-- +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() {