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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2D7051382C5 for ; Thu, 14 May 2020 17:21:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42770E0991; Thu, 14 May 2020 17:21:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 16A07E0991 for ; Thu, 14 May 2020 17:21:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 277C2350CF0 for ; Thu, 14 May 2020 17:21:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D54A240 for ; Thu, 14 May 2020 17:21:08 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1589476846.37d716c1306ca3ee3877d4041c4cbfd9f4e1eecd.asturm@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-0.88.0-pdfsig-crash.patch app-text/poppler/poppler-0.88.0-r1.ebuild X-VCS-Directories: app-text/poppler/ app-text/poppler/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 37d716c1306ca3ee3877d4041c4cbfd9f4e1eecd X-VCS-Branch: master Date: Thu, 14 May 2020 17:21:08 +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: c4b41817-6bff-413f-969c-d6ae76da9006 X-Archives-Hash: 0f6903509d2de27444b8584fa8601d6c commit: 37d716c1306ca3ee3877d4041c4cbfd9f4e1eecd Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 14 16:54:48 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 14 17:20:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37d716c1 app-text/poppler: Fix pdfsig segfault Reported-by: Michelangelo Scopelliti gmx.it> Closes: https://bugs.gentoo.org/721118 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/poppler-0.88.0-pdfsig-crash.patch | 30 +++++ app-text/poppler/poppler-0.88.0-r1.ebuild | 124 +++++++++++++++++++++ 2 files changed, 154 insertions(+) diff --git a/app-text/poppler/files/poppler-0.88.0-pdfsig-crash.patch b/app-text/poppler/files/poppler-0.88.0-pdfsig-crash.patch new file mode 100644 index 00000000000..4f29727b6fc --- /dev/null +++ b/app-text/poppler/files/poppler-0.88.0-pdfsig-crash.patch @@ -0,0 +1,30 @@ +From 5cdb78fde50e3dc16006070b0884dfb6b23d964c Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Thu, 14 May 2020 00:22:33 +0200 +Subject: [PATCH] Fix crash in PDFDoc::getSignatureFields when there's no Forms + at all + +--- + poppler/PDFDoc.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc +index 572c77be..4b5621fc 100644 +--- a/poppler/PDFDoc.cc ++++ b/poppler/PDFDoc.cc +@@ -613,10 +613,12 @@ static void addSignatureFieldsToVector(FormField *ff, std::vector PDFDoc::getSignatureFields() + { +-// const int num_pages = getNumPages(); + std::vector res; + + const Form *f = catalog->getForm(); ++ if (!f) ++ return res; ++ + const int nRootFields = f->getNumFields(); + for (int i = 0; i < nRootFields; ++i) { + FormField *ff = f->getRootField(i); +-- +2.26.2 diff --git a/app-text/poppler/poppler-0.88.0-r1.ebuild b/app-text/poppler/poppler-0.88.0-r1.ebuild new file mode 100644 index 00000000000..487596c917a --- /dev/null +++ b/app-text/poppler/poppler-0.88.0-r1.ebuild @@ -0,0 +1,124 @@ +# Copyright 2005-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake toolchain-funcs xdg-utils + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git" + SLOT="0/9999" +else + SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SLOT="0/99" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION +fi + +DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" +HOMEPAGE="https://poppler.freedesktop.org/" + +LICENSE="GPL-2" +IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" + +# No test data provided +RESTRICT="test" + +BDEPEND=" + dev-util/glib-utils + virtual/pkgconfig +" +DEPEND=" + media-libs/fontconfig + media-libs/freetype + sys-libs/zlib + cairo? ( + dev-libs/glib:2 + x11-libs/cairo + introspection? ( dev-libs/gobject-introspection:= ) + ) + curl? ( net-misc/curl ) + jpeg? ( virtual/jpeg:0 ) + jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) + lcms? ( media-libs/lcms:2 ) + nss? ( >=dev-libs/nss-3.19:0 ) + png? ( media-libs/libpng:0= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtxml:5 + ) + tiff? ( media-libs/tiff:0 ) +" +RDEPEND="${DEPEND} + cjk? ( app-text/poppler-data ) +" + +DOCS=( AUTHORS NEWS README.md README-XPDF ) + +PATCHES=( + "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch" + "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" + "${FILESDIR}/${PN}-0.82.0-respect-cflags.patch" + "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch" + "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" + "${FILESDIR}/${P}-pdfsig-crash.patch" +) + +src_prepare() { + cmake_src_prepare + + # Clang doesn't grok this flag, the configure nicely tests that, but + # cmake just uses it, so remove it if we use clang + if [[ ${CC} == clang ]] ; then + sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die + fi + + if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then + sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \ + -i CMakeLists.txt || die + else + einfo "policy(SET CMP0002 OLD) - workaround can be removed" + fi +} + +src_configure() { + xdg_environment_reset + local mycmakeargs=( + -DBUILD_GTK_TESTS=OFF + -DBUILD_QT5_TESTS=OFF + -DBUILD_CPP_TESTS=OFF + -DRUN_GPERF_IF_PRESENT=OFF + -DENABLE_SPLASH=ON + -DENABLE_ZLIB=ON + -DENABLE_ZLIB_UNCOMPRESS=OFF + -DENABLE_UNSTABLE_API_ABI_HEADERS=ON + -DUSE_FLOAT=OFF + -DWITH_Cairo=$(usex cairo) + -DENABLE_LIBCURL=$(usex curl) + -DENABLE_CPP=$(usex cxx) + -DWITH_JPEG=$(usex jpeg) + -DENABLE_DCTDECODER=$(usex jpeg libjpeg none) + -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none) + -DENABLE_CMS=$(usex lcms lcms2 none) + -DWITH_NSS3=$(usex nss) + -DWITH_PNG=$(usex png) + $(cmake_use_find_package qt5 Qt5Core) + -DWITH_TIFF=$(usex tiff) + -DENABLE_UTILS=$(usex utils) + ) + use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + # live version doesn't provide html documentation + if use cairo && use doc && [[ ${PV} != *9999* ]]; then + # For now install gtk-doc there + insinto /usr/share/gtk-doc/html/poppler + doins -r "${S}"/glib/reference/html/* + fi +}