diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD index 9d0cb0f91..351f93e0c 100644 --- a/extra/libreoffice-fresh/PKGBUILD +++ b/extra/libreoffice-fresh/PKGBUILD @@ -21,7 +21,7 @@ pkgbase=libreoffice-fresh pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') _LOver=6.1.0.3 pkgver=6.1.0 -pkgrel=1 +pkgrel=2 arch=('x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -29,13 +29,13 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 'lib 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr' - 'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'hicolor-icon-theme' + 'libmspub' 'harfbuzz-icu' 'nss' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'gst-plugins-base-libs' - 'glu' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant' - 'gperf' 'gtk3' 'qt5-base' 'plasma-framework' 'cppunit' 'beanshell' 'clucene' # 'kdelibs' + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant' #'glu' + 'gperf' 'gtk3' 'qt5-base' 'plasma-framework' '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' 'libxinerama' 'libpagemaker' # 'glm' + 'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' + 'apr' 'serf' 'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama' 'libpagemaker' 'glm' 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' 'libexttextcat' 'libcmis' 'gobject-introspection' #'libfbclient' 'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode' @@ -59,7 +59,6 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_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-3426.tar.bz2 - ${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip ${_additional_source_url}/lxml-4.1.1.tgz ${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite ${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar # for test suite @@ -77,7 +76,6 @@ noextract=(#boost_1_66_0.tar.bz2 ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip Firebird-3.0.0.32483-0.tar.bz2 pdfium-3426.tar.bz2 - bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip lxml-4.1.1.tgz 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar # for test suite @@ -100,14 +98,13 @@ sha256sums=('54eccd268f75d62fa6ab78d25685719c109257e1c0f4d628eae92ec09632ebd8' '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd' '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860' '80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957' - 'd0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a' '940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e' 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770' '702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769' 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' - '76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4' - 'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283') + '28c97effbe55e43a1370ab141c676cec9daba9e3dc408bec78136dfefc892a8b' + '7af3113c804e4d58c7de3b5ed10f515fc46e349a580ba56eebfc6e891acbef89') prepare() { @@ -207,7 +204,7 @@ build() { --with-system-beanshell \ --with-system-cppunit\ --with-system-graphite\ - --without-system-glm \ + --with-system-glm \ --with-system-libnumbertext \ --with-system-libwpg \ --with-system-libwps \ @@ -274,14 +271,14 @@ package_libreoffice-fresh-sdk() { package_libreoffice-fresh() { pkgdesc="LibreOffice branch which contains new features and program enhancements" depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 'libwps' - 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' + 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' # 'dbus-glib' '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' + 'libmspub' 'harfbuzz-icu' 'nss' 'clucene' 'hicolor-icon-theme' + 'desktop-file-utils' 'shared-mime-info' 'libpagemaker' #'glu' 'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups' 'liblangtag' 'libexttextcat' 'libcmis' 'liborcus' # 'libfbclient' - 'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'libnumbertext' + 'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'gpgme' 'libnumbertext' 'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy') optdepends=('java-runtime: adds java support' 'java-environment: required by extension-wiki-publisher and extension-nlpsolver'