libreoffice: update to 6.1.4.2
[ci skip]
This commit is contained in:
parent
e4d6e47bea
commit
117c181162
2 changed files with 17 additions and 30 deletions
11
srcpkgs/libreoffice/patches/boost-1.69.patch
Normal file
11
srcpkgs/libreoffice/patches/boost-1.69.patch
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- sfx2/source/appl/shutdownicon.cxx 2018-12-12 22:59:14.000000000 +0100
|
||||
+++ - 2018-12-19 00:29:14.290274270 +0100
|
||||
@@ -141,7 +141,7 @@
|
||||
#endif // ENABLE_QUICKSTART_APPLET
|
||||
}
|
||||
assert(!boost::logic::indeterminate(loaded));
|
||||
- return loaded;
|
||||
+ return bool{loaded};
|
||||
}
|
||||
|
||||
}
|
|
@ -1,8 +1,8 @@
|
|||
#!/bin/sh
|
||||
# Template file for 'libreoffice'
|
||||
pkgname=libreoffice
|
||||
version=6.1.3.2
|
||||
revision=3
|
||||
version=6.1.4.2
|
||||
revision=1
|
||||
build_style=meta
|
||||
make_build_args="build-nocheck"
|
||||
nocross=yes
|
||||
|
@ -49,17 +49,6 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
|
|||
license="GPL-3.0-or-later"
|
||||
homepage="http://www.libreoffice.org/"
|
||||
|
||||
# Additional zip archives
|
||||
_ooop_fonts_md5hash=a10aa597411643326e27d7fc128af12d
|
||||
_ooop_fonts_version=2.9.0.0
|
||||
_ooop_gallery_md5hash=af9314c5972d95a5d6da23ffad818f68
|
||||
_ooop_gallery_version=2.8.0.0
|
||||
_ooop_samples_md5hash=a6bccacf44914969e6e7b2f8faf4132c
|
||||
_ooop_samples_version=2.7.0.0
|
||||
_ooop_templates_md5hash=1be202fbbbc13f10592a98f70a4a87fb
|
||||
_ooop_templates_version=2.9.0.0
|
||||
# Extra gallery, samples and templates
|
||||
_ooopurl="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
|
||||
# Source, dictionary, help and translations
|
||||
_baseurl="http://download.documentfoundation.org/${pkgname}/src/${version%.*}"
|
||||
_addurl="http://dev-www.libreoffice.org/src"
|
||||
|
@ -72,10 +61,6 @@ distfiles="
|
|||
${_baseurl}/${pkgname}-dictionaries-${version}.tar.xz
|
||||
${_baseurl}/${pkgname}-help-${version}.tar.xz
|
||||
${_baseurl}/${pkgname}-translations-${version}.tar.xz
|
||||
${_ooopurl}/${_ooop_fonts_md5hash}-OOOP-fonts-pack-${_ooop_fonts_version}.zip
|
||||
${_ooopurl}/${_ooop_gallery_md5hash}-OOOP-gallery-pack-${_ooop_gallery_version}.zip
|
||||
${_ooopurl}/${_ooop_samples_md5hash}-OOOP-samples-pack-${_ooop_samples_version}.zip
|
||||
${_ooopurl}/${_ooop_templates_md5hash}-OOOP-templates-pack-${_ooop_templates_version}.zip
|
||||
${_addurl}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
|
||||
${_addurl}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
|
||||
${_addurl}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
|
||||
|
@ -130,15 +115,10 @@ distfiles="
|
|||
${_addurl}/ReemKufi-0.7.zip
|
||||
${_addurl}/Scheherazade-2.100.zip
|
||||
"
|
||||
checksum="
|
||||
d46f38f6c48c6d2338fb97c6d0fae9b43802f9849b50817b3bcf9910f1708f44
|
||||
71c010e79b1872f78df5a94ba51eb071521bb7339776996ec884c7d608a50e78
|
||||
8a3fccb9cddb0ae38cba23704fc19734a0a4381eba25cb009e96094cc5fa4660
|
||||
8e3752ee250f85f3859cd03689b968d17505c470ee9229c371329cb9e71b3eb3
|
||||
cf21b8a0a58c0f0af562869846ce2af4c68b13a7178b9b74ee7be7480a87c84c
|
||||
c95f6c398e81ee7def378e51e4c7b5bdeba526f28ff281e79ca3795e6d467159
|
||||
1834aa0632499134f98ce85057d6d67604b9ed3b7efa7f13e76046f5886a3a2d
|
||||
c31a4b1ab988a6b016654cc91e9652727cbb0fcbe9b09ee4b3d93b57a57901e0
|
||||
checksum="648fe9177e0813625a99e775dac1354a416eef2f3ef44eab4e770d08293b37fe
|
||||
fe0991f888dc09bce401a2d5c5505abfff361d1184d080e0056c1ebb08769c4b
|
||||
f5b21510942e63829744cf0dfdcf556ada854fced168e54a25105a3d3b484445
|
||||
010505af211b9e4aa841c27443957297c58a7bb434ee8cce0d7ef2fa91b6fed1
|
||||
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
|
||||
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
|
||||
983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
|
||||
|
@ -197,10 +177,6 @@ skip_extraction="
|
|||
${pkgname}-dictionaries-${version}.tar.xz
|
||||
${pkgname}-help-${version}.tar.xz
|
||||
${pkgname}-translations-${version}.tar.xz
|
||||
${_ooop_fonts_md5hash}-OOOP-fonts-pack-${_ooop_fonts_version}.zip
|
||||
${_ooop_gallery_md5hash}-OOOP-gallery-pack-${_ooop_gallery_version}.zip
|
||||
${_ooop_samples_md5hash}-OOOP-samples-pack-${_ooop_samples_version}.zip
|
||||
${_ooop_templates_md5hash}-OOOP-templates-pack-${_ooop_templates_version}.zip
|
||||
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
|
||||
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
|
||||
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
|
||||
|
|
Loading…
Reference in a new issue