[arch-commits] Commit in libreoffice-fresh/trunk (PKGBUILD calc-recalculation.diff)

Andreas Radke andyrtr at archlinux.org
Thu Oct 29 18:23:36 UTC 2020


    Date: Thursday, October 29, 2020 @ 18:23:34
  Author: andyrtr
Revision: 399020

upgpkg: libreoffice-fresh 7.0.3-1: upstream update 7.0.3

Modified:
  libreoffice-fresh/trunk/PKGBUILD
Deleted:
  libreoffice-fresh/trunk/calc-recalculation.diff

-------------------------+
 PKGBUILD                |   28 +++++++-----------
 calc-recalculation.diff |   70 ----------------------------------------------
 2 files changed, 11 insertions(+), 87 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-29 18:21:04 UTC (rev 399019)
+++ PKGBUILD	2020-10-29 18:23:34 UTC (rev 399020)
@@ -10,9 +10,9 @@
 
 pkgbase=libreoffice-fresh
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=7.0.2.2
-pkgver=7.0.2
-pkgrel=2
+_LOver=7.0.3.1
+pkgver=7.0.3
+pkgrel=1
 arch=('x86_64')
 license=('LGPL3')
 url="https://www.libreoffice.org/"
@@ -52,7 +52,7 @@
 	${_additional_source_url}/lxml-4.1.1.tgz
 	${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2
 	${_additional_source_url}/QR-Code-generator-1.4.0.tar.gz
-	${_additional_source_url}/skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz
+	${_additional_source_url}/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz
 	${_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-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite
 	${_additional_source_url2}/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
@@ -59,8 +59,7 @@
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	make-pyuno-work-with-system-wide-module-install.diff
 	soffice-template.desktop.in 
-	libreoffice-fresh.sh libreoffice-fresh.csh
-	calc-recalculation.diff)
+	libreoffice-fresh.sh libreoffice-fresh.csh)
 noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
            798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
            a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
@@ -74,7 +73,7 @@
            lxml-4.1.1.tgz
            Firebird-3.0.0.32483-0.tar.bz2
            QR-Code-generator-1.4.0.tar.gz
-           skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz
+           skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz
            8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar  # for test suite
            odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar  # for test suite
            884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
@@ -81,11 +80,11 @@
            185d60944ea767075d27247c3162b3bc-unowinreg.dll
 )
 validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
