From 052f970caa66ed6009af863a9ee76b7f4866250c1d7d19e6dd7b947900142460 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Fri, 25 Nov 2022 09:27:08 +0000 Subject: [PATCH] Accepting request 1038059 from LibreOffice:7.4 OBS-URL: https://build.opensuse.org/request/show/1038059 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1046 --- bsc1201095.patch | 47 ---- bsc1202866.patch | 235 -------------------- curl-7.83.1.tar.xz | 3 - curl-7.86.0.tar.xz | 3 + fix_gtk_popover_on_3.20.patch | 23 +- fix_harfbuzz_on_sle12_sp5.patch | 48 ++++ fix_webp_on_sle12_sp5.patch | 28 +++ libreoffice-7.4.2.3.tar.xz | 3 - libreoffice-7.4.2.3.tar.xz.asc | 16 -- libreoffice-7.4.3.2.tar.xz | 3 + libreoffice-7.4.3.2.tar.xz.asc | 16 ++ libreoffice-help-7.4.2.3.tar.xz | 3 - libreoffice-help-7.4.2.3.tar.xz.asc | 16 -- libreoffice-help-7.4.3.2.tar.xz | 3 + libreoffice-help-7.4.3.2.tar.xz.asc | 16 ++ libreoffice-translations-7.4.2.3.tar.xz | 3 - libreoffice-translations-7.4.2.3.tar.xz.asc | 16 -- libreoffice-translations-7.4.3.2.tar.xz | 3 + libreoffice-translations-7.4.3.2.tar.xz.asc | 16 ++ libreoffice.changes | 18 ++ libreoffice.spec | 17 +- poppler-22.01.0.tar.xz | 3 - 22 files changed, 180 insertions(+), 359 deletions(-) delete mode 100644 bsc1201095.patch delete mode 100644 bsc1202866.patch delete mode 100644 curl-7.83.1.tar.xz create mode 100644 curl-7.86.0.tar.xz create mode 100644 fix_harfbuzz_on_sle12_sp5.patch create mode 100644 fix_webp_on_sle12_sp5.patch delete mode 100644 libreoffice-7.4.2.3.tar.xz delete mode 100644 libreoffice-7.4.2.3.tar.xz.asc create mode 100644 libreoffice-7.4.3.2.tar.xz create mode 100644 libreoffice-7.4.3.2.tar.xz.asc delete mode 100644 libreoffice-help-7.4.2.3.tar.xz delete mode 100644 libreoffice-help-7.4.2.3.tar.xz.asc create mode 100644 libreoffice-help-7.4.3.2.tar.xz create mode 100644 libreoffice-help-7.4.3.2.tar.xz.asc delete mode 100644 libreoffice-translations-7.4.2.3.tar.xz delete mode 100644 libreoffice-translations-7.4.2.3.tar.xz.asc create mode 100644 libreoffice-translations-7.4.3.2.tar.xz create mode 100644 libreoffice-translations-7.4.3.2.tar.xz.asc delete mode 100644 poppler-22.01.0.tar.xz diff --git a/bsc1201095.patch b/bsc1201095.patch deleted file mode 100644 index f70c6f1..0000000 --- a/bsc1201095.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 37e5c4fcbacb73138fe47bf12e27961a47b11af3 Mon Sep 17 00:00:00 2001 -From: Sarper Akdemir -Date: Mon, 17 Oct 2022 09:06:20 +0300 -Subject: [PATCH] tdf#151547 pptx import: workaround for COL_AUTO collision - -In the current implementation of ::Color, it is not possible -to have fully transparent white text (since it collides with -COL_AUTO and gets interpreted as Automatic Color). - -Implement a workaround for import of fully transparent white -text color so that it isn't interpreted as the magic value -COL_AUTO (i.e. instead of fully transparent #FFFFFF import -as fully transparent #FFFFFE). - -Change-Id: Ide750093ef8a89f1424ddd8f4e9ee1e18209f2ad -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141439 -Tested-by: Jenkins -Reviewed-by: Miklos Vajna -(cherry picked from commit adfdd2bee4d1d59bf1ee372d9c242cf0b691e423) -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141748 -Reviewed-by: Andras Timar ---- - .../drawingml/textcharacterproperties.cxx | 8 +++++- - .../tdf151547-transparent-white-text.pptx | Bin 0 -> 32731 bytes - sd/qa/unit/import-tests2.cxx | 23 ++++++++++++++++++ - 3 files changed, 30 insertions(+), 1 deletion(-) - create mode 100644 sd/qa/unit/data/pptx/tdf151547-transparent-white-text.pptx - -diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx -index 7be4d89ae57c..e7bc36763049 100644 ---- a/oox/source/drawingml/textcharacterproperties.cxx -+++ b/oox/source/drawingml/textcharacterproperties.cxx -@@ -142,7 +142,13 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil - - if (aColor.hasTransparency()) - { -- rPropMap.setProperty(PROP_CharTransparence, aColor.getTransparency()); -+ const auto nTransparency = aColor.getTransparency(); -+ rPropMap.setProperty(PROP_CharTransparence, nTransparency); -+ -+ // WORKAROUND: Fully transparent white has the same value as COL_AUTO, avoid collision -+ if (nTransparency == 100 -+ && aColor.getColor(rFilter.getGraphicHelper()).GetRGBColor() == COL_AUTO.GetRGBColor()) -+ rPropMap.setProperty(PROP_CharColor, ::Color(ColorTransparency, 0xFFFFFFFE)); - } - } - diff --git a/bsc1202866.patch b/bsc1202866.patch deleted file mode 100644 index a06265b..0000000 --- a/bsc1202866.patch +++ /dev/null @@ -1,235 +0,0 @@ -From b05c289cf0278ff9737dd928c5a97611e69219a8 Mon Sep 17 00:00:00 2001 -From: Sarper Akdemir -Date: Mon, 24 Oct 2022 01:50:36 +0300 -Subject: [PATCH 1/3] tdf#149961 pptx import: fix indents for autofitted - texboxes - -For autofitted textboxes, Impress scales the indents with the -text size while PowerPoint doesn't. - -Scale the indents inversely propotional to autofit font -scale so that the visual appearance on import is similar to -PowerPoint. - -Change-Id: I7876b35a1f4221789564fcf23ccbe3fe21db3d48 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141717 -Tested-by: Jenkins -Reviewed-by: Miklos Vajna -Signed-off-by: Xisco Fauli -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141939 -Reviewed-by: Andras Timar ---- - oox/inc/drawingml/textparagraph.hxx | 3 +- - oox/inc/drawingml/textparagraphproperties.hxx | 1 + - oox/source/drawingml/textbody.cxx | 5 ++- - oox/source/drawingml/textparagraph.cxx | 5 ++- - .../drawingml/textparagraphproperties.cxx | 10 ++++- - .../pptx/tdf149961-autofitIndentation.pptx | Bin 0 -> 34123 bytes - sd/qa/unit/import-tests2.cxx | 40 ++++++++++++++++++ - 7 files changed, 58 insertions(+), 6 deletions(-) - create mode 100644 sd/qa/unit/data/pptx/tdf149961-autofitIndentation.pptx - -diff --git a/oox/inc/drawingml/textparagraph.hxx b/oox/inc/drawingml/textparagraph.hxx -index 1f43249372a5..4920c99da7c5 100644 ---- a/oox/inc/drawingml/textparagraph.hxx -+++ b/oox/inc/drawingml/textparagraph.hxx -@@ -77,7 +77,8 @@ public: - const TextListStyle& rMasterTextListStyle, - const TextListStyle& rTextListStyle, - bool bFirst, -- float nDefaultCharHeight) const; -+ float nDefaultCharHeight, -+ sal_Int32 nAutofitFontScale) const; - - bool HasMathXml() const - { -diff --git a/oox/inc/drawingml/textparagraphproperties.hxx b/oox/inc/drawingml/textparagraphproperties.hxx -index 8ea56a7b0736..083b61e37da7 100644 ---- a/oox/inc/drawingml/textparagraphproperties.hxx -+++ b/oox/inc/drawingml/textparagraphproperties.hxx -@@ -103,6 +103,7 @@ public: - const BulletList* pMasterBuList, - bool bApplyBulletList, - float fFontSize, -+ sal_Int32 nAutofitFontScale = 100000, - bool bPushDefaultValues = false ) const; - - /** Returns the largest character size of this paragraph. If possible the -diff --git a/oox/source/drawingml/textbody.cxx b/oox/source/drawingml/textbody.cxx -index 0f053ab6ad74..1be15c4f885d 100644 ---- a/oox/source/drawingml/textbody.cxx -+++ b/oox/source/drawingml/textbody.cxx -@@ -65,7 +65,7 @@ void TextBody::insertAt( - for (auto const& paragraph : maParagraphs) - { - paragraph->insertAt(rFilterBase, xText, xAt, rTextStyleProperties, aMasterTextStyle, -- maTextListStyle, (nIndex == 0), nCharHeight); -+ maTextListStyle, (nIndex == 0), nCharHeight, getTextProperties().mnFontScale); - ++nIndex; - } - } -@@ -148,7 +148,8 @@ void TextBody::ApplyStyleEmpty( - float nCharHeight = xProps->getPropertyValue("CharHeight").get(); - TextParagraphProperties aParaProp; - aParaProp.apply(*pTextParagraphStyle); -- aParaProp.pushToPropSet(&rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), true, nCharHeight, true); -+ aParaProp.pushToPropSet(&rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), -+ true, nCharHeight, getTextProperties().mnFontScale, true); - } - } - -diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx -index f91ee279bb3b..80f9fd3739b3 100644 ---- a/oox/source/drawingml/textparagraph.cxx -+++ b/oox/source/drawingml/textparagraph.cxx -@@ -87,7 +87,8 @@ void TextParagraph::insertAt( - const Reference < XTextCursor > &xAt, - const TextCharacterProperties& rTextStyleProperties, - const TextListStyle& rMasterTextListStyle, -- const TextListStyle& rTextListStyle, bool bFirst, float nDefaultCharHeight) const -+ const TextListStyle& rTextListStyle, bool bFirst, -+ float nDefaultCharHeight, sal_Int32 nAutofitFontScale) const - { - try { - sal_Int32 nParagraphSize = 0; -@@ -175,7 +176,7 @@ void TextParagraph::insertAt( - } - - float fCharacterSize = nCharHeight > 0 ? GetFontHeight ( nCharHeight ) : pTextParagraphStyle->getCharHeightPoints( 12 ); -- aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), true, fCharacterSize, true ); -+ aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), true, fCharacterSize, nAutofitFontScale, true ); - } - - // empty paragraphs do not have bullets in ppt -diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx -index 23efb301e963..0006b7530a76 100644 ---- a/oox/source/drawingml/textparagraphproperties.cxx -+++ b/oox/source/drawingml/textparagraphproperties.cxx -@@ -405,7 +405,7 @@ void TextParagraphProperties::apply( const TextParagraphProperties& rSourceProps - - void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* pFilterBase, - const Reference < XPropertySet >& xPropSet, PropertyMap& rioBulletMap, const BulletList* pMasterBuList, bool bApplyBulletMap, float fCharacterSize, -- bool bPushDefaultValues ) const -+ sal_Int32 nAutofitFontScale, bool bPushDefaultValues ) const - { - PropertySet aPropSet( xPropSet ); - aPropSet.setProperties( maTextParagraphPropertyMap ); -@@ -431,6 +431,14 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* p - std::optional< sal_Int32 > noParaLeftMargin( moParaLeftMargin ); - std::optional< sal_Int32 > noFirstLineIndentation( moFirstLineIndentation ); - -+ // tdf#149961 Impress scales the indents when text is autofitted while Powerpoint doesn't -+ // Try to counteract this by multiplying indents by the inverse of the autofit font scale. -+ if ( nAutofitFontScale ) -+ { -+ if ( noParaLeftMargin ) noParaLeftMargin = *noParaLeftMargin * MAX_PERCENT / nAutofitFontScale; -+ if ( noFirstLineIndentation ) noFirstLineIndentation = *noFirstLineIndentation * MAX_PERCENT / nAutofitFontScale; -+ } -+ - if ( nNumberingType != NumberingType::NUMBER_NONE ) - { - if ( noParaLeftMargin ) - -From df3b9d85b71df464731b02f1ff425bfd09b2db20 Mon Sep 17 00:00:00 2001 -From: Sarper Akdemir -Date: Mon, 24 Oct 2022 14:16:16 +0300 -Subject: [PATCH 2/3] related tdf#149961 pptx export: scale indents for - autofitted textboxes - -For autofitted textboxes, Impress scales the indents with -the text size while PowerPoint doesn't. - -Try to compensate for this by scaling exported indents -proportionally to the font scale on autofitted textboxes. - -Change-Id: Ib0f967e923d23553b4cdbd1bbe2e137d97b1b2e5 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141758 -Tested-by: Jenkins -Reviewed-by: Miklos Vajna -Signed-off-by: Xisco Fauli ---- - include/oox/export/drawingml.hxx | 2 +- - oox/source/export/drawingml.cxx | 26 +++++++++++++++--- - .../data/odp/autofitted-textbox-indent.odp | Bin 0 -> 12486 bytes - sd/qa/unit/export-tests-ooxml3.cxx | 22 +++++++++++++++ - 4 files changed, 45 insertions(+), 5 deletions(-) - create mode 100644 sd/qa/unit/data/odp/autofitted-textbox-indent.odp - -diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx -index c80024ea1fdd..674457b3c6e4 100644 ---- a/include/oox/export/drawingml.hxx -+++ b/include/oox/export/drawingml.hxx -@@ -302,7 +302,7 @@ public: - - @returns true if any paragraph properties were written - */ -- bool WriteParagraphProperties(const css::uno::Reference< css::text::XTextContent >& rParagraph, float fFirstCharHeight, sal_Int32 nElement); -+ bool WriteParagraphProperties(const css::uno::Reference< css::text::XTextContent >& rParagraph, const css::uno::Reference& rXShapePropSet, float fFirstCharHeight, sal_Int32 nElement); - void WriteParagraphNumbering(const css::uno::Reference< css::beans::XPropertySet >& rXPropSet, float fFirstCharHeight, - sal_Int16 nLevel ); - void WriteParagraphTabStops(const css::uno::Reference& rXPropSet); -diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx -index 0ab497a4fed3..5ee48ff6e338 100644 ---- a/oox/source/export/drawingml.cxx -+++ b/oox/source/export/drawingml.cxx -@@ -3020,7 +3020,7 @@ void DrawingML::WriteLinespacing(const LineSpacing& rSpacing, float fFirstCharHe - } - } - --bool DrawingML::WriteParagraphProperties( const Reference< XTextContent >& rParagraph, float fFirstCharHeight, sal_Int32 nElement) -+bool DrawingML::WriteParagraphProperties(const Reference& rParagraph, const Reference& rXShapePropSet, float fFirstCharHeight, sal_Int32 nElement) - { - Reference< XPropertySet > rXPropSet( rParagraph, UNO_QUERY ); - Reference< XPropertyState > rXPropState( rParagraph, UNO_QUERY ); -@@ -3110,6 +3110,24 @@ bool DrawingML::WriteParagraphProperties( const Reference< XTextContent >& rPara - return false; - } - -+ // for autofitted textboxes, scale the indents -+ if (GetProperty(rXShapePropSet, "TextFitToSize") && mAny.get() == TextFitToSizeType_AUTOFIT) -+ { -+ SvxShapeText* pTextShape = dynamic_cast(rXShapePropSet.get()); -+ if (pTextShape) -+ { -+ SdrTextObj* pTextObject = dynamic_cast(pTextShape->GetSdrObject()); -+ if (pTextObject) -+ { -+ const auto nFontScaleY = pTextObject->GetFontScaleY(); -+ nLeftMargin = nLeftMargin * nFontScaleY / 100; -+ nLineIndentation = nLineIndentation * nFontScaleY / 100; -+ nParaLeftMargin = nParaLeftMargin * nFontScaleY / 100; -+ nParaFirstLineIndent = nParaFirstLineIndent * nFontScaleY / 100; -+ } -+ } -+ } -+ - if (nParaLeftMargin) // For Paragraph - mpFS->startElementNS( XML_a, nElement, - XML_lvl, sax_fastparser::UseIf(OString::number(nLevel), nLevel > 0), -@@ -3197,7 +3215,7 @@ void DrawingML::WriteLstStyles(const css::uno::ReferencegetPropertyValue("CharHeight").get(); - - mpFS->startElementNS(XML_a, XML_lstStyle); -- if( !WriteParagraphProperties(rParagraph, fFirstCharHeight, XML_lvl1pPr) ) -+ if( !WriteParagraphProperties(rParagraph, rXShapePropSet, fFirstCharHeight, XML_lvl1pPr) ) - mpFS->startElementNS(XML_a, XML_lvl1pPr); - WriteRunProperties(xFirstRunPropSet, false, XML_defRPr, true, rbOverridingCharHeight, - rnCharHeight, GetScriptType(rRun->getString()), rXShapePropSet); -@@ -3239,7 +3257,7 @@ void DrawingML::WriteParagraph( const Reference< XTextContent >& rParagraph, - rnCharHeight = 100 * fFirstCharHeight; - rbOverridingCharHeight = true; - } -- WriteParagraphProperties(rParagraph, fFirstCharHeight, XML_pPr); -+ WriteParagraphProperties(rParagraph, rXShapePropSet, fFirstCharHeight, XML_pPr); - bPropertiesWritten = true; - } - WriteRun( run, rbOverridingCharHeight, rnCharHeight, rXShapePropSet); -@@ -3733,7 +3751,7 @@ void DrawingML::WriteText(const Reference& rXIface, bool bBodyPr, bo - if( aAny >>= xParagraph ) - { - mpFS->startElementNS(XML_a, XML_p); -- WriteParagraphProperties(xParagraph, nCharHeight, XML_pPr); -+ WriteParagraphProperties(xParagraph, rXPropSet, nCharHeight, XML_pPr); - sal_Int16 nDummy = -1; - WriteRunProperties(rXPropSet, false, XML_endParaRPr, false, - bOverridingCharHeight, nCharHeight, nDummy, rXPropSet); diff --git a/curl-7.83.1.tar.xz b/curl-7.83.1.tar.xz deleted file mode 100644 index 6f62ee3..0000000 --- a/curl-7.83.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4 -size 2474940 diff --git a/curl-7.86.0.tar.xz b/curl-7.86.0.tar.xz new file mode 100644 index 0000000..0be61c4 --- /dev/null +++ b/curl-7.86.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b +size 2518356 diff --git a/fix_gtk_popover_on_3.20.patch b/fix_gtk_popover_on_3.20.patch index 30bb12c..63296ff 100644 --- a/fix_gtk_popover_on_3.20.patch +++ b/fix_gtk_popover_on_3.20.patch @@ -1,8 +1,8 @@ -Index: libreoffice-7.3.1.3/vcl/unx/gtk3/gtkinst.cxx +Index: libreoffice-7.4.1.2/vcl/unx/gtk3/gtkinst.cxx =================================================================== ---- libreoffice-7.3.1.3.orig/vcl/unx/gtk3/gtkinst.cxx -+++ libreoffice-7.3.1.3/vcl/unx/gtk3/gtkinst.cxx -@@ -22177,7 +22177,11 @@ public: +--- libreoffice-7.4.1.2.orig/vcl/unx/gtk3/gtkinst.cxx ++++ libreoffice-7.4.1.2/vcl/unx/gtk3/gtkinst.cxx +@@ -22552,7 +22552,11 @@ public: } #endif @@ -15,7 +15,7 @@ Index: libreoffice-7.3.1.3/vcl/unx/gtk3/gtkinst.cxx } #if !GTK_CHECK_VERSION(4, 0, 0) -@@ -22218,7 +22222,7 @@ public: +@@ -22593,7 +22597,7 @@ public: } #endif @@ -24,3 +24,16 @@ Index: libreoffice-7.3.1.3/vcl/unx/gtk3/gtkinst.cxx } void PopdownAndFlushClosedSignal() +Index: libreoffice-7.4.1.2/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx +=================================================================== +--- libreoffice-7.4.1.2.orig/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx ++++ libreoffice-7.4.1.2/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx +@@ -342,7 +342,7 @@ void changeDateContentControl(GtkWidget* + GtkPopover* pPopover = GTK_POPOVER(gtk_widget_get_parent(gtk_widget_get_parent(pSelector))); + guint nYear, nMonth, nDay; + gtk_calendar_get_date(GTK_CALENDAR(pSelector), &nYear, &nMonth, &nDay); +- gtk_popover_popdown(pPopover); ++ gtk_widget_hide(GTK_WIDGET(pPopover)); + + std::stringstream aDate; + aDate << std::setfill('0') << std::setw(4) << nYear; diff --git a/fix_harfbuzz_on_sle12_sp5.patch b/fix_harfbuzz_on_sle12_sp5.patch new file mode 100644 index 0000000..510bb54 --- /dev/null +++ b/fix_harfbuzz_on_sle12_sp5.patch @@ -0,0 +1,48 @@ +Index: libreoffice-7.4.1.2/vcl/source/font/fontinstance.cxx +=================================================================== +--- libreoffice-7.4.1.2.orig/vcl/source/font/fontinstance.cxx ++++ libreoffice-7.4.1.2/vcl/source/font/fontinstance.cxx +@@ -160,17 +160,6 @@ bool LogicalFontInstance::NeedOffsetCorr + unsigned int familyname_size = 10; + + m_xeFontFamilyEnum = FontFamilyEnum::Unclassified; +- +- if (hb_ot_name_get_utf8 (hb_font_get_face(GetHbFont()), +- HB_OT_NAME_ID_FONT_FAMILY , HB_LANGUAGE_INVALID, &familyname_size, familyname) == 8) +- { +- // DFKai-SB (ukai.ttf) is a built-in font under traditional Chinese +- // Windows. It has wrong extent values in glyf table. The problem results +- // in wrong positioning of glyphs in vertical writing. +- // Check https://github.com/harfbuzz/harfbuzz/issues/3521 for reference. +- if (!strncmp("DFKai-SB", familyname, 8)) +- m_xeFontFamilyEnum = FontFamilyEnum::DFKaiSB; +- } + } + + bool bRet = true; +Index: libreoffice-7.4.1.2/vcl/source/font/fontmetric.cxx +=================================================================== +--- libreoffice-7.4.1.2.orig/vcl/source/font/fontmetric.cxx ++++ libreoffice-7.4.1.2/vcl/source/font/fontmetric.cxx +@@ -449,20 +449,7 @@ void ImplFontMetricData::ImplInitBaselin + double nUPEM = hb_face_get_upem(pHbFace); + double fScale = mnHeight / nUPEM; + hb_position_t nBaseline = 0; +- +- if (hb_ot_layout_get_baseline(pHbFont, +- HB_OT_LAYOUT_BASELINE_TAG_HANGING, +- HB_DIRECTION_INVALID, +- HB_SCRIPT_UNKNOWN, +- HB_TAG_NONE, +- &nBaseline)) +- { +- mnHangingBaseline = nBaseline * fScale; +- } +- else +- { +- mnHangingBaseline = 0; +- } ++ mnHangingBaseline = 0; + } + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fix_webp_on_sle12_sp5.patch b/fix_webp_on_sle12_sp5.patch new file mode 100644 index 0000000..2431d5f --- /dev/null +++ b/fix_webp_on_sle12_sp5.patch @@ -0,0 +1,28 @@ +Index: libreoffice-7.4.1.2/vcl/source/filter/webp/writer.cxx +=================================================================== +--- libreoffice-7.4.1.2.orig/vcl/source/filter/webp/writer.cxx ++++ libreoffice-7.4.1.2/vcl/source/filter/webp/writer.cxx +@@ -59,19 +59,12 @@ static bool writeWebp(SvStream& rStream, + } + if (lossless) + { +- if (!WebPConfigLosslessPreset(&config, 6)) +- { +- SAL_WARN("vcl.filter.webp", "WebPConfigLosslessPreset() failed"); +- return false; +- } ++ SAL_WARN("vcl.filter.webp", "WebPConfigLosslessPreset() is not available on SLE-12-SP5"); + } +- else ++ if (!WebPConfigPreset(&config, presetToValue(preset), quality)) + { +- if (!WebPConfigPreset(&config, presetToValue(preset), quality)) +- { +- SAL_WARN("vcl.filter.webp", "WebPConfigPreset() failed"); +- return false; +- } ++ SAL_WARN("vcl.filter.webp", "WebPConfigPreset() failed"); ++ return false; + } + // Here various parts of 'config' can be altered if wanted. + assert(WebPValidateConfig(&config)); diff --git a/libreoffice-7.4.2.3.tar.xz b/libreoffice-7.4.2.3.tar.xz deleted file mode 100644 index 3146fa6..0000000 --- a/libreoffice-7.4.2.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82c1ffe02f2ed8ee1451a9f67c35335b27a638db591f9bc539eff86ab14dd95a -size 263628084 diff --git a/libreoffice-7.4.2.3.tar.xz.asc b/libreoffice-7.4.2.3.tar.xz.asc deleted file mode 100644 index a3e2d1b..0000000 --- a/libreoffice-7.4.2.3.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmNEB+YACgkQ9DSh76/u -rqNfFxAAyQN5OODyj5Hjzh7qMHEwIykYvhAlTl8w8m586d2dB4EtEZRdUy/aJOob -9jLImkNUTbVuBRiTyNp++OEbkV/oGQvOK9cuRLvouxnuW5oOn//QWWYicPxd8LA7 -c6TpmD7UDx6NP1LGEMriSjMDk+tEbr3jeXXiMjkhKveIFnx5FbZTdgCEsZ8eurBv -Q4Pq7kJ17QQM/YzWzzTve0/VlyQsCZMpDCJeBzCSPyIvXEQe/Q7GgnH0JSsZe76v -13hGwMNMVhQLbP5O9RDIVY1Sp8vJ15fkQOVTW/E//zuVCEgHqxpBNg0x6GUyLcPU -bury0/yjdJ3I3DovlYvSw6qUshUruj+MyDDEkWuXf8zGYkYWTN/liMTGkxmOvfDE -3uBsI5j49KMegP/NlOreNNRPoQKO7/ii7nDaUw9Np/IkaQ+4wHbiEdK5XZSNVNQp -zwYfwJu2Emp4Gb4D8CxDaF5PBWozZxb92/bPzqfw1cTAJilHyKyja/kbEM0WjuRZ -QqqEBtNeN+wlGd0Av0EOBu6Z/4M62dLVsAknc7v/A4GR4hwH0HAc+V5VjypTRkB9 -9dhdFO3CVGsKixVvfwNwsNv8iEtkrKLbNhm9aZ7/Mf7i+fAM43zN0pAH5Obq9y18 -mj6/ceBbjZ8DsGEmbf1tVuWgSsk8YcREpKOKY9Fw1Ot98dd3EO8= -=ldZl ------END PGP SIGNATURE----- diff --git a/libreoffice-7.4.3.2.tar.xz b/libreoffice-7.4.3.2.tar.xz new file mode 100644 index 0000000..58dd4ad --- /dev/null +++ b/libreoffice-7.4.3.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffbcbb182e2296ec68ea2ec46bce80a40d53540729c00280ad541cd83c69db3b +size 263885136 diff --git a/libreoffice-7.4.3.2.tar.xz.asc b/libreoffice-7.4.3.2.tar.xz.asc new file mode 100644 index 0000000..e22c0cc --- /dev/null +++ b/libreoffice-7.4.3.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmN1IdEACgkQ9DSh76/u +rqNRbRAAgJ7XsxwqbGzFjJXMk9yf2BSv+4T6YKZYTn/a8mTxBTuXEd2/FuWTNTTY +LyTgnJHwvXXIvP9OFO7R6VYsp1eum9i0Q2HVk8ajjn/FK01xc/yXc30XFvM+eMvg +PnSo2vpZE//6VEyfukL2zHiYPvKQeltvOqfD1NHpDWYi7AjoSbFRrD6IA6zzOpHa +9e7gXxG2VYDVXSnZAgRWMl7bsDKX87MIKck4S6rDVlEnpmJ2jmo0oBHrWkq1i2Wo +45K+jAF/4GxZbUksWBakLeVir0PPW4ARL074753xUmfF7KFZdU4UlwcL2Fwo8yy5 +Xp6gFZk8/HM9rJPDfQtoftu7wKhkQJn+OjpJJRlmVOwwfuGMp2PJxq82aDuaep7T +PS3tUN6vvlvLOX4mnvmC3hxjUN/ib6BZQ8WIgqnghpohRqyjtR2pNV1uGOTh2oM/ +sSEdyd8HQnEYGDKcM0EGjKLmHaBcgkoPgEbWAqCFcD36LZKCQf11zNLztjB2ctsL +8s85m8+p6+Ng6Ce0Xi4flJqHx1INw2EL+lyUwcis/XEi4qbCcx6/NBac7aajIKIP +JpTlmNQ+vpSXhVeJrG9OoA8oE8doX9MaiQ1tctd6yAH+4gHqLfzu9CHCNKInL01v +IzEF/fHU3DaUnJnVI7oaqOyUXag7HkPtpGwyby43rSuaBVSX2Y8= +=YvVU +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-7.4.2.3.tar.xz b/libreoffice-help-7.4.2.3.tar.xz deleted file mode 100644 index 8d8b3fb..0000000 --- a/libreoffice-help-7.4.2.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f9ed5dd9d8b394be442ddb86f57cb78746282d886e0dc35add36e8b34170f5c -size 112593884 diff --git a/libreoffice-help-7.4.2.3.tar.xz.asc b/libreoffice-help-7.4.2.3.tar.xz.asc deleted file mode 100644 index 234f097..0000000 --- a/libreoffice-help-7.4.2.3.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmNEB+kACgkQ9DSh76/u -rqNFMBAAgWQs73s1crrZ44aXzcnom25r21Oq1Y6xhwr8Fzq/G92IFRMWPMBXPOBT -v7d9SZeJGy7pZnFNMJZ3lEJ/liG5NTpogaJ/kixCYQ3VeMe0pGyISO72U9vaX4Yq -BnACS0I62sWmPhrYUIM08XtvH1J4CPF8gQIXJZub+BYaHYgo+hdAGlSVBrHQP/GU -wbpayJlrPxv7SyOTOE3EuUkgt8d0bo9WQ0ldgJ+TvaTSSvclatQph7NddIVNGkOo -K0s/tR/DjD6cR9rDwNxDbbZqcQd7Wms48O2rkhM77SUgbTTISaCZ5Vi6yZZ9nmye -Um4rDsV7q0Pi6dKZx0g8HbkM/YlfQ5K96ZunBl7LvaDY1+g8hbS+fTRsx9gj7Yg5 -Pk/Hz7pN7OGetQ2V0knTtnSZti/+zK2FXWO8KbPbpupgY8cbsKJSDu4t/WIazLcu -IBbBAYXNZqeHgLpIqeoJaxi0elkzQXRxC+NJOGCPMWIhL+hedOjoUV11lwGwF7qO -K6QUR6j4lGqneHzV18kuW3XJxny7AYxIw8vxS5yb7ZLsq4x1MRd4dQQDlUUHN5dx -l0eh8nEdMBFoeJjymPS9gsyDw41K1yTV3LROWEWSOxmt4r8zd7THz2P1k2ZZ8WXv -Xugim16jSyP/pyZc9vML8wssowyVaYxL+p9zPT1lGGRkFmDCgFY= -=GGg8 ------END PGP SIGNATURE----- diff --git a/libreoffice-help-7.4.3.2.tar.xz b/libreoffice-help-7.4.3.2.tar.xz new file mode 100644 index 0000000..ee3cefb --- /dev/null +++ b/libreoffice-help-7.4.3.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d08f4a2f16fb375903270facab527e28de57deb9ba452f9d449d5271d0f118a2 +size 112594804 diff --git a/libreoffice-help-7.4.3.2.tar.xz.asc b/libreoffice-help-7.4.3.2.tar.xz.asc new file mode 100644 index 0000000..9cb7a60 --- /dev/null +++ b/libreoffice-help-7.4.3.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmN1IdYACgkQ9DSh76/u +rqO9Vw//UWqcVOaxvTq13caa3o4gTc/RC1oHVZHaSm1O+hA3um/paET1lgulfs/T +6jyPuCSh8N9SUyFBGFeu4no4FJVgaB+YxAlglMHYoFbz0wHFKtL0N0Xh8ByOas/M +4yU5LA7auqPs91qYJNTZrrlGZW4iFlkrlKWaqJ3/dPxmejkxxHYgTGfnik2OG4h5 +6ulbKgLuzsZXqoXFsF607GTcroKPHiE6ErIGnzcw5I77AfO4Q7pcRRY6jDdr1axV +J8HOxmpeGGZUbhzX3iXzwf+cDlxO2P1pUAjnvQWozVeeQl4gowk0tty390Gh+Pin +iXftnmBl5Aq1U7XLiwaNhRYtn+axwYwtkk4SR9cg4Dht8rkuTGakVCB0ZksAErkX +QipNuf9wn3IpSVwfvTXNrZRsRsY63wTRNwYTzEYWn3viev6wQ4C8m/QIZL3ZcMB/ +DXK6IdhhauHgcXSan47WiasJRzg/V9J9tcPwpMLWjH/g/+bVcf71ZH/5sZof9uQC +9D5eJIQ7ZhpsTDVVRP3l/TWOuyIj2222zwqSuVA4tciGF9sdpQhV0YcxKKj7fmwh +ltXER4YaYN67pSY6dcROsGpVN4pLJ6qRLWrkf69X0jJQecBxclOaK6bxntdLtj85 +q6NRueH08f6aNvz2liN5HCV2HVQOeHXSr6PaSlxEeteVuphaJ+I= +=BH8x +-----END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.4.2.3.tar.xz b/libreoffice-translations-7.4.2.3.tar.xz deleted file mode 100644 index 2147961..0000000 --- a/libreoffice-translations-7.4.2.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c8053f863c95c31a83a079bb2eefd9b666ffd59e40c4344098c04a924a54f6e1 -size 199319988 diff --git a/libreoffice-translations-7.4.2.3.tar.xz.asc b/libreoffice-translations-7.4.2.3.tar.xz.asc deleted file mode 100644 index 0b0d16e..0000000 --- a/libreoffice-translations-7.4.2.3.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmNEB+sACgkQ9DSh76/u -rqM0Vw//aPxr8xOwFl4sZOzFZoODWJ/T0nO+6NzPJBPAIEW0zaEcrrVAHpRQ2mY7 -+IzDT3a3BYxR7MoOxuIjI5uuUqz+m7htcQ7pwsZtvMEzE+gQ7/b0vIan/qOBRYS9 -CQgnvQEObgu2oVigh7FQjbtwERCQmMdR6hVw9gA5kl/dN09OoGY3PfStZkS0oY1E -ikVLomBFsKBAyMcZwr7FdiAa2fV/jQcuGFahqom3x1gE/urJTaxiasCkVnaiiIaS -/Kb2e6YbQyg1tTDvbRLjVk+pmz5HNOpv74c60zy9o0I+sF2o3ok+JbR50QUxBWOT -ibGbay3FYf4miTR2hDMxoihE9EbmMYiMca1xz7ys5G6ynltr/9e3lmjM24ITrw+S -6qvMScWs1NlNRLQ+Yx/n0Lh1rxCOjCQiX01vgztP7R84s9MnFyYcGLRuRzcxqBre -VI95+rtaxPD4lqo1eeceMyEXgK42P8VB4hPGsj855V75lleuHn0RMtLRnlCTHYxX -Lhxbe9JRoyQhq1BgR8hIx8FvDZF6vJfLBQCXPtLtggXXzPElCVahE0TZrLFsVS2q -Zf3x/t0cjw+15K0KOSn49D7WFA01olizNpjESB6acyYKZmLIIAqe1KylT9XvUME6 -6C2FDqEsNcUl2wz4XuBWPXma/dDN0OTcG8mU4ftVtUPg6p7oLus= -=nxfg ------END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.4.3.2.tar.xz b/libreoffice-translations-7.4.3.2.tar.xz new file mode 100644 index 0000000..036f123 --- /dev/null +++ b/libreoffice-translations-7.4.3.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d034df36118844f9958dc775069b3b8b08d11cbb8b4b27531449bc6543bccd20 +size 199476756 diff --git a/libreoffice-translations-7.4.3.2.tar.xz.asc b/libreoffice-translations-7.4.3.2.tar.xz.asc new file mode 100644 index 0000000..8b8e272 --- /dev/null +++ b/libreoffice-translations-7.4.3.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmN1IdcACgkQ9DSh76/u +rqPsHg//Ss7/hNOrDKUqoQsPI+dK7m1B+fJ/DS9yJR5AoFk7G5Hd6vQkc2zAsY2w +iIryIDCXuFVTA9iZo1rdfQwwoeDPjjH8AGdG02hTLtl7RM+TOHZWlTUx2/2dkHmj +MNr9VEq3wwCjzsHem87LEzZoYOf6uJEVq7/2kO182QdR/wIcTSmijtrgTLlU7T94 +FQfqwBGNceVThWhEW31CNQzN2zwRXJYqFbWjlSk7efc+yjtKsAfz68QgtJgTVvCk ++wt0159Czgmu+KLaMWeNMenGtX1lWJSmxtqigukEgTnM4BKw0aBRUIXBcFu9VcBA +6XPfnQP1g0L3M+BZYCdP9qnh8ntVENOp0TTYIebmqVMk3sPD/ZuSkL0T2l2yIpsW +Rd8jNx4KE2iOP518lARMhF1RVby9L7KVZDDGCLKZ721Oyty9fGjmIZ31uBgZ65vd +9sh72YSzAyToyuUsA/A/vVy6Bbzo6z0FsHBrkAjPA+/WxaM372+Pe1XEzM7h8Pio +gVPOo4YpgmlIR3D/XnPT54IxUTI7/3sTW4Llr1YcWFl6QCMrFh7SnHhOxdZ2+yFs +B7LjDT90wGn2lkE75npNhlPq4ViBn/L3UbO7Lbz0Rt/v+IZ/Lc2zbAZZnM3NUaMT +aRWCX7LGrnNG6TZO3RhwzNJ6ogYjynXgbe8HjOb+pL0r9ug0pbY= +=kgnX +-----END PGP SIGNATURE----- diff --git a/libreoffice.changes b/libreoffice.changes index d1fc3bc..036c9b8 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Nov 23 15:44:20 UTC 2022 - Danilo Spinella + +- Update to 7.4.3.2: + https://wiki.documentfoundation.org/Releases/7.4.3/RC2 + https://wiki.documentfoundation.org/Releases/7.4.3/RC1 +- Updated bundled dependencies: + * curl-7.83.1.tar.xz -> curl-7.86.0.tar.xz +- Added patches: + * fix_harfbuzz_on_sle12_sp5.patch + * fix_webp_on_sle12_sp5.patch +- Refresh fix_gtk_popover_on_3.20.patch +- Removed upstreamed patches: + * bsc1202866.patch + * bsc1201095.patch + ------------------------------------------------------------------- Fri Oct 28 09:38:35 UTC 2022 - Andras Timar @@ -17,6 +33,8 @@ Thu Oct 13 10:07:43 UTC 2022 - Danilo Spinella https://wiki.documentfoundation.org/Releases/7.4.2/RC3 https://wiki.documentfoundation.org/Releases/7.4.2/RC2 https://wiki.documentfoundation.org/Releases/7.4.2/RC1 +- Update bundled libraries: + * poppler-22.01.0.tar.xz -> poppler-22.09.0.tar.xz - Remove upstreamed patches: * poppler-22.09.0.patch * bsc1203502.patch diff --git a/libreoffice.spec b/libreoffice.spec index 6608361..6849469 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -49,7 +49,7 @@ %endif %bcond_with firebird Name: libreoffice -Version: 7.4.2.3 +Version: 7.4.3.2 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -107,12 +107,10 @@ Patch3: mediawiki-no-broken-help.diff Patch6: gcc11-fix-error.patch Patch9: fix_math_desktop_file.patch Patch10: fix_gtk_popover_on_3.20.patch +Patch11: fix_webp_on_sle12_sp5.patch +Patch12: fix_harfbuzz_on_sle12_sp5.patch # PATCH-FIX-UPSTREAM remove egrep/fgrep calls Patch13: libreoffice-7.4.1.2-grep.patch -# LO-L3: Text box shows that does not show in PowerPoint -Patch14: bsc1201095.patch -# LO-L3: PPTX: indentation of list items far too far to the left (overruns bullet items) -Patch15: bsc1202866.patch # Build with java 8 Patch101: 0001-Revert-java-9-changes.patch # try to save space by using hardlinks @@ -121,6 +119,7 @@ Patch990: install-with-hardlinks.diff Patch991: libreoffice-no-destdircheck.patch BuildRequires: %{name}-share-linker BuildRequires: ant +BuildRequires: atk-devel >= 2.28 BuildRequires: autoconf BuildRequires: awk BuildRequires: binutils-gold @@ -134,7 +133,7 @@ BuildRequires: zlib-devel %if %{with system_curl} BuildRequires: curl-devel >= 7.68.0 %else -Source2013: %{external_url}/curl-7.83.1.tar.xz +Source2013: %{external_url}/curl-7.86.0.tar.xz %endif # Needed for tests BuildRequires: dejavu-fonts @@ -276,7 +275,7 @@ ExclusiveArch: aarch64 %{ix86} x86_64 ppc64le %if 0%{?suse_version} < 1550 # Too old boost on the system Source2020: %{external_url}/boost_1_79_0.tar.xz -Source2023: %{external_url}/poppler-22.01.0.tar.xz +Source2023: %{external_url}/poppler-22.09.0.tar.xz Source2024: %{external_url}/poppler-data-0.4.11.tar.gz %else BuildRequires: libboost_date_time-devel @@ -1030,11 +1029,11 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch9 -p1 %if 0%{?suse_version} < 1500 %patch10 -p1 +%patch11 -p1 +%patch12 -p1 %patch101 -p1 %endif %patch13 -p1 -%patch14 -p1 -%patch15 -p1 %patch990 -p1 %patch991 -p1 diff --git a/poppler-22.01.0.tar.xz b/poppler-22.01.0.tar.xz deleted file mode 100644 index f03250f..0000000 --- a/poppler-22.01.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d3493056b5b86413e5c693c2cae02c5c06cd8e618d14c2c31e2c84b67b2313e -size 1801984