[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - 2 commits - solenv/flatpak-manifest.in
Stephan Bergmann
sbergman at redhat.com
Fri Feb 9 17:12:51 UTC 2018
solenv/flatpak-manifest.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d0442429087b90c00c26af829461317e443a024d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Feb 9 11:03:51 2018 +0100
Use sha256 instead of sha512
...as the latter is apparently a recent addition to flatpak-manifest that some
Flathub workers (like <https://flathub.org/builds/#/workers/16> "arm-3") still
do not support, causing "module libreoffice: Sha256 not specified" failures.
<http://ant.apache.org/bindownload.cgi> and
<https://archive.apache.org/dist/ant/binaries/> do not provide SHA-256 values,
so computed it locally.
Change-Id: Iee664402f26c9ab428624a4a7933db310efd71b1
(cherry picked from commit a5ce8f010d996fb156ab747a07077c4ab7e8c9f4)
Reviewed-on: https://gerrit.libreoffice.org/49512
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
Tested-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index d29c3d3434c8..80165783ca69 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -28,7 +28,7 @@
{
"type": "archive",
"url": "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.2-bin.tar.xz",
- "sha512": "a1af5173eafbc5b76fe0ae62c656c96a4c3bfd9d67b10ad19fef53152ae73d61aa05d1b57ceca1d007475113f234feb9d1541d2c624f6ac606361a6e6e375385",
+ "sha256": "361c8ad2ed8341416e323e7c28af10a8297170a80fdffba294a5c2031527bb6c",
"dest": "ant"
},
{
commit 8603e2065306f4341a4f345074da14b3b1a1dc46
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Feb 9 11:00:12 2018 +0100
Use stable URL for apache-ant download
as proposed by <http://mail-archives.apache.org/mod_mbox/ant-user/201802.mbox/
%3c001b01d3a101$eadd7ea0$c0987be0$@de%3e> "AW: Stable link to
apache-ant-*-bin.tar.xz?" (but using https instead of http)
Change-Id: I6f1a5d06c4f2f6ad1861a5c0bda3341f13c8899a
(cherry picked from commit ea89bd3fdd475fda72e852c687f6ce81b610df47)
Reviewed-on: https://gerrit.libreoffice.org/49511
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
Tested-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 03d617578237..d29c3d3434c8 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -27,7 +27,7 @@
},
{
"type": "archive",
- "url": "http://www-us.apache.org/dist/ant/binaries/apache-ant-1.10.2-bin.tar.xz",
+ "url": "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.2-bin.tar.xz",
"sha512": "a1af5173eafbc5b76fe0ae62c656c96a4c3bfd9d67b10ad19fef53152ae73d61aa05d1b57ceca1d007475113f234feb9d1541d2c624f6ac606361a6e6e375385",
"dest": "ant"
},
More information about the Libreoffice-commits
mailing list