diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-02-11 10:29:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-02-11 14:43:36 +0100 |
| commit | 227f96375277b8eff784d41e38e9222f366bf288 (patch) | |
| tree | f32a116ff8cba68ba13c438907928cf6475d5ab5 | |
| parent | 6a67cf0fd858bde3c2271902e11bebf437c09366 (diff) | |
Merge in Flatpak improvements
...from <https://github.com/flathub/org.libreoffice.LibreOffice/>:
commit 35de93fdcbfc7c7f6972812535e832f1405658cb
Merge: b397586 06020ec
Author: stbergmann <sbergman@redhat.com>
Date: Mon Feb 11 10:18:24 2019 +0100
Merge pull request #70 from Erick555/patch-1
Update gvfs to 1.38.1; apache-ant to 1.10.5
commit 06020ec8be69c8c2d22265c7066c2b838d231400
Author: Erick555 <37542552+Erick555@users.noreply.github.com>
Date: Sat Feb 9 21:24:57 2019 +0100
Update apache-ant to 1.10.5
commit 7c0a9d3fcd5988bc955bf5d67aa3249d45727bb4
Author: Erick555 <37542552+Erick555@users.noreply.github.com>
Date: Sat Feb 9 21:19:16 2019 +0100
Update gvfs to 1.38.1
* use meson as autotools support was removed.
* use same config options as gnome runtime does:
https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-30/elements/sdk/gvfs.bst#L17
Change-Id: Ib4314ea49220bcac01fafb600065e41b434c395b
Reviewed-on: https://gerrit.libreoffice.org/67672
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 4c6a70cab642fa83faf9344052c7ed1543ea49aa)
Reviewed-on: https://gerrit.libreoffice.org/67680
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | solenv/flatpak-manifest.in | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index d1cae8285ba0..47c1ee5119c2 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -17,14 +17,18 @@ }, { "name": "gvfs", - "cleanup": [ "/libexec/*", "/share/dbus-1/services/*", "/share/gvfs/mounts" ], - "config-opts": [ "--disable-hal", "--disable-gdu", "--disable-gcr", "--disable-obexftp", - "--disable-avahi", "--disable-documentation", "--disable-admin" ], + "buildsystem": "meson", + "config-opts": [ "-Dsystemduserunitdir=no", "-Dtmpfilesdir=no", "-Dinstalled_tests=true", + "-Ddbus_service_dir=/usr/share/dbus-1/services", "-Dadmin=false", "-Dafc=false", "-Dafp=false", + "-Darchive=false", "-Dcdda=false", "-Ddnssd=false", "-Dgoa=false", "-Dgoogle=false", + "-Dgphoto2=false", "-Dhttp=false", "-Dmtp=false", "-Dnfs=false", "-Dsftp=false", "-Dsmb=false", + "-Dudisks2=false", "-Dbluray=false", "-Dfuse=false", "-Dgcr=false", "-Dgcrypt=false", + "-Dgudev=false", "-Dkeyring=false", "-Dlogind=false", "-Dlibusb=false" ], "sources": [ { "type": "archive", - "url": "https://download.gnome.org/sources/gvfs/1.36/gvfs-1.36.1.tar.xz", - "sha256": "3840dff386c2c8a445337bea4ade0eb71339efaff8602767659fa2896792f026" + "url": "https://download.gnome.org/sources/gvfs/1.38/gvfs-1.38.1.tar.xz", + "sha256": "ed136a842c996d25c835da405c4775c77106b46470e75bdc242bdd59ec0d61a0" } ] }, @@ -39,8 +43,8 @@ }, { "type": "archive", - "url": "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.2-bin.tar.xz", - "sha256": "361c8ad2ed8341416e323e7c28af10a8297170a80fdffba294a5c2031527bb6c", + "url": "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.tar.xz", + "sha256": "cebb705dbbe26a41d359b8be08ec066caba4e8686670070ce44bbf2b57ae113f", "dest": "ant" }, { |