[Libreoffice-commits] core.git: 3 commits - solenv/flatpak-disable-gpgconf-socketdir-test.patch solenv/flatpak-manifest.in
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Dec 7 14:01:58 UTC 2018
solenv/flatpak-disable-gpgconf-socketdir-test.patch | 61 --------------------
solenv/flatpak-manifest.in | 34 -----------
2 files changed, 1 insertion(+), 94 deletions(-)
New commits:
commit 575b100ef0a5c89c56d2c646fe7076766fb9f2c5
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Dec 7 12:16:28 2018 +0100
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Dec 7 14:59:33 2018 +0100
Revert "In flatpak build, disable problematic test using gpg for now"
This reverts commit 23339ec77e38ebdae86eb05a2a3d9a3f5609df64, which is no longer
needed after TODO.
diff --git a/solenv/flatpak-disable-gpgconf-socketdir-test.patch b/solenv/flatpak-disable-gpgconf-socketdir-test.patch
deleted file mode 100644
index 4ec24e582d17..000000000000
--- a/solenv/flatpak-disable-gpgconf-socketdir-test.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# 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 0f296a02b8d3..288c898ddfcf 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -49,10 +49,6 @@
"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",
commit 9d6799c116cab67c43893e81904386d90992211e
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Dec 7 12:14:26 2018 +0100
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Dec 7 14:59:33 2018 +0100
Upgrade flatpak to org.freedesktop.Sdk//18.08
...fixing <https://github.com/flathub/org.libreoffice.LibreOffice/issues/54>
"Build against org.freedesktop.Platform 18.08"
Change-Id: I70448277ce326075435932c75a837bd7be3d4508
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 050b6b9c83a3..0f296a02b8d3 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -1,30 +1,14 @@
{
"id": "org.libreoffice.LibreOffice",
"runtime": "org.freedesktop.Platform",
- "runtime-version": "1.6",
+ "runtime-version": "18.08",
"sdk": "org.freedesktop.Sdk",
"sdk-extensions": [
- "org.freedesktop.Sdk.Extension.gcc7",
"org.freedesktop.Sdk.Extension.openjdk10"
],
- "build-options": {
- "append-ld-library-path": "/usr/lib/sdk/gcc7/lib",
- "env": {
- "CC": "/usr/lib/sdk/gcc7/bin/gcc",
- "CXX": "/usr/lib/sdk/gcc7/bin/g++"
- }
- },
"command": "/app/libreoffice/program/soffice",
"modules": [
{
- "name": "gcc7",
- "buildsystem": "simple",
- "build-commands": [
- "mkdir -p /app/lib",
- "cp -d /usr/lib/sdk/gcc7/lib/lib{gcc_s.so.1,stdc++.so.6*} /app/lib"
- ]
- },
- {
"name": "openjdk",
"buildsystem": "simple",
"build-commands": [
commit aa3584085d41c242341a810cae05995ea7850389
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Dec 6 14:51:01 2018 +0100
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Dec 7 14:59:33 2018 +0100
Drop obsolete font sources from flatpak manifest
...which are no longer used by the LO build since
0ce173b50fd12342979cf3f8f9b2d92267552060 "tdf#103080 Dont package Open Sans and
PT_Serif fonts"
Change-Id: I9ece7a85fe0003711eb23f332e617b780e6701cd
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 96bb1173ef3c..050b6b9c83a3 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -141,18 +141,6 @@
"dest-filename": "external/tarballs/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"
},
{
- "url": "https://dev-www.libreoffice.org/src/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz",
- "sha256": "cc80fd415e57ecec067339beadd0eef9eaa45e65d3c51a922ba5f9172779bfb8",
- "type": "file",
- "dest-filename": "external/tarballs/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz"
- },
- {
- "url": "https://dev-www.libreoffice.org/src/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz",
- "sha256": "6757feb23f889a82df59679d02b8ee1f907df0a0ac1c49cdb48ed737b60e5dfa",
- "type": "file",
- "dest-filename": "external/tarballs/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz"
- },
- {
"url": "https://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz",
"sha256": "09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f",
"type": "file",
More information about the Libreoffice-commits
mailing list