snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

libreoffice: update to 6.1.3.2 

Disable system poppler because libreoffice fails to build with it.
Use the libreoffice provided poppler-0.66.0 instead.

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
Jürgen Buchmüller 2018-11-09 22:01:00 +01:00
parent af39dafae4
commit dbd8e797d9
No known key found for this signature in database
GPG Key ID: 6764EC32352D0647
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
srcpkgs/libreoffice/template
View File

@ -1,14 +1,14 @@
#!/bin/sh #!/bin/sh
# Template file for 'libreoffice' # Template file for 'libreoffice'
pkgname=libreoffice pkgname=libreoffice
version=6.1.0.3 version=6.1.3.2
revision=4 revision=1
build_style=meta build_style=meta
make_build_args="build-nocheck" make_build_args="build-nocheck"
nocross=yes nocross=yes
# #
# XXX: mit-krb5-devel nasm firebird3 hamcrest iwyu ogl-math # XXX: mit-krb5-devel nasm firebird3 hamcrest iwyu ogl-math poppler
# Missing, required libraries are downloaded and built internally # Missing, required libraries are downloaded and built internally
# #
hostmakedepends="automake flex git gperf hyphen icu libtool openldap hostmakedepends="automake flex git gperf hyphen icu libtool openldap
@ -21,7 +21,7 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel glyphy-devel
libldap-devel libmariadbclient-devel libmspub-devel libmwaw-devel libnumbertext-devel libldap-devel libmariadbclient-devel libmspub-devel libmwaw-devel libnumbertext-devel
libodfgen-devel liborcus-devel libpagemaker-devel libqxp-devel librsvg-devel libodfgen-devel liborcus-devel libpagemaker-devel libqxp-devel librsvg-devel
libvisio-devel libwpg-devel libwps-devel lpsolve-devel mdds0 mythes-devel libvisio-devel libwpg-devel libwps-devel lpsolve-devel mdds0 mythes-devel
neon-devel nss-devel poppler-cpp-devel postgresql-libs-devel python3-devel neon-devel nss-devel postgresql-libs-devel python3-devel
redland-devel sane-devel telepathy-glib-devel unixodbc-devel vigra-devel redland-devel sane-devel telepathy-glib-devel unixodbc-devel vigra-devel
vlc-devel cppunit-devel" vlc-devel cppunit-devel"
depends="libreoffice-common>=${version}_${revision}" depends="libreoffice-common>=${version}_${revision}"
@ -88,6 +88,7 @@ distfiles="
${_addurl}/libstaroffice-0.0.6.tar.xz ${_addurl}/libstaroffice-0.0.6.tar.xz
${_addurl}/libzmf-0.0.2.tar.xz ${_addurl}/libzmf-0.0.2.tar.xz
${_addurl}/pdfium-3426.tar.bz2 ${_addurl}/pdfium-3426.tar.bz2
${_addurl}/poppler-0.66.0.tar.xz
${_addurl}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip ${_addurl}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
${_exturl}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar ${_exturl}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
${_exturl}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar ${_exturl}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar
@ -130,10 +131,10 @@ distfiles="
${_addurl}/Scheherazade-2.100.zip ${_addurl}/Scheherazade-2.100.zip
" "
checksum=" checksum="
54eccd268f75d62fa6ab78d25685719c109257e1c0f4d628eae92ec09632ebd8 d46f38f6c48c6d2338fb97c6d0fae9b43802f9849b50817b3bcf9910f1708f44
fc1e088a15518c153df634cc5fb1f7faeb5632a38b3dafadb411376743a7a7d6 71c010e79b1872f78df5a94ba51eb071521bb7339776996ec884c7d608a50e78
bbc5ccdba93ab8a2e792311a6b5e84f160882ef4048eff46ecdfc31d0bd5da2b 8a3fccb9cddb0ae38cba23704fc19734a0a4381eba25cb009e96094cc5fa4660
a7625274535154e393e22ac1a1795859d4f7ead1c78e25b63554446f0d061190 8e3752ee250f85f3859cd03689b968d17505c470ee9229c371329cb9e71b3eb3
cf21b8a0a58c0f0af562869846ce2af4c68b13a7178b9b74ee7be7480a87c84c cf21b8a0a58c0f0af562869846ce2af4c68b13a7178b9b74ee7be7480a87c84c
c95f6c398e81ee7def378e51e4c7b5bdeba526f28ff281e79ca3795e6d467159 c95f6c398e81ee7def378e51e4c7b5bdeba526f28ff281e79ca3795e6d467159
1834aa0632499134f98ce85057d6d67604b9ed3b7efa7f13e76046f5886a3a2d 1834aa0632499134f98ce85057d6d67604b9ed3b7efa7f13e76046f5886a3a2d
@ -150,6 +151,7 @@ checksum="
6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4 6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4
27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22 27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22
80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957 80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957
2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7
d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a
f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770 f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf
@ -211,6 +213,7 @@ skip_extraction="
libstaroffice-0.0.6.tar.xz libstaroffice-0.0.6.tar.xz
libzmf-0.0.2.tar.xz libzmf-0.0.2.tar.xz
pdfium-3426.tar.bz2 pdfium-3426.tar.bz2
poppler-0.66.0.tar.xz
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar
@ -513,6 +516,8 @@ do_configure() {
opts+=" --without-java" opts+=" --without-java"
fi fi
opts+=" --with-tls=nss" opts+=" --with-tls=nss"
# fails to build with system poppler
opts+=" --without-system-poppler"
# xmlsec1-nss is missing, thus don't use system-xmlsec # xmlsec1-nss is missing, thus don't use system-xmlsec
opts+=" --without-system-xmlsec" opts+=" --without-system-xmlsec"
opts+=" --without-system-firebird" opts+=" --without-system-firebird"