summaryrefslogtreecommitdiff
path: root/solenv/flatpak-manifest.in
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-12-04 18:16:47 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-12-04 18:16:47 +0100
commit23339ec77e38ebdae86eb05a2a3d9a3f5609df64 (patch)
tree70ef1855ff6f60fb6b076275b217b65b9d2ed879 /solenv/flatpak-manifest.in
parentc4d6fb7423ee061b0beea619bc641dfb256fbf61 (diff)
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
Diffstat (limited to 'solenv/flatpak-manifest.in')
-rw-r--r--solenv/flatpak-manifest.in4
1 files changed, 4 insertions, 0 deletions
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",