diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-11-04 13:59:20 +0100 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2019-11-05 14:53:02 +0100 |
| commit | 8c1d6b3bb34afbd8483a4438f2ccd4e7b5310673 (patch) | |
| tree | 90e27c031de6565303b8071f0eed60c8ccda32c5 /solenv/flatpak-manifest.in | |
| parent | tdf#128431 Box info item is needed by the Border Background dialog (diff) | |
| download | core-8c1d6b3bb34afbd8483a4438f2ccd4e7b5310673.tar.gz core-8c1d6b3bb34afbd8483a4438f2ccd4e7b5310673.zip | |
Merge in Flatpak improvements
...from <https://github.com/flathub/org.libreoffice.LibreOffice/>:
commit e31ae281213d5921c3704737a43da864c3e82d8e
Author: Erick555 <37542552+Erick555@users.noreply.github.com>
Date: Fri Oct 4 17:48:12 2019 +0000
Update to freedesktop 19.08
commit 5b49a9e3ca243910a094f9865e2cdda9e2cda098
Author: Erick555 <37542552+Erick555@users.noreply.github.com>
Date: Fri Oct 4 18:36:52 2019 +0000
Add krb5
It's no longer available in runtime
commit a0f49157b0774929974f04f8747adf5ff5686287
Author: Stephan Bergmann <sbergman@redhat.com>
Date: Fri Oct 11 10:35:44 2019 +0200
gperf 3.1 is available in the Sdk now
...according to <https://gitlab.com/freedesktop-sdk/freedesktop-sdk/commit/
caef17cbb3cdad5c111eda8eb83a140bfacc380a> "NEWS: Update for
freedesktop-sdk-18.08.22"
Change-Id: Ibb0cd4bbd68bd4180f7f9af3afbf8638dd2be9e8
Reviewed-on: https://gerrit.libreoffice.org/82011
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit acf3189ce45365350bb6de2c6cfffb25122285ae)
Reviewed-on: https://gerrit.libreoffice.org/82032
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'solenv/flatpak-manifest.in')
| -rw-r--r-- | solenv/flatpak-manifest.in | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index e8849d22807c..535896b62576 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -1,7 +1,7 @@ { "id": "org.libreoffice.LibreOffice", "runtime": "org.freedesktop.Platform", - "runtime-version": "18.08", + "runtime-version": "19.08", "sdk": "org.freedesktop.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.openjdk11" @@ -33,13 +33,17 @@ ] }, { - "name": "gperf", - "cleanup": [ "*" ], + "name": "krb5", + "subdir": "src", + "config-opts": [ + "--disable-static", + "--disable-rpath" + ], "sources": [ { "type": "archive", - "url": "http://ftp.gnu.org/pub/gnu/gperf/gperf-3.1.tar.gz", - "sha256": "588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2" + "url": "https://kerberos.org/dist/krb5/1.16/krb5-1.16.2.tar.gz", + "sha256": "9f721e1fe593c219174740c71de514c7228a97d23eb7be7597b2ae14e487f027" } ] }, |