From 458ebaaa524fdb744dd9b3c9d97eac7c39a5e443 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Fri, 17 Feb 2023 12:09:04 +0100 Subject: [PATCH] libreoffice: 7.5.0.3 -> 7.5.1.1 --- libreoffice/.signature | 8 +-- libreoffice/Pkgfile | 4 +- libreoffice/foo | 129 ----------------------------------------- 3 files changed, 6 insertions(+), 135 deletions(-) delete mode 100644 libreoffice/foo diff --git a/libreoffice/.signature b/libreoffice/.signature index ca5b8cd3a..402912ff8 100644 --- a/libreoffice/.signature +++ b/libreoffice/.signature @@ -1,9 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+OId1y6YTSdSGCOwPbqVJ0XeoK19m359NbVWN2y/+89Ym2zyPdgBGBiudDR/xdHEE4si3QzSlLUjCsKYz+IUgI= -SHA256 (Pkgfile) = 5bb824b325aa85f17569e6552605d7ba25dbc864978965ad5211a7e7696c9f5b +RWSagIOpLGJF3+mMKMfGTMIhyXsfmCRnP5cohT3pIlsDrvZfeEuBNlyPurud20wfKvmsASLmu/eB+uaDoMf5c9RhlKNGBctTOQA= +SHA256 (Pkgfile) = fa239e3c72dbe5ba59f0942fc7f050611a85421f037bb53304d71c6c649e3a3a SHA256 (.footprint) = 3e6ae8e1792f59bd1f8ab29f6acb9df338de87141411f2db0d6374050a7f1057 -SHA256 (libreoffice-7.5.0.3.tar.xz) = f5120fa3ae80a7deb08150038a6e78335bcab578bd7c41ddc733c2057977003b -SHA256 (libreoffice-dictionaries-7.5.0.3.tar.xz) = a8eb1e2df14e504d43a43ac8ee0f436361f065fb5e359f9fb58125275ea41242 +SHA256 (libreoffice-7.5.1.1.tar.xz) = be8b8d68f6bd504726a999b2ed43e55eaa4e73fa4cbd03e5b3da1e71b2edabba +SHA256 (libreoffice-dictionaries-7.5.1.1.tar.xz) = 397f5a299f70786464fcbf20c65db48de8d2361da170af34475742ad3ea99243 SHA256 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA256 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776 SHA256 (dtoa-20180411.tgz) = 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 diff --git a/libreoffice/Pkgfile b/libreoffice/Pkgfile index 55d034ad3..4dae0aa1d 100644 --- a/libreoffice/Pkgfile +++ b/libreoffice/Pkgfile @@ -5,8 +5,8 @@ # Optional: avahi coin-or-mp cups gpgme kio lpsolve mariadb openldap postgresql python3-lxml qt5 sane valgrind name=libreoffice -version=7.5.0.3 -release=2 +version=7.5.1.1 +release=1 pdfiumversion=5408 source=(https://downloadarchive.documentfoundation.org/libreoffice/old/$version/src/$name-$version.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/$version/src/$name-dictionaries-$version.tar.xz diff --git a/libreoffice/foo b/libreoffice/foo deleted file mode 100644 index e9f94eac1..000000000 --- a/libreoffice/foo +++ /dev/null @@ -1,129 +0,0 @@ -From 5de1d0472b319e9d48972eb067fd8189507fa640 Mon Sep 17 00:00:00 2001 -From: Noel Grandin -Date: Tue, 3 Jan 2023 20:19:56 +0200 -Subject: use sal_uInt8 for maMatFlag - -which is way more cache-dense than double - -Change-Id: I04503eb3a4054cce5312a7a0048c9b6679a8fd16 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145018 -Tested-by: Jenkins -Reviewed-by: Noel Grandin ---- - sc/source/core/tool/scmatrix.cxx | 34 ++++++++++++++++++++-------------- - 1 file changed, 20 insertions(+), 14 deletions(-) - -(limited to 'sc/source/core/tool/scmatrix.cxx') - -diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx -index f5d04bdb3fb9..8afeb796b35e 100644 ---- a/sc/source/core/tool/scmatrix.cxx -+++ b/sc/source/core/tool/scmatrix.cxx -@@ -64,10 +64,18 @@ struct matrix_trait - - typedef mdds::mtv::custom_block_func1 element_block_func; - }; -+struct matrix_flag_trait -+{ -+ typedef sc::string_block string_element_block; -+ typedef mdds::mtv::uint8_element_block integer_element_block; -+ -+ typedef mdds::mtv::custom_block_func1 element_block_func; -+}; - - } - - typedef mdds::multi_type_matrix MatrixImplType; -+typedef mdds::multi_type_matrix MatrixFlagImplType; - - namespace { - -@@ -218,16 +226,14 @@ Comp CompareMatrixElemFunc::maComp; - - } - --/* TODO: it would be good if mdds had get/set additionally to -- * get/set, we're abusing double here. */ --typedef double TMatFlag; --const TMatFlag SC_MATFLAG_EMPTYRESULT = 1.0; --const TMatFlag SC_MATFLAG_EMPTYPATH = 2.0; -+typedef uint8_t TMatFlag; -+const TMatFlag SC_MATFLAG_EMPTYRESULT = 1; -+const TMatFlag SC_MATFLAG_EMPTYPATH = 2; - - class ScMatrixImpl - { - MatrixImplType maMat; -- MatrixImplType maMatFlag; -+ MatrixFlagImplType maMatFlag; - ScInterpreter* pErrorInterpreter; - - public: -@@ -706,7 +712,7 @@ svl::SharedString ScMatrixImpl::GetString( SvNumberFormatter& rFormatter, SCSIZE - return maMat.get_string(aPos); - case mdds::mtm::element_empty: - { -- if (maMatFlag.get_numeric(nR, nC) != SC_MATFLAG_EMPTYPATH) -+ if (maMatFlag.get(nR, nC) != SC_MATFLAG_EMPTYPATH) - // not an empty path. - return svl::SharedString::getEmptyString(); - -@@ -769,8 +775,8 @@ ScMatrixValue ScMatrixImpl::Get(SCSIZE nC, SCSIZE nR) const - case mdds::mtm::element_empty: - aVal.nType = ScMatValType::Empty; - break; -- case mdds::mtm::element_numeric: -- aVal.nType = maMatFlag.get(nR, nC) -+ case mdds::mtm::element_integer: -+ aVal.nType = maMatFlag.get(nR, nC) - == SC_MATFLAG_EMPTYPATH ? ScMatValType::EmptyPath : ScMatValType::Empty; - break; - default: -@@ -816,7 +822,7 @@ bool ScMatrixImpl::IsEmpty( SCSIZE nC, SCSIZE nR ) const - // but not an 'empty path' element. - ValidColRowReplicated( nC, nR ); - return maMat.get_type(nR, nC) == mdds::mtm::element_empty && -- maMatFlag.get_numeric(nR, nC) != SC_MATFLAG_EMPTYPATH; -+ maMatFlag.get_integer(nR, nC) != SC_MATFLAG_EMPTYPATH; - } - - bool ScMatrixImpl::IsEmptyCell( SCSIZE nC, SCSIZE nR ) const -@@ -834,7 +840,7 @@ bool ScMatrixImpl::IsEmptyResult( SCSIZE nC, SCSIZE nR ) const - // 'empty' or 'empty cell' or 'empty path' element. - ValidColRowReplicated( nC, nR ); - return maMat.get_type(nR, nC) == mdds::mtm::element_empty && -- maMatFlag.get_numeric(nR, nC) == SC_MATFLAG_EMPTYRESULT; -+ maMatFlag.get_integer(nR, nC) == SC_MATFLAG_EMPTYRESULT; - } - - bool ScMatrixImpl::IsEmptyPath( SCSIZE nC, SCSIZE nR ) const -@@ -842,7 +848,7 @@ bool ScMatrixImpl::IsEmptyPath( SCSIZE nC, SCSIZE nR ) const - // Flag must indicate an 'empty path' element. - if (ValidColRowOrReplicated( nC, nR )) - return maMat.get_type(nR, nC) == mdds::mtm::element_empty && -- maMatFlag.get_numeric(nR, nC) == SC_MATFLAG_EMPTYPATH; -+ maMatFlag.get_integer(nR, nC) == SC_MATFLAG_EMPTYPATH; - else - return true; - } -@@ -973,7 +979,7 @@ void ScMatrixImpl::PutEmptyResultVector( SCSIZE nCount, SCSIZE nC, SCSIZE nR ) - { - maMat.set_empty(nR, nC, nCount); - // Flag to indicate that this is 'empty result', not 'empty' or 'empty path'. -- std::vector aVals(nCount, SC_MATFLAG_EMPTYRESULT); -+ std::vector aVals(nCount, SC_MATFLAG_EMPTYRESULT); - maMatFlag.set(nR, nC, aVals.begin(), aVals.end()); - } - else -@@ -988,7 +994,7 @@ void ScMatrixImpl::PutEmptyPathVector( SCSIZE nCount, SCSIZE nC, SCSIZE nR ) - { - maMat.set_empty(nR, nC, nCount); - // Flag to indicate 'empty path'. -- std::vector aVals(nCount, SC_MATFLAG_EMPTYPATH); -+ std::vector aVals(nCount, SC_MATFLAG_EMPTYPATH); - maMatFlag.set(nR, nC, aVals.begin(), aVals.end()); - } - else --- -cgit v1.2.1 -