diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-10-07 11:03:14 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-10-07 11:03:14 +0100 |
commit | 957235cf19a691360c720f7913672adda4258ed0 (patch) | |
tree | 812bba7928f4293ead05a7ee9c1ac39c5ef9f12e /app-office/libreoffice/files | |
parent | 62f67115b5c46134c34f88f4b1cbdacc19384c0a (diff) |
gentoo resync : 07.10.2018
Diffstat (limited to 'app-office/libreoffice/files')
3 files changed, 0 insertions, 142 deletions
diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch deleted file mode 100644 index 55f2d8a55fc7..000000000000 --- a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:08.228434985 +0100 -+++ b/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:37.428824309 +0100 -@@ -114,7 +114,7 @@ - /// Test a typical broken ODF signature where the XML dsig hash is corrupted. - void testODFBrokenDsigGPG(); - /// Test loading an encrypted ODF document -- void testODFEncryptedGPG(); -+// void testODFEncryptedGPG(); - #endif - CPPUNIT_TEST_SUITE(SigningTest); - CPPUNIT_TEST(testDescription); -@@ -143,7 +143,7 @@ - CPPUNIT_TEST(testODFUntrustedGoodGPG); - CPPUNIT_TEST(testODFBrokenStreamGPG); - CPPUNIT_TEST(testODFBrokenDsigGPG); -- CPPUNIT_TEST(testODFEncryptedGPG); -+// CPPUNIT_TEST(testODFEncryptedGPG); - #endif - CPPUNIT_TEST_SUITE_END(); - -@@ -743,14 +743,14 @@ - CPPUNIT_ASSERT_EQUAL(static_cast<int>(SignatureState::BROKEN), static_cast<int>(pObjectShell->GetDocumentSignatureState())); - } - --void SigningTest::testODFEncryptedGPG() -+/*void SigningTest::testODFEncryptedGPG() - { - createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "encryptedGPG.odt"); - SfxBaseModel* pBaseModel = dynamic_cast<SfxBaseModel*>(mxComponent.get()); - CPPUNIT_ASSERT(pBaseModel); - SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell(); - CPPUNIT_ASSERT(pObjectShell); --} -+}*/ - - #endif - diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-poppler-0.64.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-poppler-0.64.patch deleted file mode 100644 index 37a554d807da..000000000000 --- a/app-office/libreoffice/files/libreoffice-6.0.3.2-poppler-0.64.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 106b2c96e9807af14d6eb6e8f83dcf25095a093e Mon Sep 17 00:00:00 2001 -From: Rene Engelhard <rene@debian.org> -Date: Tue, 24 Apr 2018 15:56:23 +0200 -Subject: fix build with poppler 0.64 - -GooString became const... - -Change-Id: Icc95be2e8603a4e22c6a9ac2008986bacd0bfba5 -Reviewed-on: https://gerrit.libreoffice.org/53422 -Tested-by: Jenkins <ci@libreoffice.org> -Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> ---- - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 10 ++++++++++ - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++ - 2 files changed, 14 insertions(+) - -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -index 00fd56a..9618e5b 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -446,6 +446,9 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state ) - FontAttributes aNewFont; - int nSize = 0; - -+#if POPPLER_CHECK_VERSION(0, 64, 0) -+ const -+#endif - GooString* pFamily = gfxFont->getName(); - if( pFamily ) - { -@@ -742,6 +745,9 @@ void PDFOutDev::updateFont(GfxState *state) - FontAttributes aFont; - int nEmbedSize=0; - -+#if POPPLER_CHECK_VERSION(0, 64, 0) -+ const -+#endif - Ref* pID = gfxFont->getID(); - // TODO(Q3): Portability problem - long long fontID = (long long)pID->gen << 32 | (long long)pID->num; -@@ -932,7 +938,11 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y, - printf( "\n" ); - } - -+#if POPPLER_CHECK_VERSION(0, 64, 0) -+void PDFOutDev::drawString(GfxState*, const GooString* /*s*/) -+#else - void PDFOutDev::drawString(GfxState*, GooString* /*s*/) -+#endif - { - // TODO(F3): NYI - } -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -index 922c513..2a6268c 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -223,7 +223,11 @@ namespace pdfi - double dx, double dy, - double originX, double originY, - CharCode code, int nBytes, Unicode *u, int uLen) override; -+#if POPPLER_CHECK_VERSION(0, 64, 0) -+ virtual void drawString(GfxState *state, const GooString *s) override; -+#else - virtual void drawString(GfxState *state, GooString *s) override; -+#endif - virtual void endTextObject(GfxState *state) override; - - //----- image drawing --- -cgit v1.1 - diff --git a/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch b/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch deleted file mode 100644 index 1430fdf1a346..000000000000 --- a/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5f1bf6598b5725ad1e50ae9f7ec7524cc8a834fa Mon Sep 17 00:00:00 2001 -From: Louis Sautier <sautier.louis@gmail.com> -Date: Sun, 10 Jun 2018 12:25:18 +0200 -Subject: Fix build with GLM 0.9.9.0, tdf#118070 - -One of the test files was forgotten in 953c4add8fd76d88f49a81ae4c21a1fdcc007e57 - -Change-Id: I0315433c688ff7edb2ba599bbef203cac9de3022 -Reviewed-on: https://gerrit.libreoffice.org/55554 -Reviewed-by: Rene Engelhard <rene@debian.org> -Tested-by: Rene Engelhard <rene@debian.org> ---- - vcl/Executable_icontest.mk | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk -index ce16330..8c917b7 100644 ---- a/vcl/Executable_icontest.mk -+++ b/vcl/Executable_icontest.mk -@@ -19,6 +19,12 @@ $(eval $(call gb_Executable_use_externals,icontest,\ - )) - endif - -+ifeq ($(SYSTEM_GLM),TRUE) -+$(eval $(call gb_Executable_add_defs,icontest,\ -+ -DGLM_ENABLE_EXPERIMENTAL \ -+)) -+endif -+ - $(eval $(call gb_Executable_use_api,icontest,\ - offapi \ - udkapi \ --- -cgit v1.1 |