commit: 86ec990a4f5073f451c5a895ac8e70cc2f7721cd Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Tue Nov 8 06:19:14 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Nov 8 16:10:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86ec990a
app-office/libreoffice: remove unused patch Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/28185 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../libreoffice-7.2.6.2-poppler-22.03.0.patch | 33 ---------------------- 1 file changed, 33 deletions(-) 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 deleted file mode 100644 index be4a39993ddb..000000000000 --- a/app-office/libreoffice/files/libreoffice-7.2.6.2-poppler-22.03.0.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 001ec0e10616a3a55fa7898bb68c983e94b7ce66 Mon Sep 17 00:00:00 2001 -From: foutrelis <foutrelis@eb2447ed-0c53-47e4-bac8-5bc4a241df78> -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<GooString>(pFileName), -+ GooString(pOwnerPasswordStr), -+ GooString(pUserPasswordStr) ); -+ -+ PDFDoc aErrDoc( std::make_unique<GooString>(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;
