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 0CE0215808B for ; Sat, 12 Mar 2022 15:53:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9B04E08BF; Sat, 12 Mar 2022 15:53:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AB0C2E08BF for ; Sat, 12 Mar 2022 15:53:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5B3B9342F2A for ; Sat, 12 Mar 2022 15:53:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9ED2E31B for ; Sat, 12 Mar 2022 15:53:06 +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: <1647100367.a976c14d3eb189f1866b298e418e979f7a912350.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/calligra/calligra-3.2.1-r5.ebuild app-office/calligra/files/calligra-3.2.1-poppler-22.03.0.patch X-VCS-Directories: app-office/calligra/ app-office/calligra/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a976c14d3eb189f1866b298e418e979f7a912350 X-VCS-Branch: master Date: Sat, 12 Mar 2022 15:53:06 +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: e620846b-4de0-4333-987c-6716512e5c71 X-Archives-Hash: 75050855249b8483a0b2713b1e0baeab commit: a976c14d3eb189f1866b298e418e979f7a912350 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Mar 12 15:39:32 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Mar 12 15:52:47 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a976c14d app-office/calligra: Fix build with >=app-text/poppler-22.03.0 Patch taken from Arch Linux Closes: https://bugs.gentoo.org/834539 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/calligra/calligra-3.2.1-r5.ebuild | 1 + .../files/calligra-3.2.1-poppler-22.03.0.patch | 51 ++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/app-office/calligra/calligra-3.2.1-r5.ebuild b/app-office/calligra/calligra-3.2.1-r5.ebuild index 99221952f06f..d80568af53ec 100644 --- a/app-office/calligra/calligra-3.2.1-r5.ebuild +++ b/app-office/calligra/calligra-3.2.1-r5.ebuild @@ -120,6 +120,7 @@ PATCHES=( "${FILESDIR}"/${P}-{openexr-3,imath-{1,2}}.patch "${FILESDIR}"/${P}-cxx17-for-poppler-22.patch "${FILESDIR}"/${P}-cxx17-fixes.patch + "${FILESDIR}"/${P}-poppler-22.03.0.patch # by Archlinux, TODO upstream ) pkg_pretend() { diff --git a/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0.patch b/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0.patch new file mode 100644 index 000000000000..c704d7896e1f --- /dev/null +++ b/app-office/calligra/files/calligra-3.2.1-poppler-22.03.0.patch @@ -0,0 +1,51 @@ +From 8f328bef497a9e3bc628e4e294c1a70b0c8b0eab Mon Sep 17 00:00:00 2001 +From: foutrelis +Date: Wed, 2 Mar 2022 10:28:24 +0000 +Subject: [PATCH] Fix build with poppler 22.03.0 + +diff -uprw a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt +--- a/filters/karbon/pdf/CMakeLists.txt 2020-05-14 09:51:30.000000000 +0300 ++++ b/filters/karbon/pdf/CMakeLists.txt 2022-03-02 12:19:08.039939530 +0200 +@@ -14,6 +14,10 @@ if(Poppler_VERSION VERSION_LESS "0.83.0" + add_definitions("-DHAVE_POPPLER_PRE_0_83") + endif() + ++if(Poppler_VERSION VERSION_LESS "22.3.0") ++ add_definitions("-DHAVE_POPPLER_PRE_22_3") ++endif() ++ + set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp ) + + add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS}) +diff -uprw a/filters/karbon/pdf/Pdf2OdgImport.cpp b/filters/karbon/pdf/Pdf2OdgImport.cpp +--- a/filters/karbon/pdf/Pdf2OdgImport.cpp 2020-05-14 09:51:30.000000000 +0300 ++++ b/filters/karbon/pdf/Pdf2OdgImport.cpp 2022-03-02 12:20:35.125605950 +0200 +@@ -86,8 +86,12 @@ KoFilter::ConversionStatus Pdf2OdgImport + if (! globalParams) + return KoFilter::NotImplemented; + ++#ifdef HAVE_POPPLER_PRE_22_3 + GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); + PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); ++#else ++ PDFDoc * pdfDoc = new PDFDoc(std::make_unique(QFile::encodeName(m_chain->inputFile()).data())); ++#endif + if (! pdfDoc) { + #ifdef HAVE_POPPLER_PRE_0_83 + delete globalParams; +diff -uprw a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp +--- a/filters/karbon/pdf/PdfImport.cpp 2020-05-14 09:51:30.000000000 +0300 ++++ b/filters/karbon/pdf/PdfImport.cpp 2022-03-02 12:21:46.197510028 +0200 +@@ -73,8 +73,12 @@ KoFilter::ConversionStatus PdfImport::co + if (! globalParams) + return KoFilter::NotImplemented; + ++#ifdef HAVE_POPPLER_PRE_22_3 + GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); + PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); ++#else ++ PDFDoc * pdfDoc = new PDFDoc(std::make_unique(QFile::encodeName(m_chain->inputFile()).data())); ++#endif + if (! pdfDoc) { + #ifdef HAVE_POPPLER_PRE_0_83 + delete globalParams;