Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 656846 - =app-office/libreoffice-6.0.4.2: failes appling libreoffice-6.0.3.2-disable-flaky-tests.patch
Summary: =app-office/libreoffice-6.0.4.2: failes appling libreoffice-6.0.3.2-disable-f...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo Office Team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-05-29 14:43 UTC by cyberbat
Modified: 2018-05-29 14:59 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description cyberbat 2018-05-29 14:43:51 UTC
I have such log when emerging subj:

>>> Preparing source in /var/tmp/portage/app-office/libreoffice-6.0.4.2/work/libreoffice-6.0.4.2 ...
 * Applying libreoffice-5.4-system-pyuno.patch ...                                                                                                             [ ok ]
 * Applying libreoffice-5.3.4.2-kioclient5.patch ...                                                                                                           [ ok ]
 * Applying libreoffice-6.0.3.2-disable-flaky-tests.patch ...
1 out of 3 hunks FAILED -- saving rejects to file xmlsecurity/qa/unit/signing/signing.cxx.rej                                                                  [ !! ]
 * ERROR: app-office/libreoffice-6.0.4.2::gentoo failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/app-office/libreoffice-6.0.4.2/files/libreoffice-6.0.3.2-disable-flaky-tests.patch
 * 
 * Call stack:
 *               ebuild.sh, line  124:  Called src_prepare
 *             environment, line 6702:  Called default
 *      phase-functions.sh, line  853:  Called default_src_prepare
 *      phase-functions.sh, line  918:  Called __eapi6_src_prepare
 *             environment, line  642:  Called eapply '/var/tmp/portage/app-office/libreoffice-6.0.4.2/files/libreoffice-5.4-system-pyuno.patch' '/var/tmp/portage/app-office/libreoffice-6.0.4.2/files/libreoffice-5.3.4.2-kioclient5.patch' '/var/tmp/portage/app-office/libreoffice-6.0.4.2/files/libreoffice-6.0.3.2-disable-flaky-tests.patch' '/var/tmp/portage/app-office/libreoffice-6.0.4.2/files/libreoffice-5.2.5.1-glibc-2.24.patch' '/var/tmp/portage/app-office/libreoffice-6.0.4.2/files/libreoffice-6.0.3.2-testTdf108947.patch' '/var/tmp/portage/app-office/libreoffice-6.0.4.2/work/libreoffice-6.0.3.2-patchset-01'
 *             environment, line 1858:  Called _eapply_patch '/var/tmp/portage/app-office/libreoffice-6.0.4.2/files/libreoffice-6.0.3.2-disable-flaky-tests.patch'
 *             environment, line 1796:  Called __helpers_die 'patch -p1  failed with /var/tmp/portage/app-office/libreoffice-6.0.4.2/files/libreoffice-6.0.3.2-disable-flaky-tests.patch'
 *   isolated-functions.sh, line  117:  Called die
 * The specific snippet of code:
 *              die "$@"
 * 
 * If you need support, post the output of `emerge --info '=app-office/libreoffice-6.0.4.2::gentoo'`,
 * the complete build log and the output of `emerge -pqv '=app-office/libreoffice-6.0.4.2::gentoo'`.


Here is contents of reject file:
# cat /var/tmp/portage/app-office/libreoffice-6.0.4.2/work/libreoffice-6.0.4.2/xmlsecurity/qa/unit/signing/signing.cxx.rej
--- xmlsecurity/qa/unit/signing/signing.cxx     2018-01-27 18:21:08.228434985 +0100
+++ xmlsecurity/qa/unit/signing/signing.cxx     2018-01-27 18:21:37.428824309 +0100
@@ -143,7 +143,7 @@
     CPPUNIT_TEST(testODFUntrustedGoodGPG);
     CPPUNIT_TEST(testODFBrokenStreamGPG);
     CPPUNIT_TEST(testODFBrokenDsigGPG);
-    CPPUNIT_TEST(testODFEncryptedGPG);
+//    CPPUNIT_TEST(testODFEncryptedGPG);
 #endif
     CPPUNIT_TEST_SUITE_END();
Comment 1 Larry the Git Cow gentoo-dev 2018-05-29 14:59:29 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b20d064bc910e4365155da6a4b925902906dba38

commit b20d064bc910e4365155da6a4b925902906dba38
Author:     Andreas Sturmlechner <asturm@gentoo.org>
AuthorDate: 2018-05-29 14:58:24 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2018-05-29 14:58:24 +0000

    app-office/libreoffice: Re-shuffle disable-flaky-tests
    
    Closes: https://bugs.gentoo.org/656846
    Package-Manager: Portage-2.3.40, Repoman-2.3.9

 ...ibreoffice-6.0.3.2-disable-flaky-tests-1.patch} | 37 ----------------------
 ...libreoffice-6.0.3.2-disable-flaky-tests-2.patch | 37 ++++++++++++++++++++++
 app-office/libreoffice/libreoffice-6.0.3.2.ebuild  |  2 +-
 app-office/libreoffice/libreoffice-6.0.4.2.ebuild  |  2 +-
 app-office/libreoffice/libreoffice-6.0.9999.ebuild |  2 +-
 5 files changed, 40 insertions(+), 40 deletions(-)