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 50EAF1382C5 for ; Tue, 6 Apr 2021 12:30:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8B6AE08BD; Tue, 6 Apr 2021 12:30:06 +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 725DFE08BD for ; Tue, 6 Apr 2021 12:30:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 C5231335D31 for ; Tue, 6 Apr 2021 12:30:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BA970640 for ; Tue, 6 Apr 2021 12:30:02 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1617712192.23771baa6ca237a3d7a00f75d8521621ed2e00f8.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/scribus/files/scribus-1.5.6.1-poppler-21.04.0.patch app-office/scribus/scribus-1.5.6.1.ebuild X-VCS-Directories: app-office/scribus/files/ app-office/scribus/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 23771baa6ca237a3d7a00f75d8521621ed2e00f8 X-VCS-Branch: master Date: Tue, 6 Apr 2021 12:30:02 +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: 4523a31d-8486-42b7-bbb9-72d57ae2d706 X-Archives-Hash: efd175ea7f511b5d03b219c7530f5991 commit: 23771baa6ca237a3d7a00f75d8521621ed2e00f8 Author: Christophe Lermytte lermytte be> AuthorDate: Mon Apr 5 12:13:05 2021 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Tue Apr 6 12:29:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23771baa app-office/scribus: add upstream patch for poppler-21.04.0 compatibility Patch source: https://github.com/scribusproject/scribus/commit/c62844064cd6d85802d21e188b0f479463e22095 Signed-off-by: Christophe Lermytte lermytte.be> Closes: https://bugs.gentoo.org/780363 Closes: https://github.com/gentoo/gentoo/pull/20265 Signed-off-by: Miroslav Šulc gentoo.org> .../files/scribus-1.5.6.1-poppler-21.04.0.patch | 27 ++++++++++++++++++++++ app-office/scribus/scribus-1.5.6.1.ebuild | 1 + 2 files changed, 28 insertions(+) diff --git a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.04.0.patch b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.04.0.patch new file mode 100644 index 00000000000..bb821ea5c9a --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.04.0.patch @@ -0,0 +1,27 @@ +From c62844064cd6d85802d21e188b0f479463e22095 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Sun, 4 Apr 2021 21:37:04 +0000 +Subject: [PATCH] #16536: Page::getFormWidgets() returns unique_ptr in poppler + 21.04.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@24599 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/slaoutput.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h +index 66c34203ae..cb191b1023 100644 +--- a/scribus/plugins/import/pdf/slaoutput.h ++++ b/scribus/plugins/import/pdf/slaoutput.h +@@ -379,7 +379,11 @@ class SlaOutputDev : public OutputDev + Catalog *catalog {nullptr}; + SplashFontEngine *m_fontEngine {nullptr}; + SplashFont *m_font {nullptr}; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 4, 0) ++ std::unique_ptr m_formWidgets; ++#else + FormPageWidgets *m_formWidgets {nullptr}; ++#endif + QHash > m_radioMap; + QHash m_radioButtons; + int m_actPage; diff --git a/app-office/scribus/scribus-1.5.6.1.ebuild b/app-office/scribus/scribus-1.5.6.1.ebuild index 5d0d78d897a..5e803e2024d 100644 --- a/app-office/scribus/scribus-1.5.6.1.ebuild +++ b/app-office/scribus/scribus-1.5.6.1.ebuild @@ -73,6 +73,7 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}"/${P}-poppler-21.03.0-{1,2}.patch + "${FILESDIR}"/${P}-poppler-21.04.0.patch # non(?)-upstreamable "${FILESDIR}"/${PN}-1.5.3-fpic.patch "${FILESDIR}"/${PN}-1.5.6-docdir.patch