From: Jakub Bogusz Date: Tue, 3 Nov 2020 21:22:52 +0000 (+0100) Subject: - updated to 6.4.7.2 X-Git-Tag: auto/th/libreoffice-6.4.7.2-1~2 X-Git-Url: http://git.pld-linux.org/?p=packages%2Flibreoffice.git;a=commitdiff_plain;h=3ad21b5530835707266e8e8af78371df31ab12ec - updated to 6.4.7.2 - prepared upgrade-liborcus-to-0.16.0 patch (based on Fedora) to use ixion+liborcus 0.16.x --- diff --git a/libreoffice-upgrade-liborcus-to-0.16.0.patch b/libreoffice-upgrade-liborcus-to-0.16.0.patch index 55558c3..cc137c4 100644 --- a/libreoffice-upgrade-liborcus-to-0.16.0.patch +++ b/libreoffice-upgrade-liborcus-to-0.16.0.patch @@ -64,12 +64,12 @@ diff --git a/download.lst b/download.lst index 6398a09..1f3b4b1 100644 --- a/download.lst +++ b/download.lst -@@ -204,8 +204,8 @@ export OPENLDAP_SHA256SUM := cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb89 +@@ -196,8 +196,8 @@ export OPENLDAP_TARBALL := openldap-2.4.45.tgz export OPENSSL_SHA256SUM := 14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc export OPENSSL_TARBALL := openssl-1.0.2t.tar.gz --export ORCUS_SHA256SUM := cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61 --export ORCUS_TARBALL := liborcus-0.15.4.tar.bz2 +-export ORCUS_SHA256SUM := 0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2 +-export ORCUS_TARBALL := liborcus-0.15.3.tar.gz +export ORCUS_SHA256SUM := 854c6ec167ace59baa2984e175bac7b5b2af91bfde4bb10d2088b87a51ed76ec +export ORCUS_TARBALL := liborcus-0.16.0.tar.bz2 export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb @@ -481,7 +481,7 @@ diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/E index 38658cc..3671294 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk -@@ -123,8 +123,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : +@@ -122,8 +122,8 @@ $(MAKE) \ $(if $(filter MACOSX,$(OS)),\ && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ @@ -491,7 +491,7 @@ index 38658cc..3671294 100644 + $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.16.0.dylib \ ) \ ) - $(call gb_Trace_EndRange,liborcus,EXTERNAL) + diff --git a/external/liborcus/Library_orcus-parser.mk b/external/liborcus/Library_orcus-parser.mk index d3cbddb..4e46591 100644 --- a/external/liborcus/Library_orcus-parser.mk @@ -575,7 +575,7 @@ index b298c71..00aea67 100644 }; class ScOrcusRefResolver : public orcus::spreadsheet::iface::import_reference_resolver -@@ -71,20 +76,28 @@ class ScOrcusRefResolver : public orcus::spreadsheet::iface::import_reference_re +@@ -81,20 +81,28 @@ public: ScOrcusRefResolver( const ScOrcusGlobalSettings& rGS ); @@ -589,7 +589,7 @@ index b298c71..00aea67 100644 { ScDocumentImport& mrDoc; const ScOrcusGlobalSettings& mrGlobalSettings; -- SCTAB mnTab; //< negative if global, else >= 0 for sheet-local named expressions. +- SCTAB const mnTab; //< negative if global, else >= 0 for sheet-local named expressions. + ScAddress maBasePos; + OUString maName; + OUString maExpr; diff --git a/libreoffice.spec b/libreoffice.spec index 8d71795..3507b3c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -53,30 +53,29 @@ %define with_qt5 1 %endif -%define major_ver 6.4.5 +%define major_ver 6.4.7 %define qt5_ver 5.6 Summary: LibreOffice - powerful office suite Summary(pl.UTF-8): LibreOffice - potężny pakiet biurowy Name: libreoffice Version: %{major_ver}.2 -Release: 3 +Release: 1 License: GPL/LGPL Group: X11/Applications Source0: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-%{version}.tar.xz -# Source0-md5: 7305ed1b5774483ca9ca0d6906d8049a +# Source0-md5: 123a79615835b84e63db0e73616de42d Source1: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-dictionaries-%{version}.tar.xz -# Source1-md5: f4a3d9dcca02542ec149057d869c8c64 +# Source1-md5: 83110d0469eac3c6eb02706f9c971d89 Source2: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.xz -# Source2-md5: 19da65b2748531e85740163fc9695f00 +# Source2-md5: 12d7df4d251c3a12cc328b7386b85883 Source3: http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.xz -# Source3-md5: 58771e45d87413f96a33e35d821a8122 - +# Source3-md5: 4c56cbcfea204bd0ee0ad4ddc37c0283 # make (download|fetch) DO_FETCH_TARBALLS=1 WGET=wget # but not sure if all are needed? -Source20: http://dev-www.libreoffice.org/src/pdfium-3963.tar.bz2 -# Source20-md5: 7688ac08e1292cf7e0d027f506f45c49 +Source20: http://dev-www.libreoffice.org/src/pdfium-4137.tar.bz2 +# Source20-md5: f9524b0fa40702d2891d0f8ae612adbf Source21: http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip # Source21-md5: 17410483b5b5f267aa18b7e00b65e6e0 Source22: http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz @@ -99,6 +98,7 @@ Source30: https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9 # Source30-md5: 8249374c274932a21846fa7629c2aa9b Patch0: disable-failing-test.patch +Patch1: %{name}-upgrade-liborcus-to-0.16.0.patch URL: http://www.documentfoundation.org/ BuildRequires: /usr/bin/getopt @@ -2794,6 +2794,8 @@ oraz narzędzie ui-previewer do sprawdzania wyglądu okien dialogowych. %prep %setup -q -a1 -a2 -a3 %patch0 -p1 +# enable to use ixion+liborcus 0.16.x +#patch1 -p1 for dir in *-%{version}; do [ -f $dir/ChangeLog ] && %{__mv} $dir/ChangeLog ChangeLog-$dir @@ -2938,6 +2940,9 @@ export ARCH_FLAGS_CC="$SAFE_CFLAGS -fno-omit-frame-pointer -fno-strict-aliasing" export ARCH_FLAGS_CXX="$SAFE_CFLAGS -fno-omit-frame-pointer -fno-strict-aliasing -fpermissive -fvisibility-inlines-hidden" export ARCH_FLAGS_OPT="$SAFE_CFLAGS" +# UTF-8 locale to ensure gettext stdin/stdout handling +export LC_ALL=C.UTF-8 + %{__make} -j1 verbose=true build-nocheck %if %{with tests}