diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD index e8ed95e8e..44a2859c6 100644 --- a/extra/libreoffice-fresh/PKGBUILD +++ b/extra/libreoffice-fresh/PKGBUILD @@ -19,8 +19,8 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4 pkgbase=libreoffice-fresh pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') -_LOver=5.4.4.2 -pkgver=5.4.4 +_LOver=6.0.0.3 +pkgver=6.0.0 pkgrel=1 arch=('x86_64') license=('LGPL3') @@ -35,13 +35,12 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.6' 'libwpd>=0.9.2' 'lib 'gperf' 'kdelibs' 'gtk3' 'cppunit' 'beanshell' 'clucene' 'junit' 'libmythes' 'libwpg' 'java-environment' 'postgresql-libs' 'libgl' 'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'glew' - 'apr' 'serf' 'ttf-liberation' 'ttf-dejavu' 'glm' 'libxinerama' 'libpagemaker' + 'apr' 'serf' 'ttf-liberation' 'ttf-dejavu' 'libxinerama' 'libpagemaker' 'glm' 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' 'libexttextcat' 'libcmis' 'gobject-introspection' #'libfbclient' - 'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode' - 'libfreehand' 'libstaroffice' - # 'libepubgen' 'libqxp' - ) + 'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode' + 'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice' +) _mirror="http://mirror.sjc02.svwh.net/tdf/libreoffice/src/${pkgver}" #_mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}" @@ -49,64 +48,60 @@ _mirror="http://mirror.sjc02.svwh.net/tdf/libreoffice/src/${pkgver}" _additional_source_url="http://dev-www.libreoffice.org/src" _additional_source_url2="http://dev-www.libreoffice.org/extern" source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} - ${_additional_source_url}/boost_1_63_0.tar.bz2 + ${_additional_source_url}/boost_1_65_1.tar.bz2 ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip # keep old bundled version, new system version ftbs ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz - ${_additional_source_url}/language-subtag-registry-2015-08-04.tar.bz2 - ${_additional_source_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 - ${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2 + ${_additional_source_url}/language-subtag-registry-2017-08-15.tar.bz2 ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - ${_additional_source_url}/libgltf/libgltf-0.1.0.tar.gz - ${_additional_source_url}/1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz + ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip ${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2 - ${_additional_source_url}/pdfium-3064.tar.bz2 + ${_additional_source_url}/pdfium-3235.tar.bz2 + ${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip ${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite - ${_additional_source_url2}/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar # for test suite + ${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar # for test suite ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll make-pyuno-work-with-system-wide-module-install.diff libreoffice-fresh.sh libreoffice-fresh.csh) -noextract=(boost_1_63_0.tar.bz2 - 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz - language-subtag-registry-2015-08-04.tar.bz2 - 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 - OpenCOLLADA-master-6509aa13af.tar.bz2 - 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - libgltf-0.1.0.tar.gz - d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - Firebird-3.0.0.32483-0.tar.bz2 - pdfium-3064.tar.bz2 - 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar - a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar - 1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz - 185d60944ea767075d27247c3162b3bc-unowinreg.dll) +noextract=(boost_1_65_1.tar.bz2 + 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz + language-subtag-registry-2017-08-15.tar.bz2 + 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip + ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip + Firebird-3.0.0.32483-0.tar.bz2 + pdfium-3235.tar.bz2 + bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip + 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite + odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar # for test suite + 185d60944ea767075d27247c3162b3bc-unowinreg.dll +) validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) -sha256sums=('6826751b4cd7076e0c7adfe6eee025cde7253c502ba51ab7072aec6070557e03' +sha256sums=('dc2171845ec19d5a0cece2c0052172011b2ec435cac80cb47637f2af94e19e3d' 'SKIP' - '280495861fc789868db62c4b19ef361eede9299a93003e0efd58499dcf862509' + '9f4750a5dc087c1b700dc200ffe614932e4f854c185084207b79f5a8e2968442' 'SKIP' - '2be3a5867f720f7298aad3d67b5d11bab2253af5be970a30ca4c7b2d8de902c5' + '8afeb5cbb608e451a9b1acaef87601323faf403b490bd188edb5ddeedd60587e' 'SKIP' - 'beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0' + '9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81' '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1' '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753' '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870' '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776' - 'cfd066b327c2308b3d019f0fe124c02d9acfafdd4aa2af0feadb6e0384027cf9' - 'b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb' - '8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4' + 'd6a97fc8da5ae54d867e7f1b65ffb51e816cadd11714e45fc23ee0abf81a51ab' 'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370' - '119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da' - '0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309' + '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133' + '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd' '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860' - 'ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883' + '7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f' + 'd0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a' 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770' - 'a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34' + 'aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf' 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' '76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4' @@ -125,7 +120,9 @@ prepare() { # don't run broken tests sed -i "/CppunitTest_sw_ooxmlexport9/d" sw/Module_sw.mk - + sed -i "/CppunitTest_sw_uiwriter/d" sw/Module_sw.mk + sed -i "/CppunitTest_xmlsecurity_signing/d" xmlsecurity/Module_xmlsecurity.mk + # unowinreg.dll must be a file not a symlink or the result will become a broken symlink # /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll @@ -198,7 +195,6 @@ build() { --with-system-libebook \ --with-system-libabw \ --with-system-coinmp \ - --without-system-libgltf \ --with-system-dicts \ --with-external-dict-dir=/usr/share/hunspell \ --with-external-hyph-dir=/usr/share/hyphen \ @@ -217,7 +213,7 @@ build() { --with-jdk-home="/usr/lib/jvm/default" \ --with-ant-home="/usr/share/apache-ant"\ --without-system-boost\ - --without-system-icu \ + --with-system-icu \ --with-system-cairo \ --with-system-libs \ --with-system-mythes \ @@ -230,13 +226,7 @@ build() { --disable-dependency-tracking touch src.downloaded - - make build-nocheck || { - # https://ssl.icu-project.org/trac/ticket/13329 - sed -i 's/xlocale/locale/' \ - workdir/UnpackedTarball/icu/source/i18n/digitlst.cpp - make build-nocheck - } + make build-nocheck mkdir ${srcdir}/fakeinstall make DESTDIR=${srcdir}/fakeinstall distro-pack-install @@ -279,14 +269,14 @@ package_libreoffice-fresh() { pkgdesc="LibreOffice branch which contains new features and program enhancements" depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.6' 'libwpd>=0.9.2' 'libwps' 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' - 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' #'icu' + 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' 'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'glu' 'libpagemaker' 'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups' - 'liblangtag' 'libexttextcat' 'libcmis' 'liborcus' # 'libfbclient' + 'liblangtag' 'libexttextcat' 'libcmis' 'liborcus' # 'libfbclient' 'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' - 'libfreehand' 'libstaroffice') + 'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp') optdepends=('java-runtime: adds java support' 'java-environment: required by extension-wiki-publisher and extension-nlpsolver' 'pstoedit: translates PostScript and PDF graphics into other vector formats'