Commit 285cc725 authored by J0WI's avatar J0WI

community/libreoffice: upgrade to 7.0.3.1

Co-Authored-By: Rasmus Thomsen's avatarRasmus Thomsen <oss@cogitri.dev>
parent a3134506
Pipeline #59072 failed with stages
in 360 minutes and 39 seconds
......@@ -2,11 +2,11 @@
# Contributor: Timo Teräs <timo.teras@iki.fi>
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=libreoffice
pkgver=6.4.6.2
pkgrel=1
pkgver=7.0.3.1
pkgrel=0
pkgdesc="LibreOffice - Meta package for the full office suite"
url="https://www.libreoffice.org/"
arch="all !s390x !mips !mips64"
arch="all !mips !mips64 !s390x"
license="MPL-2.0"
makedepends="
apache-ant
......@@ -16,7 +16,6 @@ makedepends="
bison
bluez-dev
boost-dev
cairo-dev
clucene-dev
coreutils
cppunit-dev
......@@ -46,6 +45,7 @@ makedepends="
libe-book-dev
libepubgen-dev
libetonyek-dev
libexecinfo-dev
libexttextcat-dev
libfreehand-dev
libjpeg-turbo-dev
......@@ -72,7 +72,6 @@ makedepends="
neon-dev
npapi-sdk
nss-dev
openjdk8
openldap-dev
openssl-dev
paxmark
......@@ -89,8 +88,19 @@ makedepends="
unixodbc-dev
vigra-dev
xmlsec-dev
xz
zip
"
# openjdk isn't available on 32-bit
case $CARCH in
x86|arm*)
_have_java=false
;;
*)
_have_java=true
makedepends="$makedepends openjdk11-jdk openjdk11-jre-headless"
;;
esac
# GNU sed is needed for in i18npool/CustomTarget_localedata.mk
subpackages="$pkgname-common $pkgname-base $pkgname-calc $pkgname-draw
$pkgname-gnome $pkgname-impress $pkgname-math $pkgname-connector-postgres $pkgname-writer
......@@ -118,13 +128,15 @@ source="https://download.documentfoundation.org/libreoffice/src/$_v/libreoffice-
$_addsrcurl/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
$_addsrcurl/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
$_addsrcurl/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip
$_addsrcurl/commons-logging-1.2-src.tar.gz
$_addsrcurl/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
$_addsrcurl/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
$_addsrcurl/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
$_addsrcurl/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
$_addsrcurl/commons-logging-1.2-src.tar.gz
$_addsrcurl/dtoa-20180411.tgz
$_addsrcurl/lxml-4.1.1.tgz
$_addsrcurl/pdfium-3963.tar.bz2
$_addsrcurl/pdfium-4137.tar.bz2
$_addsrcurl/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz
$_addsrcurl/QR-Code-generator-1.4.0.tar.gz
https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
https://dev-www.libreoffice.org/extern/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
......@@ -134,6 +146,7 @@ source="https://download.documentfoundation.org/libreoffice/src/$_v/libreoffice-
disable-liborcus-unittest.patch
musl-stacksize.patch
musl-libintl.patch
liborcus-0.16.patch
gcc10.patch
"
......@@ -299,6 +312,17 @@ prepare() {
build() {
# boost-1.59
export CPPFLAGS="$CPPFLAGS -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED"
if [ "$_have_java" = true ]; then
_conf="
--with-jdk-home="/usr/lib/jvm/java-11-openjdk" \
--with-ant-home="/usr/share/java/apache-ant" \
--with-java
"
else
_conf="--without-java"
fi
./configure \
--build=$CBUILD \
--host=$CHOST \
......@@ -314,7 +338,6 @@ build() {
--enable-release-build \
--enable-split-app-modules \
--enable-python=system \
--with-alloc=system \
--with-tls=nss \
--with-system-libs \
--with-system-dicts \
......@@ -323,8 +346,6 @@ build() {
--with-external-hyph-dir=/usr/share/hyphen \
--with-external-tar="$srcdir" \
--with-lang="$languages" \
--with-jdk-home="/usr/lib/jvm/java-1.8-openjdk" \
--with-ant-home="/usr/share/java/apache-ant" \
--without-system-jars \
--without-system-qrcodegen \
--without-junit \
......@@ -334,10 +355,9 @@ build() {
--disable-firebird-sdbc \
--disable-coinmp \
--disable-lpsolve \
--enable-gtk3
# adding '-isystem /usr/include' make things break with gcc6
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823145
sed -i -e 's:-isystem /usr/include[^/]::g' config_host.mk
--enable-gtk3 \
--enable-skia \
$_conf
make build-nocheck
# build libreofficekit
......@@ -456,9 +476,9 @@ sdk_doc() {
_split sdk_doc
}
sha512sums="377675494d4422c4d9363fe3857a8587e38f6ccd39aebec9c23337aa3a88cb2526608b8d0bcb27985ed8f821a98ca541dad4b48d69db441bcb27e9fb81beb9ba libreoffice-6.4.6.2.tar.xz
5522f2aeca53a30eaadc6c94316e7d16cbb627d5d715ec16defa1be97e7e7cff6ae16568d6f0c7dfbe69029fa757a422c24bbfa03331c11f821659d9ed3f35ca libreoffice-dictionaries-6.4.6.2.tar.xz
6bbf6d35cfdd94515a15e0c61aacbaec872af4fb007616556a26d9891cc104976b09ddfff835af3193a287d9ce50531c9f7f2371785140b813db16a6d3ec4797 libreoffice-translations-6.4.6.2.tar.xz
sha512sums="1680b5166ead7ca521130f7d23cb2bd73d3d4f801f94c9a3ab0066fb7763ced3c01d89fbe1b7a79a1826bcfd6ebcd3ce5fb3014ab6583034f08ed25969ab5f36 libreoffice-7.0.3.1.tar.xz
211cf70260d82c76897608a6b35fad4889f889931fbbc02c47aa2c75b5579c1a6bc5083165a12061b497920306cfe9bb4d7c9fffdf1943e84892460f2a4ea87c libreoffice-dictionaries-7.0.3.1.tar.xz
ad9e081a233f9dc53028b4ac913d503bd88ba4c0a3e8325008b6c64cf845dc1724e77ad04d37b5c4b594548f2429cd9a554cdcbbdf454d1797d1c41271a52192 libreoffice-translations-7.0.3.1.tar.xz
a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
9fe106bbdb55365f589246e5a0d10bbe9b35224132b66a1823dc6361633a67f2acc0e8c393dc7ed70d086858d16d242b8806b8b2184c98e3d20d0be85bed9c44 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
......@@ -470,13 +490,15 @@ ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07
58c1aa3965bf3a5f5d0facb67a5e42cec04e3f74e59cd7348ea2a9f6d9cafdce5552677c6b6d9c4cf2b31f52751695f2e53b2cee658e5f2eacb1393534a53c0e ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
654d2408c11349c90ae7d80b0c1997ee831004bc4ee36a706a0d8a84617fd0f82a97c5b45ab2388d60085afaec59a02eada007a8a1e14c3b366cabd36b7607ec ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
a04eca6a57807358bd4f8d017a2eeaa58403ef51fab11fc46ab089113a0ff5f66aaa793d3fc57b484334cbf51ed388a90d8d72d1e5819c8248cc0113ac928a77 beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip
9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9 commons-logging-1.2-src.tar.gz
71164f5e052db4fc16d1eb6ceb66d2b483d4912d874e371399047761e1d82e95d14288be5a7952c40f0ce39366f0706e726720e6e7171a00ce7bb55632cbf10c d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
4476024e7f307617719714fbf0999409aa11d730bc316f833bb6627d1b83abb42460417be588c193ecb49d6b926dd1f411934d8a8abebe00a3e85c0047dad0a6 db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743 eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114 f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9 commons-logging-1.2-src.tar.gz
722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85 dtoa-20180411.tgz
9542e5206f9b2f9e072c52ef8e6cf44d1aaae8ae3e7ca7e820c1fac12e716503308ccb3cebc52155b4c93799f3ebca247781fc491524d004378bd26f5cddb9d1 lxml-4.1.1.tgz
b4f47cf210314de3ab5a7cfb913ea6109894d3c6bd6ac0d3aed3629e6bf733ef0f6af122bd8b8a475389fe2a28f7eae66c07a22b80a7c142c1075b2e5aa8ff90 pdfium-3963.tar.bz2
28f9eed98272d93ddf3467c8a7ceddf624238fdf172453a1bd43840c9dfa0af58bde329b982ebbd7403759a2f492b40c4af446a43095c40cc15990d4e1ab53d1 pdfium-4137.tar.bz2
4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1 skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz
314a757bfdf9a38bcf07fd7a0103d28a2d1dd7311b8234761304efeef7bfdb740db78ab01e6b67e99a28d523cc2be9c1073b2de9d65e853d191c3dad19af56d0 QR-Code-generator-1.4.0.tar.gz
854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c 185d60944ea767075d27247c3162b3bc-unowinreg.dll
ce7e23e750f2c6f7ff2e590cc8941caa18eaae2727c9ca31313ab72ab19278055bd9393d38b0b5b685594e2f04ee15cb83b3bbb25d09665fe7383d7f26bf2ae8 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
......@@ -485,4 +507,5 @@ d5e4b5cc2b1528d474dc60e4f9c65f679c199dcf48495b4bef8187edaccf13cfaf2be667344f303c
121827c1eaa0d09a8ccc757e18c7306fef0b8a22335a1910606d1a59891b8ae33fbe85581baa8b2da79dafd27d952d89c4402f0ffb37cb4f702418d50abf0c90 disable-liborcus-unittest.patch
9abb0b14b7c408705569f26f6ed6519630ee7b98ff9c959eb53bb5efec6c08cae906f3c82943aee21098ab09c6caf58443a0dbe347d7dc5c8b6637f3665abca2 musl-stacksize.patch
d99d074e89e2713a3b6a56fa60d9d989ca6eefc8884ccbf88cb16c7b09da6dde4ba4ebc6a4d8408b61a08088df7cb1bcda60738f91e5569179fc45d7e9b901a3 musl-libintl.patch
4a390cd19553b1f58549e58503803297f714b021807073980ba009e4b712c986249a3fac71185a3c079e4360fdb6c6482ff47e6b20a51df3572f65e0ac4d69e7 gcc10.patch"
3b3c1f24b2ce3c420887619a0dce94a61641dd30e357377c94931cd8efd574200eecaf5bbec43534d6502e475e64011c7695d666aab8faf1300f018a3a9422e6 liborcus-0.16.patch
a925e8f9a29a645af321a40bc97a1a552790f815a86dec21f32f9054d4167942705cb77c88033277406e6bab187e8e074008cc8847c8ed59385cc3606d8ace75 gcc10.patch"
......@@ -32,9 +32,9 @@ ucbstorage.cxx:(.text+0x645b): undefined reference to `non-virtual thunk to cppu
+template class com::sun::star::uno::Reference<com::sun::star::io::XInputStream>;
+
namespace svt
namespace svt::GraphicAccess
{
namespace GraphicAccess
--- a/filter/source/xsltdialog/xmlfilterjar.cxx 2020-11-17 13:22:40.980553262 +0200
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx 2020-11-17 13:23:14.443393048 +0200
@@ -60,6 +60,8 @@
......@@ -92,15 +92,15 @@ ucbstorage.cxx:(.text+0x645b): undefined reference to `non-virtual thunk to cppu
char const sXML_export_impress_meta_oasis_service[] = "com.sun.star.comp.Impress.XMLOasisMetaExporter";
--- a/sw/source/filter/xml/xmlimp.cxx 2020-11-17 13:32:17.742862736 +0200
+++ b/sw/source/filter/xml/xmlimp.cxx 2020-11-17 13:32:31.046023929 +0200
@@ -104,6 +104,8 @@
@@ -90,6 +90,8 @@
using namespace ::xmloff::token;
using namespace ::std;
+template class uno::Reference< io::XInputStream > ;
+template class uno::Reference< io::XInputStream >;
+
namespace {
enum SwXMLDocTokens
{
XML_TOK_DOC_FONTDECLS,
--- a/sc/source/filter/xml/xmlimprt.cxx 2020-11-17 13:34:17.874626656 +0200
+++ b/sc/source/filter/xml/xmlimprt.cxx 2020-11-17 13:34:35.357705884 +0200
@@ -109,6 +109,8 @@
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment