| 1 |
commit: 86ec990a4f5073f451c5a895ac8e70cc2f7721cd |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Tue Nov 8 06:19:14 2022 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 8 16:10:53 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86ec990a |
| 7 |
|
| 8 |
app-office/libreoffice: remove unused patch |
| 9 |
|
| 10 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/28185 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
.../libreoffice-7.2.6.2-poppler-22.03.0.patch | 33 ---------------------- |
| 15 |
1 file changed, 33 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
deleted file mode 100644 |
| 19 |
index be4a39993ddb..000000000000 |
| 20 |
--- a/app-office/libreoffice/files/libreoffice-7.2.6.2-poppler-22.03.0.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,33 +0,0 @@ |
| 23 |
-From 001ec0e10616a3a55fa7898bb68c983e94b7ce66 Mon Sep 17 00:00:00 2001 |
| 24 |
-From: foutrelis <foutrelis@eb2447ed-0c53-47e4-bac8-5bc4a241df78> |
| 25 |
-Date: Wed, 2 Mar 2022 12:58:09 +0000 |
| 26 |
-Subject: [PATCH] upgpkg: libreoffice-fresh 7.3.0-7: poppler 22.03.0 rebuild |
| 27 |
- |
| 28 |
-diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx |
| 29 |
-index ad6320139..e5f6d9c68 100644 |
| 30 |
---- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx |
| 31 |
-+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx |
| 32 |
-@@ -138,6 +138,15 @@ int main(int argc, char **argv) |
| 33 |
- _setmode( _fileno( g_binary_out ), _O_BINARY ); |
| 34 |
- #endif |
| 35 |
- |
| 36 |
-+#if POPPLER_CHECK_VERSION(22, 3, 0) |
| 37 |
-+ PDFDoc aDoc( std::make_unique<GooString>(pFileName), |
| 38 |
-+ GooString(pOwnerPasswordStr), |
| 39 |
-+ GooString(pUserPasswordStr) ); |
| 40 |
-+ |
| 41 |
-+ PDFDoc aErrDoc( std::make_unique<GooString>(pErrFileName), |
| 42 |
-+ GooString(pOwnerPasswordStr), |
| 43 |
-+ GooString(pUserPasswordStr) ); |
| 44 |
-+#else |
| 45 |
- PDFDoc aDoc( pFileName, |
| 46 |
- pOwnerPasswordStr, |
| 47 |
- pUserPasswordStr ); |
| 48 |
-@@ -145,6 +154,7 @@ int main(int argc, char **argv) |
| 49 |
- PDFDoc aErrDoc( pErrFileName, |
| 50 |
- pOwnerPasswordStr, |
| 51 |
- pUserPasswordStr ); |
| 52 |
-+#endif |
| 53 |
- |
| 54 |
- // Check various permissions for aDoc. |
| 55 |
- PDFDoc &rDoc = aDoc.isOk()? aDoc: aErrDoc; |
Archives