rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade to 7.2.1

Browse Source
This commit is contained in:
Caolán McNamara 2021-09-09 09:46:07 +01:00
parent 6735516bb4
commit b51bf013f0
5 changed files with 19 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitignore vendored
View File

@ -6,9 +6,9 @@
/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
/libreoffice-multiliblauncher.sh
/dtoa-20180411.tgz
/libreoffice-7.2.0.4.tar.xz
/libreoffice-7.2.0.4.tar.xz.asc
/libreoffice-help-7.2.0.4.tar.xz
/libreoffice-help-7.2.0.4.tar.xz.asc
/libreoffice-translations-7.2.0.4.tar.xz
/libreoffice-translations-7.2.0.4.tar.xz.asc
/libreoffice-7.2.1.2.tar.xz
/libreoffice-7.2.1.2.tar.xz.asc
/libreoffice-help-7.2.1.2.tar.xz
/libreoffice-help-7.2.1.2.tar.xz.asc
/libreoffice-translations-7.2.1.2.tar.xz
/libreoffice-translations-7.2.1.2.tar.xz.asc

69
0001-Resolves-tdf-132739-two-style-tags-where-there-shoul.patch
View File

@ -1,69 +0,0 @@
From 5d56e9f13b9c6ccad080efaea9cbc7f065b56bac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Thu, 12 Aug 2021 12:55:30 +0100
Subject: [PATCH] Resolves: tdf#132739 two style tags where there should be
just one
Change-Id: Id9c8c8cc8c5ffdd21ba79ff39a6279cf2ddc8025
---
sw/source/filter/html/css1atr.cxx | 4 +++-
sw/source/filter/html/htmltabw.cxx | 9 ++++++---
sw/source/filter/html/wrthtml.hxx | 2 +-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 7b1a5cc19be3..c401d95a788f 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -2113,10 +2113,12 @@ void SwHTMLWriter::OutCSS1_TableFrameFormatOptions( const SwFrameFormat& rFrameF
Strm().WriteChar( '\"' );
}
-void SwHTMLWriter::OutCSS1_TableCellBorderHack(SwFrameFormat const& rFrameFormat)
+void SwHTMLWriter::OutCSS1_TableCellBordersAndBG(SwFrameFormat const& rFrameFormat, const SvxBrushItem *pBrushItem)
{
SwCSS1OutMode const aMode( *this,
CSS1_OUTMODE_STYLE_OPT_ON|CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_TABLEBOX, nullptr );
+ if (pBrushItem)
+ OutCSS1_SvxBrush(*this, *pBrushItem, Css1Background::Table, nullptr);
OutCSS1_SvxBox(*this, rFrameFormat.GetBox());
if (!m_bFirstCSS1Property)
{
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 4c83319747b7..63812a9b3ef6 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -424,11 +424,14 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
// Avoid non-CSS version in the ReqIF case.
rWrt.OutBackground( pBrushItem, false );
- if( rWrt.m_bCfgOutStyles )
- OutCSS1_TableBGStyleOpt( rWrt, *pBrushItem );
+ if (!rWrt.m_bCfgOutStyles)
+ pBrushItem = nullptr;
}
- rWrt.OutCSS1_TableCellBorderHack(*pBox->GetFrameFormat());
+ // tdf#132739 with rWrt.m_bCfgOutStyles of true bundle the brush item css
+ // properties into the same "style" tag as the borders so there is only one
+ // style tag
+ rWrt.OutCSS1_TableCellBordersAndBG(*pBox->GetFrameFormat(), pBrushItem);
sal_uInt32 nNumFormat = 0;
double nValue = 0.0;
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index ab282ba652ff..f82325ee50ae 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -494,7 +494,7 @@
void writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameFormat& rFrameFormat, std::u16string_view rAltText, HtmlFrmOpts nFrameOpts);
void OutCSS1_TableFrameFormatOptions( const SwFrameFormat& rFrameFormat );
- void OutCSS1_TableCellBorderHack(const SwFrameFormat& rFrameFormat);
+ void OutCSS1_TableCellBordersAndBG(const SwFrameFormat& rFrameFormat, const SvxBrushItem *pBrushItem);
void OutCSS1_SectionFormatOptions( const SwFrameFormat& rFrameFormat, const SwFormatCol *pCol );
void OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat, HtmlFrmOpts nFrameOpts,
const SdrObject *pSdrObj=nullptr,
--
2.31.1

