solenv/flatpak-disable-gpgconf-socketdir-test.patch | 61 ++++++++++++++++++++ solenv/flatpak-manifest.in | 4 + 2 files changed, 65 insertions(+)
New commits: commit 23339ec77e38ebdae86eb05a2a3d9a3f5609df64 Author: Stephan Bergmann <[email protected]> AuthorDate: Tue Dec 4 18:16:47 2018 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Tue Dec 4 18:16:47 2018 +0100 In flatpak build, disable problematic test using gpg for now ...which fails as documented in solenv/flatpak-disable-gpgconf-socketdir-test.patch, presumably because the gpg software in org.freedesktop.Sdk//1.6 (which has e.g. "gpgconf (GnuPG) 2.1.14-unknown") doesn't shut down a started gpg daemon again. Lets see if this will get fixed by <https://github.com/flathub/org.libreoffice.LibreOffice/issues/54> "Build against org.freedesktop.Platform 18.08" (where org.freedesktop.Sdk//18.08 has e.g. "gpgconf (GnuPG) 2.2.9"). Change-Id: I9c7ad326ff8f2278ec58ee484d088f6fba97694d diff --git a/solenv/flatpak-disable-gpgconf-socketdir-test.patch b/solenv/flatpak-disable-gpgconf-socketdir-test.patch new file mode 100644 index 000000000000..4ec24e582d17 --- /dev/null +++ b/solenv/flatpak-disable-gpgconf-socketdir-test.patch @@ -0,0 +1,61 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +--- a/xmlsecurity/qa/unit/signing/signing.cxx ++++ b/xmlsecurity/qa/unit/signing/signing.cxx +@@ -45,6 +45,51 @@ + #include <documentsignaturemanager.hxx> + #include <certificate.hxx> + ++// org.freedesktop.Sdk//1.6 contains "gpgconf (GnuPG) 2.1.14-unknown" and fails ++// CppunitTest_xmlsecurity_signing with ++// ++// [...] ++// SigningTest::testODFBrokenStreamGPG finished in: 257ms ++// gpgconf: error removing '/run/user/1000/gnupg/d.ddj1dwjpi9iofkpjnicqebif': Directory not empty ++// gpgconf: fatal error (exit status 1) ++// /run/build/libreoffice/xmlsecurity/qa/unit/signing/signing.cxx:235:SigningTest::testODFBrokenDsigGPG ++// tearDown() failed ++// - equality assertion failed ++// - Expected: 0 ++// - Actual : 256 ++// - LD_LIBRARY_PATH=/app/lib:/usr/lib/sdk/gcc7/lib:/usr/lib/GL/nvidia-410-66/lib:/usr/lib/ffmpeg/lib GNUPGHOME=/run/build/libreoffice/workdir/CppunitTest/xmlsecurity_signing.test.user /usr/bin/gpgconf --remove-socketdir ++// ++// SigningTest::testODFBrokenDsigGPG finished in: 1265ms ++// gpgconf: error removing '/run/user/1000/gnupg/d.ddj1dwjpi9iofkpjnicqebif': Directory not empty ++// gpgconf: fatal error (exit status 1) ++// /run/build/libreoffice/xmlsecurity/qa/unit/signing/signing.cxx:235:SigningTest::testODFEncryptedGPG ++// tearDown() failed ++// - equality assertion failed ++// - Expected: 0 ++// - Actual : 256 ++// - LD_LIBRARY_PATH=/app/lib:/usr/lib/sdk/gcc7/lib:/usr/lib/GL/nvidia-410-66/lib:/usr/lib/ffmpeg/lib GNUPGHOME=/run/build/libreoffice/workdir/CppunitTest/xmlsecurity_signing.test.user /usr/bin/gpgconf --remove-socketdir ++// ++// SigningTest::testODFEncryptedGPG finished in: 447ms ++// signing.cxx:235:Assertion ++// Test name: SigningTest::testODFBrokenDsigGPG ++// tearDown() failed ++// - equality assertion failed ++// - Expected: 0 ++// - Actual : 256 ++// - LD_LIBRARY_PATH=/app/lib:/usr/lib/sdk/gcc7/lib:/usr/lib/GL/nvidia-410-66/lib:/usr/lib/ffmpeg/lib GNUPGHOME=/run/build/libreoffice/workdir/CppunitTest/xmlsecurity_signing.test.user /usr/bin/gpgconf --remove-socketdir ++// ++// signing.cxx:235:Assertion ++// Test name: SigningTest::testODFEncryptedGPG ++// tearDown() failed ++// - equality assertion failed ++// - Expected: 0 ++// - Actual : 256 ++// - LD_LIBRARY_PATH=/app/lib:/usr/lib/sdk/gcc7/lib:/usr/lib/GL/nvidia-410-66/lib:/usr/lib/ffmpeg/lib GNUPGHOME=/run/build/libreoffice/workdir/CppunitTest/xmlsecurity_signing.test.user /usr/bin/gpgconf --remove-socketdir ++// ++// Failures !!! ++// Run: 28 Failure total: 2 Failures: 2 Errors: 0 ++#undef HAVE_GPGCONF_SOCKETDIR ++ + using namespace com::sun::star; + + namespace diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index a4ba59da05fc..a3df66f8a207 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -77,6 +77,10 @@ "disable-fsckobjects": true }, { + "type": "patch", + "path": "flatpak-disable-gpgconf-socketdir-test.patch" + }, + { "type": "archive", "url": "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.2-bin.tar.xz";, "sha256": "361c8ad2ed8341416e323e7c28af10a8297170a80fdffba294a5c2031527bb6c", _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
