From 20b98dbb27902beed9011694c8e01546f17d81bcb8460c0f3971a45dace00836 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Wed, 10 Nov 2021 14:42:04 +0000 Subject: [PATCH] Accepting request 930690 from LibreOffice:7.2 OBS-URL: https://build.opensuse.org/request/show/930690 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=983 --- bsc1187982.patch | 23 -- bsc1189813.patch | 305 -------------------- libreoffice-7.2.2.2.tar.xz | 3 - libreoffice-7.2.2.2.tar.xz.asc | 16 - libreoffice-7.2.3.1.tar.xz | 3 + libreoffice-7.2.3.1.tar.xz.asc | 16 + libreoffice-help-7.2.2.2.tar.xz | 3 - libreoffice-help-7.2.2.2.tar.xz.asc | 16 - libreoffice-help-7.2.3.1.tar.xz | 3 + libreoffice-help-7.2.3.1.tar.xz.asc | 16 + libreoffice-translations-7.2.2.2.tar.xz | 3 - libreoffice-translations-7.2.2.2.tar.xz.asc | 16 - libreoffice-translations-7.2.3.1.tar.xz | 3 + libreoffice-translations-7.2.3.1.tar.xz.asc | 16 + libreoffice.changes | 8 + libreoffice.spec | 8 +- 16 files changed, 66 insertions(+), 392 deletions(-) delete mode 100644 bsc1187982.patch delete mode 100644 bsc1189813.patch delete mode 100644 libreoffice-7.2.2.2.tar.xz delete mode 100644 libreoffice-7.2.2.2.tar.xz.asc create mode 100644 libreoffice-7.2.3.1.tar.xz create mode 100644 libreoffice-7.2.3.1.tar.xz.asc delete mode 100644 libreoffice-help-7.2.2.2.tar.xz delete mode 100644 libreoffice-help-7.2.2.2.tar.xz.asc create mode 100644 libreoffice-help-7.2.3.1.tar.xz create mode 100644 libreoffice-help-7.2.3.1.tar.xz.asc delete mode 100644 libreoffice-translations-7.2.2.2.tar.xz delete mode 100644 libreoffice-translations-7.2.2.2.tar.xz.asc create mode 100644 libreoffice-translations-7.2.3.1.tar.xz create mode 100644 libreoffice-translations-7.2.3.1.tar.xz.asc diff --git a/bsc1187982.patch b/bsc1187982.patch deleted file mode 100644 index bb3317c..0000000 --- a/bsc1187982.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx -index ea304ef..8681935 100644 ---- a/svx/source/svdraw/svdoashp.cxx -+++ b/svx/source/svdraw/svdoashp.cxx -@@ -2331,7 +2331,18 @@ - nHgt=aSiz2.Height()+1; // a little more tolerance - } - else -+ { - nHgt = rOutliner.GetTextHeight()+1; // a little more tolerance -+ -+ sal_Int16 nColumns = GetMergedItem(SDRATTR_TEXTCOLUMNS_NUMBER).GetValue(); -+ if (bHgtGrow && nColumns > 1) -+ { -+ // Both 'resize shape to fix text' and multiple columns are enabled. The -+ // first means a dynamic height, the second expects a fixed height. -+ // Resolve this conflict by going with the original height. -+ nHgt = rR.getHeight(); -+ } -+ } - rOutliner.Clear(); - } - } diff --git a/bsc1189813.patch b/bsc1189813.patch deleted file mode 100644 index 42be237..0000000 --- a/bsc1189813.patch +++ /dev/null @@ -1,305 +0,0 @@ -From 1d5dc93089ee2e9b3b3761fd7b5558d55ac8a1fa Mon Sep 17 00:00:00 2001 -From: Miklos Vajna -Date: Mon, 20 Sep 2021 11:26:53 +0200 -Subject: [PATCH] tdf#144091 svx: fix unwanted blur of shadow from table cell - fill - -Initial render support for shadows of table shapes were added in commit -a75bf43a8d6c5dec6dcc86908c142ceec541aa8c (tdf#129961 svx: add rendering -for table shadow as direct format, 2020-12-02). - -That already noticed a trick with the shadow of table shapes: the shadow -is generate from the cell fill and the border, but not from the text. - -An additional trick is that when blur is enabled for the table shape's -shadow, then only the border should be blurred, not the cell fill. - -In the bug document's case, the effective cell background was gray, with -a semi-transparent red shadow. We used to render cc0000 with blur and -cccccc without blur, now we correctly render cca3a3, matching -PowerPoint. - -(cherry picked from commit 37a52d30bbfcf1d073779b50139c4dafa507be4b) - -Conflicts: - drawinglayer/source/primitive2d/shadowprimitive2d.cxx - drawinglayer/source/tools/primitive2dxmldump.cxx - include/drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx - -Change-Id: I7326a5f6254cf19b2d05181084c78e734ff7a7b4 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122357 -Tested-by: Jenkins -Reviewed-by: Mike Kaganski - -Related: tdf#144091 svx: fix interaction of transp cell fill and transp shadow - -This is a follow-up to commit 37a52d30bbfcf1d073779b50139c4dafa507be4b -(tdf#144091 svx: fix unwanted blur of shadow from table cell fill, -2021-09-20), where it turned out that the original bugdoc was just a -special case of almost full transparency (80%), that's why avoiding the -blur fixed the problem. - -A more general approach instead is to multiply the alpha or the cell -fill of table shapes and the alpha of the shadow itself. The end result -is the same (80% transparency) for the first bugdoc, but this gives back -the blur on the second bugdoc. - -(cherry picked from commit 00fa364a2403dc23a786d3f91fde06e10b3a4a9a) - -Conflicts: - drawinglayer/source/primitive2d/shadowprimitive2d.cxx - drawinglayer/source/processor2d/vclpixelprocessor2d.cxx - include/drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx - svx/source/sdr/primitive2d/sdrdecompositiontools.cxx - -Change-Id: I63560e3a73473c70157ecee8365ec7154217f269 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122565 -Tested-by: Jenkins -Reviewed-by: Mike Kaganski ---- - .../processor2d/vclpixelprocessor2d.cxx | 2 +- - .../source/tools/primitive2dxmldump.cxx | 33 +++++- - .../primitive2d/baseprimitive2d.hxx | 11 ++ - .../sdr/primitive2d/sdrdecompositiontools.cxx | 72 ++++++++++--- - svx/source/table/viewcontactoftableobj.cxx | 16 ++- - vcl/source/bitmap/bitmapfilter.cxx | 5 + - 9 files changed, 221 insertions(+), 21 deletions(-) - -diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx -index 9bdbf95a015b..5e6c6a73cd60 100644 ---- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx -+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx -@@ -1037,7 +1037,7 @@ void VclPixelProcessor2D::processGlowPrimitive2D(const primitive2d::GlowPrimitiv - const sal_uInt8 nAlpha = rCandidate.getGlowColor().GetAlpha(); - - impBufferDevice aBufferDevice(*mpOutputDevice, aRange); -- if (aBufferDevice.isVisible()) -+ if (aBufferDevice.isVisible() && !aRange.isEmpty()) - { - // remember last OutDev and set to content - OutputDevice* pLastOutputDevice = mpOutputDevice; -diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx b/drawinglayer/source/tools/primitive2dxmldump.cxx -index 7c5e5771d9bc..1e99ac91ed54 100644 ---- a/drawinglayer/source/tools/primitive2dxmldump.cxx -+++ b/drawinglayer/source/tools/primitive2dxmldump.cxx -@@ -569,11 +569,42 @@ void Primitive2dXmlDump::decomposeAndWrite( - break; - } - -+ case PRIMITIVE2D_ID_MODIFIEDCOLORPRIMITIVE2D: -+ { -+ // ModifiedColorPrimitive2D. -+ rWriter.startElement("modifiedColor"); -+ drawinglayer::primitive2d::Primitive2DContainer aPrimitiveContainer; -+ pBasePrimitive->get2DDecomposition(aPrimitiveContainer, -+ drawinglayer::geometry::ViewInformation2D()); -+ decomposeAndWrite(aPrimitiveContainer, rWriter); -+ rWriter.endElement(); -+ break; -+ } -+ - default: - { -- rWriter.startElement("unhandled"); -+ OString aName("unhandled"); -+ switch (nId) -+ { -+ case PRIMITIVE2D_ID_RANGE_SVX | 14: // PRIMITIVE2D_ID_SDRCELLPRIMITIVE2D -+ { -+ aName = "sdrCell"; -+ break; -+ } -+ } -+ rWriter.startElement(aName); - rWriter.attribute("id", OUStringToOString(sCurrentElementTag, RTL_TEXTENCODING_UTF8)); - rWriter.attribute("idNumber", nId); -+ -+ auto pBufferedDecomposition -+ = dynamic_cast(pBasePrimitive); -+ if (pBufferedDecomposition) -+ { -+ rWriter.attribute( -+ "transparenceForShadow", -+ OString::number(pBufferedDecomposition->getTransparenceForShadow())); -+ } -+ - drawinglayer::primitive2d::Primitive2DContainer aPrimitiveContainer; - pBasePrimitive->get2DDecomposition(aPrimitiveContainer, - drawinglayer::geometry::ViewInformation2D()); -diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx -index 7619e04e5279..f697886c1ac5 100644 ---- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx -+++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx -@@ -204,6 +204,10 @@ private: - /// a sequence used for buffering the last create2DDecomposition() result - Primitive2DContainer maBuffered2DDecomposition; - -+ /// When a shadow wraps a list of primitives, this primitive wants to influence the transparency -+ /// of the shadow. -+ sal_uInt16 mnTransparenceForShadow = 0; -+ - protected: - /** access methods to maBuffered2DDecomposition. The usage of this methods may allow - later thread-safe stuff to be added if needed. Only to be used by getDecomposition() -@@ -236,6 +240,13 @@ public: - virtual void - get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, - const geometry::ViewInformation2D& rViewInformation) const override; -+ -+ void setTransparenceForShadow(sal_uInt16 nTransparenceForShadow) -+ { -+ mnTransparenceForShadow = nTransparenceForShadow; -+ } -+ -+ sal_uInt16 getTransparenceForShadow() const { return mnTransparenceForShadow; } - }; - - } // end of namespace drawinglayer::primitive2d -diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx -index dcff748ea60f..1cd60e75d925 100644 ---- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx -+++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx -@@ -545,7 +545,6 @@ basegfx::B2DRange getTextAnchorRange(const attribute::SdrTextAttribute& rText, - { - if(!rContent.empty()) - { -- Primitive2DContainer aRetval(2); - basegfx::B2DHomMatrix aShadowOffset; - - { -@@ -576,25 +575,66 @@ basegfx::B2DRange getTextAnchorRange(const attribute::SdrTextAttribute& rText, - } - - // create shadow primitive and add content -- aRetval[0] = Primitive2DReference( -- new ShadowPrimitive2D( -- aShadowOffset, -- rShadow.getColor(), -- rShadow.getBlur(), -- (pContentForShadow ? *pContentForShadow : rContent))); -- -- if(0.0 != rShadow.getTransparence()) -+ const Primitive2DContainer& rContentForShadow -+ = pContentForShadow ? *pContentForShadow : rContent; -+ int nContentWithTransparence = std::count_if( -+ rContentForShadow.begin(), rContentForShadow.end(), -+ [](const Primitive2DReference& xChild) { -+ auto pChild = dynamic_cast(xChild.get()); -+ return pChild && pChild->getTransparenceForShadow() != 0; -+ }); -+ if (nContentWithTransparence == 0) - { -- // create SimpleTransparencePrimitive2D -- const Primitive2DContainer aTempContent { aRetval[0] }; -- -+ Primitive2DContainer aRetval(2); - aRetval[0] = Primitive2DReference( -- new UnifiedTransparencePrimitive2D( -- aTempContent, -- rShadow.getTransparence())); -+ new ShadowPrimitive2D( -+ aShadowOffset, -+ rShadow.getColor(), -+ rShadow.getBlur(), -+ (pContentForShadow ? *pContentForShadow : rContent))); -+ -+ if(0.0 != rShadow.getTransparence()) -+ { -+ // create SimpleTransparencePrimitive2D -+ const Primitive2DContainer aTempContent { aRetval[0] }; -+ -+ aRetval[0] = Primitive2DReference( -+ new UnifiedTransparencePrimitive2D( -+ aTempContent, -+ rShadow.getTransparence())); -+ } -+ -+ aRetval[1] = Primitive2DReference(new GroupPrimitive2D(rContent)); -+ return aRetval; -+ } -+ -+ Primitive2DContainer aRetval; -+ for (const auto& xChild : rContentForShadow) -+ { -+ double fChildTransparence = 0.0; -+ auto pChild = dynamic_cast(xChild.get()); -+ if (pChild) -+ { -+ fChildTransparence = pChild->getTransparenceForShadow(); -+ fChildTransparence /= 100; -+ } -+ aRetval.push_back(Primitive2DReference( -+ new ShadowPrimitive2D(aShadowOffset, rShadow.getColor(), rShadow.getBlur(), -+ { xChild }))); -+ if (rShadow.getTransparence() != 0.0 || fChildTransparence != 0.0) -+ { -+ Primitive2DContainer aTempContent{ aRetval.back() }; -+ -+ double fChildAlpha = 1.0 - fChildTransparence; -+ double fShadowAlpha = 1.0 - rShadow.getTransparence(); -+ double fTransparence = 1.0 - fChildAlpha * fShadowAlpha; -+ aRetval.back() = Primitive2DReference(new UnifiedTransparencePrimitive2D( -+ std::move(aTempContent), fTransparence)); -+ } - } - -- aRetval[1] = Primitive2DReference(new GroupPrimitive2D(rContent)); -+ aRetval.push_back( -+ Primitive2DReference(new GroupPrimitive2D(rContent))); - return aRetval; - } - else -diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx -index 967bfe820738..41d60d7652f8 100644 ---- a/svx/source/table/viewcontactoftableobj.cxx -+++ b/svx/source/table/viewcontactoftableobj.cxx -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - - #include - #include "tablelayouter.hxx" -@@ -326,10 +327,19 @@ namespace sdr::contact - aAttribute - = drawinglayer::primitive2d::createNewSdrFillTextAttribute( - rCellItemSet, nullptr); -+ rtl::Reference pCellReference -+ = new drawinglayer::primitive2d::SdrCellPrimitive2D( -+ aCellMatrix, aAttribute); -+ -+ sal_uInt16 nTransparence( -+ rCellItemSet.Get(XATTR_FILLTRANSPARENCE).GetValue()); -+ if (nTransparence != 0) -+ { -+ pCellReference->setTransparenceForShadow(nTransparence); -+ } -+ - const drawinglayer::primitive2d::Primitive2DReference -- xCellReference( -- new drawinglayer::primitive2d::SdrCellPrimitive2D( -- aCellMatrix, aAttribute)); -+ xCellReference(pCellReference); - aRetvalForShadow.append(xCellReference); - } - } -diff --git a/vcl/source/bitmap/bitmapfilter.cxx b/vcl/source/bitmap/bitmapfilter.cxx -index f2020539e04d..9ede4e578b10 100644 ---- a/vcl/source/bitmap/bitmapfilter.cxx -+++ b/vcl/source/bitmap/bitmapfilter.cxx -@@ -19,6 +19,11 @@ BitmapFilter::~BitmapFilter() {} - - bool BitmapFilter::Filter(BitmapEx& rBmpEx, BitmapFilter const& rFilter) - { -+ if (rBmpEx.IsEmpty()) -+ { -+ return true; -+ } -+ - BitmapEx aTmpBmpEx(rFilter.execute(rBmpEx)); - - if (aTmpBmpEx.IsEmpty()) --- -2.31.1 - diff --git a/libreoffice-7.2.2.2.tar.xz b/libreoffice-7.2.2.2.tar.xz deleted file mode 100644 index 8bc83a1..0000000 --- a/libreoffice-7.2.2.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:813bc3caa48c3c4af35b6a48bcf9cd19305ff0b81ce9b5304052c10ce5b02b71 -size 252478892 diff --git a/libreoffice-7.2.2.2.tar.xz.asc b/libreoffice-7.2.2.2.tar.xz.asc deleted file mode 100644 index 9249c42..0000000 --- a/libreoffice-7.2.2.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmFc92cACgkQ9DSh76/u -rqO1BhAApcID/3xnv8O6VnWWVQKGImaDHRSU5XISslvK/JMUo2QF3LlS7Li0BnhT -Z+9qoSmWGrir4xyAyh+AU/COmt0OlI87cSZPOZfxQEuELI31MPBSpc1AJC014Fom -uBYxHd5nL0JfiLrznzXmaMrcu8pk1PoTdhVW6ZLraTL1s34gSRF2rVD54qe2WSwB -/Ox5rRMgUHKj4GtEwFaS2mJ+xtSj5Jsl5R0gFMNsTjUjG2T8SnUF8bmUitM6TpEe -zPXHTqARwJRMdcspvsv0wkU28l9obrOmp0HCCmrYQUpx6OOG9nDwQJZzDpTNF5hq -3xOLIfSbxQoFKqnTyUUfn0BmDOkSez5m/z7pdDv9kA3QT+NIog47dN9YOZ8P1VUw -ytFFvpI2/VetoG+G5E2tsmR9g8sE1HpayzLAVBQsu8/vKlBA/9/ErnDe2LXeKnDS -aSfxpUCqDZfjgQmD28Jy1/oNBENRI1kbnv3t7fAij/QQAOHCkF67sxdnalx8VdiN -LXrCeOIQjg00eHYsJdC8d4tl3M/DIhMAvyTBxAnYq9cAX0jce/C7FGNhJ7n0hWD+ -7VInXk6q1a5e9VTSrnO7oDYdZK4vtzilnRUqmUNcqg56ox35G59gTD83FmqDxK95 -JYlzHvpnEFw+V71QjSRULrIA5tQdtxCHslGC1ecDFIW7VH6cOJ4= -=hGs7 ------END PGP SIGNATURE----- diff --git a/libreoffice-7.2.3.1.tar.xz b/libreoffice-7.2.3.1.tar.xz new file mode 100644 index 0000000..dc21717 --- /dev/null +++ b/libreoffice-7.2.3.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:152bf8dcb3d23e109c0a1c5558596f86abe04f604ef549f145e93ecfb08a06a3 +size 252772748 diff --git a/libreoffice-7.2.3.1.tar.xz.asc b/libreoffice-7.2.3.1.tar.xz.asc new file mode 100644 index 0000000..a2e3e8b --- /dev/null +++ b/libreoffice-7.2.3.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmGECMcACgkQ9DSh76/u +rqNoqA/9E8U35Cu6Rxi5x0gDVu5UcCAFBI9XAvAti4/PzOB8nWqOPnOFkIDf5Gh4 +Ap9HCx2U2haSvFGaCw6Z9JwAZbcPvLfbCVS9Utc/nVi5AiZJDRbAS/rxec/Bq40P +1K37VzKjc28sJbHx3RCikT19XBOPFmctqw6P2TLR+YKdaaT/tvhCh6Jq/GI0x1nE +B1fdWWWpZ1vRmxzOgR87DE+ohZIXN3ecDx6U5KhRBFoegwG1MTvT44Vn4UapubCu +VTOcDVWYHRexumc5O5JsN7SKTE8i/cZ+OhnUP88OQR8p+gdHKGw/Zql6ZdXIMXnD +0xCaFpt+pt4xSE9FaTkECtCjJaQMrrD84g5iITNVFIOp1PksHg+kzxIjJlGCjMEl +DsQP+5nFRAN1D7eOMEH0wxzua65LYfKg+ZicQ1ENEZKNk3SKzLbhWiEr+Eem6G1K +skpClDr9cD/pJhUBAQOIVSNsrOLF+Kqa5ovFG+m4ddImCuGLopKer3YiwbcZVcpG +p+6BN47TMuoJVCkmyx/ICiPxLSk1XlHVD3RtY/rth0jKYH3NO9O+6G56uNbpraAG +REYP9bB2eEoFmBYX5rmk8kK3RMi1rZfwPGZS/KO4FliqWoqey6bFp06Hd+JsqS8X +WuLnLPzxOFBKR5haN0Fq5VtK5c1/Cg3fCp7TDerX23n/iAh7fQE= +=yp8P +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-7.2.2.2.tar.xz b/libreoffice-help-7.2.2.2.tar.xz deleted file mode 100644 index c10b51f..0000000 --- a/libreoffice-help-7.2.2.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:03a177e73941b26a17fd5e0f5b92ebc759262f556847f8f97956cc497334c5c2 -size 111988404 diff --git a/libreoffice-help-7.2.2.2.tar.xz.asc b/libreoffice-help-7.2.2.2.tar.xz.asc deleted file mode 100644 index ccb9d40..0000000 --- a/libreoffice-help-7.2.2.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmFc92wACgkQ9DSh76/u -rqNXzQ//d3hBqBNamA2I8nrFQ/K7B9pBrjlw4yfLHn+cuHGIn0sqSGU7NMWF518g -X0W/OXYP4F9tRTJ1VTyxph2uVCG74YLyUVzJfaspMGfu0Y/a2G2r5UYbf82Tv2qt -fQ6iBwDGiZJ7Clv8CzItPqbvyOw/CInZ3u8fM0QMQ/i8FoijYZGAD+lcGoNvDik9 -gmB+QDpz2EWf/PhUi7uDiCq7PSi0eoYR1MBGtKO31qeSSYcbmLQwmkszyGRvabrJ -aeoXf7WJMd+6cvqDws5+P4/1czLMMWq5xKqlTVGHMV5lHrGqdTAHLGAi0po/39/W -zpStpa4JgLc/KXuuLOqiC8r/PTAS7HrF/LnT+204OJVVPm2FwZJRZZpne46e5Iwq -nzzMNyQoRdDWRFYnngibm1JSVcvWeX9xWX46Ps+Wstcvp6fPqQA6uuhdvImIUkkD -veUpI+0o1y5O2UbZyTWmyAUa6y7kqTlMnxpyw04oVH3D/Zo8+9Kktp39tj8kAng6 -f9X62rVAq7TLAxyZTIDZIG1BeA6FW+LzYzKQs9wMjLRe2JIISxb9znOXe2O7CK07 -pQgbjfjZovxGXMG90zucAxHgs8vxLQY2JcadttElImPA2GjRgRCInmxJrduUCAOf -7P6ze27AYGmQYlN+4agzxFPusmvuDU+AmO6V/X5Zykk1WeFHC2s= -=sjQP ------END PGP SIGNATURE----- diff --git a/libreoffice-help-7.2.3.1.tar.xz b/libreoffice-help-7.2.3.1.tar.xz new file mode 100644 index 0000000..dea10ed --- /dev/null +++ b/libreoffice-help-7.2.3.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94793bc6dd965a119ba7246c39281fc3ead2ed1d9b2fdb6c44e71c39bd4fcd51 +size 111990344 diff --git a/libreoffice-help-7.2.3.1.tar.xz.asc b/libreoffice-help-7.2.3.1.tar.xz.asc new file mode 100644 index 0000000..6695ec6 --- /dev/null +++ b/libreoffice-help-7.2.3.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmGECMwACgkQ9DSh76/u +rqMlkRAAkWut0xBITU8ubpiJo0tXYzOsRHQcKi5IwNAv/WA3dzKcVXtAZqxHDWTb +lewFEeera3ffcilZsZ+t2tmIVM+cWYH5pENMFM5HToJGAI3VOMqbsdIxkJS3v49v +kMswlReq/GFnu3pdl9VoD7JSS/EHl6VJbAaATSpW5UtEEUmX1cnKr5eSQxq/45Ga +zMzfsK4K6cJo63x3bwZOFHq9qBEe3vLDf+Puy6LUqPwzn66zFdBv9hQ69V7wTaII +TMXByZDYz/1hjajCA9SEkRn5q1/tCXrsnqRNBw4FwznIFf+s2kmz9ySik+VBZq/M +6lM1LVGQCGI+fH3xhPJVzho+ZxH0YwHCYj3pdyT37zg6lKO1loA6y3VRDSDCX7br +ErVPV5MqXO1+9gXXX220mjWOSfUvzvesVWMC4WmBeorC2H+xA2xg9zNguNMHXL+Y +v4Q1RuTUIWwKGeiAMdyWanQzgc3SWTQXZs7pjZm3hJymIo2lZ3DHVmlzyMU/QMYJ +5shO8OyV1Wax2ubIeqUMRjwzMdBCdb+arBCtDSqAA69xRj+4y9LnE2DYJSLSDjwu +fwQvikk/zkprxzaAzUN2sihB4kfJWGQUcZO9XlScUIfEiX8+dG/84MYgefZXHxDq +olW6Mgc2nwftIl71y4dvQAL9USdTIU50MIdrw0DHsGXgl5AHb/4= +=fk0r +-----END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.2.2.2.tar.xz b/libreoffice-translations-7.2.2.2.tar.xz deleted file mode 100644 index a3c84ef..0000000 --- a/libreoffice-translations-7.2.2.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:988a63ae2d50454c6f6c547b5f9331c7c45295f6d792b37fdced7557baca1ce6 -size 192517028 diff --git a/libreoffice-translations-7.2.2.2.tar.xz.asc b/libreoffice-translations-7.2.2.2.tar.xz.asc deleted file mode 100644 index 57a2c03..0000000 --- a/libreoffice-translations-7.2.2.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmFc924ACgkQ9DSh76/u -rqNT+RAAhh53Tp+M2RbWKfa5/BTU5MpR7MXQT9zF0C6jJsghpBVZWu3YOBFz7ZEU -MrYl1GAAp2Is9QxhdfoGUUVRuMEscTPGx0Ivyd6DHol1REORAGBoNDYdT3GDwU7q -qOpfPDdbuevWseVVjjCeBCgJ/GLXBmGPXR036YIs/QeWeK6+0Ufg4dYEhseU2Wws -qvib/H/85Fj+qpEfu+vTg5c4AZoBjUxmsJCRz3tXuk6aJhcEWKza18di0WhADKCn -64aPwF6Ev4ffJNC0zKdgjc+8hQMeg4FFp7gkuFYj8EgxJc+fyQh5lzxPjD8p2TJo -hKKa7zfQ4J4fsxYT3qEgVQ3Pcsy5AAM5lnnA0yUROzSyZI+4au/WhsQnErlT0vQK -zQtQClWTwgX53kdgbhDEj2HYqxGIleQgR9zaDh1GG5HatBqQI81M3w1hYqNQEPWZ -KN2gRAFdml7vLRq7jF0vzXFl5bmSVshcFIXHqvEbGcmsRS3OkNbxZdvnUWSuE6Yd -VcMCYQ/i+OCsGuGCpy5V6HHDuUEvpB1Ac3gWAi+zD3SueZRtgu/3MO87nZGQBfoa -XuOmjO7eFnowTRvjUGVb/hZEV65Y1Aqgv6Yzm455KVsWvcH10AQ4+Qj6zA5tjwc1 -lG07LJFCSAEDNwzs4QzciNBCiSAIcOuAF2FBw3LuKGolINeJxSY= -=N04Y ------END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.2.3.1.tar.xz b/libreoffice-translations-7.2.3.1.tar.xz new file mode 100644 index 0000000..3f4936c --- /dev/null +++ b/libreoffice-translations-7.2.3.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5eba5d6d75a07987ae8f29fe592143ed3acbaa95c737bd0a6dcbc4f0c26d71e8 +size 192586924 diff --git a/libreoffice-translations-7.2.3.1.tar.xz.asc b/libreoffice-translations-7.2.3.1.tar.xz.asc new file mode 100644 index 0000000..d9e4b41 --- /dev/null +++ b/libreoffice-translations-7.2.3.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmGECM4ACgkQ9DSh76/u +rqOm7g/+KSrS8Ja8bk0lbiWwrgIdr9weS5yA7N9060Cbst6E2nQHTtcZbr7rjafV +Rewyv69oj+x1XDNpePZ2+cQ5do+gHYkqh7J4+o4M5Is1hPhT8dNUQVc8uDAZlE8G +DdIAXqtMus22K4xJCrZpykeHixMk7D/zODlabSbNOGQpOLaw4ZRi0s0val7cQSsE +3Fq8CzcZXhTxbviQOpvbbyqATVRDEbotJ/ez4dDwwlIddOQN1nh2YCW8nfF/TjGE +HDzTM4DbsEDwjMGZaHBWhZS76x5mdbf/yVnNNqRRXxapgBbb65i+xDOdV24AcT0i +YdvzRNN4a603mY12ClfZBcWJXerFp9ZlAaI5inEvZack03NewPwx2htAZNabpftf +Zf1/uN0gNE6lswWxB+JGrqcrc0GHwQjsGXgo2vy8BV7zeXO8opUVJLJZwmr42NVL +ipHEAzKSOEOBlCsdRo7F6D7T55QUTq/JVqXqWMr1hTH4cj1yB/xk9ZkkYyGmvXyf +M6rs0yZDrpPfBcKwxHX7PKCsvW6p3x00jlxTdTnxn8N4/nZROFQaIVmEDOyhTNkP +LSymokBsEDeAePAY5gXVVawkg/eeUahp3Xi2238C7w9Fe4nRqs9AUPS7xyQdOncd +0HH/C38DnEmEXXx+yaH3kH2eqme7Qpy62fJysOQosYnlc/xTj3Y= +=JG+N +-----END PGP SIGNATURE----- diff --git a/libreoffice.changes b/libreoffice.changes index 9179d59..fa67fa1 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Nov 10 09:42:34 UTC 2021 - Danilo Spinella + +- Update to 7.2.3.1 +- Drop patches: + * bsc1187982.patch + * bsc1189813.patch + ------------------------------------------------------------------- Fri Oct 22 20:04:38 UTC 2021 - Andras Timar diff --git a/libreoffice.spec b/libreoffice.spec index 7a50a85..641e9d1 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -46,7 +46,7 @@ %endif %bcond_with firebird Name: libreoffice -Version: 7.2.2.2 +Version: 7.2.3.1 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -105,10 +105,6 @@ Patch3: mediawiki-no-broken-help.diff # PATCH-FIX-OPENSUSE boo#1186110 fix GCC 11 error Patch6: gcc11-fix-error.patch Patch7: pld-skia-patches.patch -# bsc#1189813 LO-L3: Shadow effect for tables in PPTX partly incorrect -Patch8: bsc1189813.patch -# bsc#1187982 LO-L3: PPTX: one column becomes two within one text frame -Patch9: bsc1187982.patch # Build with java 8 Patch101: 0001-Revert-java-9-changes.patch # try to save space by using hardlinks @@ -988,8 +984,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch3 %patch6 -p1 %patch7 -p1 -%patch8 -p1 -%patch9 -p1 %if 0%{?suse_version} < 1500 %patch101 -p1 %endif