summaryrefslogtreecommitdiff
path: root/app-office
diff options
context:
space:
mode:
Diffstat (limited to 'app-office')
-rw-r--r--app-office/Manifest.gzbin7896 -> 7897 bytes
-rw-r--r--app-office/libreoffice/Manifest1
-rw-r--r--app-office/libreoffice/files/libreoffice-7.2.6.2-poppler-22.03.0.patch33
3 files changed, 0 insertions, 34 deletions
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 9d8bfd2909f3..e803312e763f 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
Binary files differ
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ec1afec475e5..0b5c9c8b4619 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,7 +1,6 @@
AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0ad4b57a3739d6d34a2941f2ea57d3a5c4ab65e3f3c2376243aa88c9c05b1038cf9bfb7605a370d11513bb4553de2d268010519 SHA512 2aa6d1fc96749b79b3291f6e27630c6cf59d2c743f0dd8603867ba8aec2c17f87b70e1dd031365013f7e9ea53c160e9cb3f48af592a587dc05f3ae4cc1b35df6
AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083
AUX libreoffice-7.2.0.4-qt5detect.patch 536 BLAKE2B fd77876d1ca3973ad30c9ebb60bf28e163dd29dcaebaa2b94d84f4c2ab060617d96f4df3d5114f17f882b0cb8b9e2ecdb284fdd1e4aaf8a34cc0c1f06a295c04 SHA512 e1ac7dfc4743cbdea3050b18c1714d06c8bcca4abc51d56e13362c8379fbdd3d37a1916c962fcb1389783c9b1fd72783c9ee45fbb649538ca0fc0cb7b05bcacf
-AUX libreoffice-7.2.6.2-poppler-22.03.0.patch 1361 BLAKE2B da788c4de7203ab20337a1d92cb4478f7a7db3f54e05054e5943d8acf78eb0907f9510c6bdf5bfc5466171322af98f55fe68ee0678e2a08856f6247b1981840b SHA512 f2cb95d52a97b1f3dc985e391df333159b2754ba3a386b71479c584363022c54b09125bfedaf61c72f056e12677a4dd1eac1d3074adaadc084243ddea05392c6
AUX libreoffice-7.3.5.2-gpgme-1.18.0.patch 2290 BLAKE2B ff65e3bb94e000c9963300580378213e7768748012f5ece1f761eb95ee9cda1dd5582c47abd7a2ca10c0266ab26ce4cc1aa4a683d8791c6940ca9d8758cac446 SHA512 b631300030d0fa9434ca97bf79ebfb8d497568f02aff58b9438840f1166b7d6d9c0d3ce7a4ad67dedfe5ee7588adb4027ef17dd6054a6c29f28278615ae0c019
AUX libreoffice-7.3.5.2-poppler-22.09.0.patch 1792 BLAKE2B 76b328207cbbc1ad607ed9568c296152deb3aca8a425386fadaf9eebc575e1841f917f6eb2846ced361e1e559fe0ded105c92cb8c6674237e5655e80d0014c0d SHA512 437312894fdee03eb37d1330c22685b3de57791f20ab104ec8dbb4281ccfea3f31586eea1dd31a37fea24e2065f16f631fd721f749df4c31fc5e5e71d2f43626
AUX libreoffice.confd 228 BLAKE2B 7b9ed0d08b91b6e78dd3a2ac242cac48ef141c25bf25713b5fa6c4fdea3d5b0e16b4073a864fbec328edf4008729869fba5236e9cc113ba9bd3d6de5c10153c3 SHA512 6718cfd481b4349d70b718d4811f80ac0eff60d465b9f9eeff8ab9641de1fecb6197023f98bb1fca77a57b48ae2d8e38803f3af3a51191b1df71aa8cc5d33661
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;