-sha256sums=('09fa559f2ef239151cb37bcca17a6f074a846693b88893c3e1fb612ecde74d97'
+sha256sums=('6566bce180c6b9561554de334b02344340a59f3bc0663d2c3c72addec444292d'
             'SKIP'
-            'fdef2217400f5ddea62c85e4b2175e68cf297c8f1b419ed1428c5cea8863b3a2'
+            'eb1ce39cb90b7c04f69af6f47c75cb65526634315d12230e638e3a561b9b9293'
             'SKIP'
-            '878f85188d48ec469eb82f0b50e33cf421d0c1efd8a64287cb097df6f355e826'
+            '442a2a1931549edbdbc6ab8f9fbc6b8e7088fde4d5806cda82263080d3617168'
             'SKIP'
             '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
             '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
@@ -100,7 +99,7 @@
             '940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e'
             '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860'
             'fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a'
-            'f88dc1a500d29c87ef5251c5a6c3ea66aa4c7daf0cf5d349ece64b36f7623be0'
+            '3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760'
             'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
             '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
             '884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc'
@@ -108,8 +107,7 @@
             'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
             'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
             'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a'
-            'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1'
-            'a392afabeb1490245a22ec55dab8c475fb29c46e45c8dd9d2090924bdfcf3204')
+            'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1')
 
 prepare() {
 
@@ -130,10 +128,6 @@
 	# fix not upstreamable pyuno paths - FS#54250
 	patch -Np1 -i "${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff
 
-	# fix calc recalculation; FS#68181
-	# https://bugs.documentfoundation.org/show_bug.cgi?id=137248
-	patch -Np1 -i ../calc-recalculation.diff
-
 	#use the CFLAGS but remove the LibO overridden ones
 	for i in $CFLAGS; do
 		case "$i" in

Deleted: calc-recalculation.diff
===================================================================
--- calc-recalculation.diff	2020-10-29 18:21:04 UTC (rev 399019)
+++ calc-recalculation.diff	2020-10-29 18:23:34 UTC (rev 399020)
@@ -1,70 +0,0 @@
-From 701008631ee257b4c7714ac9e2689c5ecc45bff8 Mon Sep 17 00:00:00 2001
-From: Eike Rathke <erack at redhat.com>
-Date: Tue, 13 Oct 2020 23:56:28 +0200
-Subject: Resolves: tdf#137248 Fix wrong condition breaking non-group interpret
-
-Regression from
-
-    commit 4f36f2ccab6286ec09480caea602c0fa19195736
-    CommitDate: Thu Sep 10 11:15:47 2020 +0200
-
-        detect if a cell still needs interpreting after Interpret()
-
-The bool return from ScFormulaCell::Interpret() does not indicate
-if it was succesful but whether a group interpret was done. As
-both calls here happen in a non-group context bailing out on that
-if false (no group interpret) is wrong. Instead, ask the cell if
-it still needs to be interpreted after having been interpreted.
-
-Change-Id: I40eeeef65e1da3d729cb3fef550620b1ea0a5741
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104261
-Tested-by: Jenkins
-Reviewed-by: Eike Rathke <erack at redhat.com>
-(cherry picked from commit 59f86333f3fce091177d1cfb9363aa81686aa497)
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104289
-Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
----
- sc/source/core/data/column4.cxx | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
-index 73adaf72dd71..950b38766c44 100644
---- a/sc/source/core/data/column4.cxx
-+++ b/sc/source/core/data/column4.cxx
-@@ -1690,14 +1690,14 @@ static bool lcl_InterpretSpan(sc::formula_block::const_iterator& rSpanIter, SCRO
-                 ++itSpanStart;
-                 for (SCROW nIdx = nSpanStart+1; nIdx <= nSpanEnd; ++nIdx, ++itSpanStart)
-                 {
--                    if( !(*itSpanStart)->Interpret()) // We know for sure that this cell is dirty so directly call Interpret().
-+                    (*itSpanStart)->Interpret(); // We know for sure that this cell is dirty so directly call Interpret().
-+                    if ((*itSpanStart)->NeedsInterpret())
-                     {
-                         SAL_WARN("sc.core.formulagroup", "Internal error, cell " << (*itSpanStart)->aPos
-                             << " failed running Interpret(), not allowing threading");
-                         bAllowThreading = false;
-                         return bAnyDirty;
-                     }
--                    assert(!(*itSpanStart)->NeedsInterpret());
- 
-                     // Allow early exit like above.
-                     if ((mxParentGroup && mxParentGroup->mbPartOfCycle) || !rRecursionHelper.AreGroupsIndependent())
-@@ -1804,14 +1804,14 @@ static void lcl_EvalDirty(sc::CellStoreType& rCells, SCROW nRow1, SCROW nRow2, S
-                         if( (*itCell)->NeedsInterpret())
-                         {
-                             bDirtyFlag = true;
--                            if(!(*itCell)->Interpret())
-+                            (*itCell)->Interpret();
-+                            if ((*itCell)->NeedsInterpret())
-                             {
-                                 SAL_WARN("sc.core.formulagroup", "Internal error, cell " << (*itCell)->aPos
-                                     << " failed running Interpret(), not allowing threading");
-                                 bAllowThreading = false;
-                                 return;
-                             }
--                            assert(!(*itCell)->NeedsInterpret());
-                         }
-                         bIsDirty = bIsDirty || bDirtyFlag;
- 
--- 
-cgit v1.2.1
-



More information about the arch-commits mailing list