diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 9d09324b59b..8c54f756f3d 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,7 +1,7 @@ # Template file for 'libreoffice' pkgname=libreoffice -version=6.2.5.2 -revision=2 +version=6.3.3.2 +revision=1 build_style=meta make_build_args="build-nocheck" nocross=yes @@ -70,7 +70,7 @@ distfiles=" ${_addurl}/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 ${_addurl}/libstaroffice-0.0.6.tar.xz ${_addurl}/libzmf-0.0.2.tar.xz - ${_addurl}/pdfium-3550.tar.bz2 + ${_addurl}/pdfium-3794.tar.bz2 ${_addurl}/poppler-0.74.0.tar.xz ${_addurl}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip ${_exturl}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar @@ -102,23 +102,23 @@ distfiles=" ${_addurl}/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip ${_addurl}/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz ${_addurl}/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz - ${_addurl}/source-serif-font-2.007R.tar.gz + ${_addurl}/source-serif-pro-3.000R.tar.gz ${_addurl}/EmojiOneColor-SVGinOT-1.3.tar.gz ${_addurl}/noto-fonts-20171024.tar.gz ${_addurl}/culmus-0.131.tar.gz ${_addurl}/libre-hebrew-1.0.tar.gz ${_addurl}/alef-1.001.tar.gz ${_addurl}/ttf-kacst_2.01+mry.tar.gz - ${_exturl}/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf + ${_exturl}/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf ${_addurl}/lxml-4.1.1.tgz ${_addurl}/Amiri-0.111.zip ${_addurl}/ReemKufi-0.7.zip ${_addurl}/Scheherazade-2.100.zip " -checksum="0e9c00e9b17ee2d35415c6baafe13d16a891253477b8cecf1942f0035aac358e - d7161ad5fdc54ebad0ac6476d4b0b4acb4b26c891b03f3e802f2f49faa31969f - 327f74590f60e9b0a58f5ab54304cdace248c9f1b45fd486a687481b715043d6 - c39781ef5dc6602393c8cb2f7442c154385e9b89f13fce0e1f4ba600321e9d0a +checksum="d40ee5b29c9a0c2f0df2681f993b04a9f64e13d785fa7b7a1e8349b84149e5cf + 98753ad6dadc876e98e44f157225abe702bf0de297070ee107d35d16e792429d + ab83460b6383bf592f588a452b1ccc7a01a6da7347fef5442c2089f05ac63ffe + 721b760b7a9dc88e7d278dab89a2148a4e9239047f7b8f9ee6741c0f8f84b2fb 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776 @@ -129,7 +129,7 @@ checksum="0e9c00e9b17ee2d35415c6baafe13d16a891253477b8cecf1942f0035aac358e 48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d 6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4 27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22 - 572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679 + e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4 92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770 @@ -161,14 +161,14 @@ checksum="0e9c00e9b17ee2d35415c6baafe13d16a891253477b8cecf1942f0035aac358e 54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5 09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61 - 10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb + 826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3 d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7 29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994 dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52 dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56 - 49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63 + 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc 940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e 1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166 f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f @@ -188,7 +188,7 @@ skip_extraction=" Firebird-3.0.0.32483-0.tar.bz2 libstaroffice-0.0.6.tar.xz libzmf-0.0.2.tar.xz - pdfium-3550.tar.bz2 + pdfium-3794.tar.bz2 poppler-0.74.0.tar.xz bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar @@ -220,14 +220,14 @@ skip_extraction=" e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip 907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz - source-serif-font-2.007R.tar.gz + source-serif-pro-3.000R.tar.gz EmojiOneColor-SVGinOT-1.3.tar.gz noto-fonts-20171024.tar.gz culmus-0.131.tar.gz libre-hebrew-1.0.tar.gz alef-1.001.tar.gz ttf-kacst_2.01+mry.tar.gz - 49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf + 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf lxml-4.1.1.tgz Amiri-0.111.zip ReemKufi-0.7.zip @@ -250,7 +250,7 @@ case "$XBPS_TARGET_MACHINE" in # is missing in the musl clucene-devel files ;; x86_64) build_options_default="java" - makedepends+=" apache-ant openjdk " + makedepends+=" apache-ant openjdk11 " ;; esac @@ -484,7 +484,7 @@ do_configure() { if [ "$build_option_java" ]; then opts+=" --with-java" - opts+=" --with-jdk-home=/usr/lib/jvm/openjdk" + opts+=" --with-jdk-home=/usr/lib/jvm/openjdk11" opts+=" --without-junit" else opts+=" --without-java" @@ -598,7 +598,12 @@ libreoffice-kde_package() { depends="libreoffice-common>=${version}_${revision}" noverifyrdeps=yes pkg_install() { - _split kde4 + cat > ${wrksrc}/file-lists/kde5_list.txt <<-EOF + /usr/lib/libreoffice/program/libkde5be1lo.so + /usr/lib/libreoffice/program/libvclplug_kde5lo.so + /usr/lib/libreoffice/program/libvclplug_qt5lo.so + EOF + _split kde5 } }