92
0001-arm-fix-bridge.patch
View File

@ -1,92 +0,0 @@
From 142e236c6dedc03915d2b3fe2cb6122ad714ac09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Thu, 19 Aug 2021 16:15:13 +0100
Subject: [PATCH] arm: fix bridge
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
which went a little wrong in
commit dd91d3389c26645459d3b80649941d65efa4f63f
Date: Sat Jan 2 14:36:44 2021 +0100
Fix some warnings for Raspberry pi 4 (part3)
Change-Id: Ief7e1146b7480a1c16ec0810f991296710214332
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120830
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
and...
arm: nStackBytes was already the right amount of bytes
regression from...
commit 6e3424ca1131fe371f63e456267de476b5eb0eae
Date: Sat Jan 2 11:03:12 2021 +0100
Fix some warnings for Raspberry pi 4 (part2)
which changed that
Change-Id: I9a19d7d6bc1e4115ffffbe32d8d62be5d275d500
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120747
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: René Engelhard <rene@debian.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 8533415ed087..a22ac393b5f7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -251,7 +251,7 @@ void callVirtualMethod(
{
// 8-bytes aligned
sal_uInt32 nStackBytes = ( ( nStack + 1 ) >> 1 ) * 8;
- sal_uInt32 *stack = static_cast<sal_uInt32 *>(__builtin_alloca( nStackBytes * sizeof(sal_uInt32)));
+ sal_uInt32 *stack = static_cast<sal_uInt32 *>(__builtin_alloca( nStackBytes ));
memcpy( stack, pStack, nStackBytes );
}
@@ -298,9 +298,9 @@ void callVirtualMethod(
#define INSERT_INT32( pSV, nr, pGPR, pDS ) \
if ( nr < arm::MAX_GPR_REGS ) \
- pGPR[nr++] = reinterpret_cast<sal_uInt32>( pSV ); \
+ pGPR[nr++] = *reinterpret_cast<const sal_uInt32*>( pSV ); \
else \
- *pDS++ = reinterpret_cast<sal_uInt32>( pSV );
+ *pDS++ = *reinterpret_cast<const sal_uInt32*>( pSV );
#ifdef __ARM_EABI__
#define INSERT_INT64( pSV, nr, pGPR, pDS, pStart ) \
@@ -310,8 +310,8 @@ void callVirtualMethod(
} \
if ( nr < arm::MAX_GPR_REGS ) \
{ \
- *reinterpret_cast<sal_uInt32 *>(pGPR[nr++]) = *static_cast<sal_uInt32 *>( pSV ); \
- *reinterpret_cast<sal_uInt32 *>(pGPR[nr++]) = *(static_cast<sal_uInt32 *>( pSV ) + 1); \
+ pGPR[nr++] = *static_cast<const sal_uInt32 *>( pSV ); \
+ pGPR[nr++] = *(static_cast<const sal_uInt32 *>( pSV ) + 1); \
} \
else \
{ \
@@ -319,8 +319,8 @@ void callVirtualMethod(
{ \
++pDS; \
} \
- *reinterpret_cast<sal_uInt32 *>(*pDS++) = static_cast<sal_uInt32 *>( pSV )[0]; \
- *reinterpret_cast<sal_uInt32 *>(*pDS++) = static_cast<sal_uInt32 *>( pSV )[1]; \
+ *pDS++ = static_cast<sal_uInt32 *>( pSV )[0]; \
+ *pDS++ = static_cast<sal_uInt32 *>( pSV )[1]; \
}
#else
#define INSERT_INT64( pSV, nr, pGPR, pDS, pStart ) \
--
2.31.1

13
libreoffice.spec
View File

@ -1,5 +1,5 @@
# download path contains version without the last (fourth) digit
%global libo_version 7.2.0
%global libo_version 7.2.1
# Should contain .alphaX / .betaX, if this is pre-release (actually
# pre-RC) version. The pre-release string is part of tarball file names,
# so we need a way to define it easily at one place.
@ -49,8 +49,8 @@
Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.4
Release: 3%{?libo_prerelease}%{?dist}
Version: %{libo_version}.2
Release: 1%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL: http://www.libreoffice.org/
@ -248,9 +248,7 @@ Patch1: 0001-disble-tip-of-the-day-dialog-by-default.patch
Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
# backported
Patch3: 0001-make-with-idlc-cpp-cpp-work-for-gcc-cpp-as-a-ucpp-re.patch
Patch4: 0001-Resolves-tdf-132739-two-style-tags-where-there-shoul.patch
Patch5: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
Patch6: 0001-arm-fix-bridge.patch
Patch4: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
# not upstreamed
Patch500: 0001-disable-libe-book-support.patch
@ -2248,6 +2246,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
* Thu Sep 09 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.2.1.2-1
- upgrade to 7.2.1
* Sat Aug 21 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.2.0.4-3
- fix arm32 uno bridge

12
sources
View File

@ -7,9 +7,9 @@ SHA512 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838d
SHA512 (f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = 6a6d131dad5191614950a49323ae6d9385afe331983c1c85fde82ce6ee816051d95dde9ef90658b8f0a8a0a21754e72ff724bf41f6b96c046b7b4c2660f7095b
SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd
SHA512 (dtoa-20180411.tgz) = 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
SHA512 (libreoffice-7.2.0.4.tar.xz) = a85c5a16d9e6575630dbd521eebd9fc33084496c5961f2f97cf26a22b6ec846cbef75e4b2b91784b09214b1a4310343ce902e01ff1c5d1c8d5d120ae3c844f36
SHA512 (libreoffice-7.2.0.4.tar.xz.asc) = 370e071614d404054be8b932c558c7288e86304094e19568a78a73aaa54e6fbce73a66df833dcbc851f40d9a19924d83e440fea490a8c049272da38c524db958
SHA512 (libreoffice-help-7.2.0.4.tar.xz) = f6f5ba3f00a48a2987371d75cfeaed2b0ae70fb32f5681ded28bfe296e37a293b1c1c3688bbaf66817ea032d43e4df95707d81d6fbcea133c0dbfc947657ad4a
SHA512 (libreoffice-help-7.2.0.4.tar.xz.asc) = 646bead0daa083747ee2a0b711abfdd2e6d5af0c3254689e639d4526e2c3c2040df6584683bad4568c8afb4dbdbb2ac3aa4f8590bf9caac32b35e6bf86a702b4
SHA512 (libreoffice-translations-7.2.0.4.tar.xz) = 731556f23f04571b0a4b43bb6390f12ecbb5c56592ac52ae95596c6e9f08e4664e18a3371cbad790406296ba3efe5e6458075e4ffd5ea91b22425abfa0d215d7
SHA512 (libreoffice-translations-7.2.0.4.tar.xz.asc) = 6347296bafd2a905a9da70c33c22e2c989a85aa2dbfa7c4d82b87de25b13dc4e6698db033e65b8eea926a771c4a06055a6ce8045d2999f90bc2f1d561970da30
SHA512 (libreoffice-7.2.1.2.tar.xz) = f189ecb250675ded5a1147d1c0bbace54f28159d7bbee662479239f65f3e10ac64225f31abf95ced16e147bffe795296ac84e465b4651c00a64f4c4780009603
SHA512 (libreoffice-7.2.1.2.tar.xz.asc) = 59a6b2a8fe8f42d4a9d8336131c8804087f92a6a8005bfd52de9969d9b20e503b15f7bd7261d18e02d3f876bf83ff9b009a4cae57a489472935da1d6412d2bac
SHA512 (libreoffice-help-7.2.1.2.tar.xz) = 04419d18390fc3adcb61f57945fbdc9337206076baeff0af9d5f18fe4e477d99ca36640d9c6f160a5ab1ba28d4e92f0598cbe5991d6f6b2a61b51ff4fe7e41cd
SHA512 (libreoffice-help-7.2.1.2.tar.xz.asc) = bdbcec0491218e577c6089e11b4ddfafdd2aada2e36f4f86b1903ab933cf77e605358fa727f54b8b5dfa1ad41b0da49abe1d044ea185d17f2532332570740636
SHA512 (libreoffice-translations-7.2.1.2.tar.xz) = fb508ae6ba7c160ed5f47fd5f6ab2a127dbaa4fe6296c0d96b9c5436fc9dacd4ed2b586b63f660dca761f903c1b42c9a384c346b9629a5d54d0ff6e36346b65f
SHA512 (libreoffice-translations-7.2.1.2.tar.xz.asc) = 62ba35c9638b685edd0d2d3674a94c73bfaf92a438dcffad62a3134640e8cc3222fc94c1afb80c9c1556270a57a7706850d97b15a35ad63138e1ae595e68dcb8