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 DC6BB15808B 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 0A77FE08F7; Sat, 12 Mar 2022 15:53:11 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 B3C53E08F7 for ; Sat, 12 Mar 2022 15:53:10 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8EDD5342E8F for ; Sat, 12 Mar 2022 15:53:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B285D31C 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.e9d8ae7fb9907b04ad32cd80ad0eec978ac92126.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/files/libreoffice-7.2.6.2-poppler-22.03.0.patch app-office/libreoffice/libreoffice-7.2.6.2.ebuild app-office/libreoffice/libreoffice-7.3.1.3.ebuild X-VCS-Directories: app-office/libreoffice/files/ app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e9d8ae7fb9907b04ad32cd80ad0eec978ac92126 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: 56803014-0fc8-4df1-978b-86f0e154f464 X-Archives-Hash: 4cb1446619661d5d90b01176a6eed517 commit: e9d8ae7fb9907b04ad32cd80ad0eec978ac92126 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Mar 12 15:45:31 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=e9d8ae7f app-office/libreoffice: Fix build with >=app-text/poppler-22.03.0 Patch taken from Arch Linux Closes: https://bugs.gentoo.org/834538 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../libreoffice-7.2.6.2-poppler-22.03.0.patch | 33 ++++++++++++++++++++++ app-office/libreoffice/libreoffice-7.2.6.2.ebuild | 3 ++ app-office/libreoffice/libreoffice-7.3.1.3.ebuild | 3 ++ 3 files changed, 39 insertions(+) diff --git a/app-office/libreoffice/files/libreoffice-7.2.6.2-poppler-22.03.0.patch b/app-office/libreoffice/files/libreoffice-7.2.6.2-poppler-22.03.0.patch new file mode 100644 index 000000000000..be4a39993ddb --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-7.2.6.2-poppler-22.03.0.patch @@ -0,0 +1,33 @@ +From 001ec0e10616a3a55fa7898bb68c983e94b7ce66 Mon Sep 17 00:00:00 2001 +From: foutrelis +Date: Wed, 2 Mar 2022 12:58:09 +0000 +Subject: [PATCH] upgpkg: libreoffice-fresh 7.3.0-7: poppler 22.03.0 rebuild + +diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +index ad6320139..e5f6d9c68 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +@@ -138,6 +138,15 @@ int main(int argc, char **argv) + _setmode( _fileno( g_binary_out ), _O_BINARY ); + #endif + ++#if POPPLER_CHECK_VERSION(22, 3, 0) ++ PDFDoc aDoc( std::make_unique(pFileName), ++ GooString(pOwnerPasswordStr), ++ GooString(pUserPasswordStr) ); ++ ++ PDFDoc aErrDoc( std::make_unique(pErrFileName), ++ GooString(pOwnerPasswordStr), ++ GooString(pUserPasswordStr) ); ++#else + PDFDoc aDoc( pFileName, + pOwnerPasswordStr, + pUserPasswordStr ); +@@ -145,6 +154,7 @@ int main(int argc, char **argv) + PDFDoc aErrDoc( pErrFileName, + pOwnerPasswordStr, + pUserPasswordStr ); ++#endif + + // Check various permissions for aDoc. + PDFDoc &rDoc = aDoc.isOk()? aDoc: aErrDoc; diff --git a/app-office/libreoffice/libreoffice-7.2.6.2.ebuild b/app-office/libreoffice/libreoffice-7.2.6.2.ebuild index e2b8f99a1ca1..e51b271e87c1 100644 --- a/app-office/libreoffice/libreoffice-7.2.6.2.ebuild +++ b/app-office/libreoffice/libreoffice-7.2.6.2.ebuild @@ -294,6 +294,9 @@ PATCHES=( "${FILESDIR}/${PN}-6.1-nomancompress.patch" "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch" + # TODO upstream + "${FILESDIR}/${P}-poppler-22.03.0.patch" # by Archlinux + # 7.3 branch "${FILESDIR}/${PN}-7.2.2.2-makefile-gengal.patch" ) diff --git a/app-office/libreoffice/libreoffice-7.3.1.3.ebuild b/app-office/libreoffice/libreoffice-7.3.1.3.ebuild index e4211ec16391..9b774db180ef 100644 --- a/app-office/libreoffice/libreoffice-7.3.1.3.ebuild +++ b/app-office/libreoffice/libreoffice-7.3.1.3.ebuild @@ -297,6 +297,9 @@ PATCHES=( "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch" + + # TODO upstream + "${FILESDIR}/${PN}-7.2.6.2-poppler-22.03.0.patch" # by Archlinux ) S="${WORKDIR}/${PN}-${MY_PV}"