Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2018-02-22 14:59:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Thu Feb 22 14:59:49 2018 rev:147 rq:578364 version:6.0.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2018-02-15 13:24:08.118964029 +0100 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2018-02-22 14:59:51.571586939 +0100 @@ -1,0 +2,12 @@ +Tue Feb 20 14:03:07 UTC 2018 - [email protected] + +- Add patch to build properly with orcus-0.13.3: + * orcus-0.13.3.patch + +------------------------------------------------------------------- +Sat Feb 17 11:19:03 UTC 2018 - [email protected] + +- boost_string_fixes.patch: Boost in Leap 42.3 and SLE-12 is lacking + some functionality found in newer versions. Workaround the problem. + +------------------------------------------------------------------- New: ---- boost_string_fixes.patch orcus-0.13.3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.6b4RAm/_old 2018-02-22 15:00:00.935250056 +0100 +++ /var/tmp/diff_new_pack.6b4RAm/_new 2018-02-22 15:00:00.935250056 +0100 @@ -91,6 +91,8 @@ Patch3: mediawiki-no-broken-help.diff Patch4: kde5-configure-checks.patch Patch5: 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch +Patch6: orcus-0.13.3.patch +Patch500: boost_string_fixes.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -873,14 +875,17 @@ %prep %setup -q -b1 -b2 -# The rename of the configdir is needed only on older than factory for compat %if 0%{?suse_version} < 1330 +# The rename of the configdir is needed only on older than factory for compat %patch1 -%endif +# fixes to satisfy old boost versions +%patch500 -p1 +%endif # Leap 42/SLE-12 %patch2 %patch3 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %patch990 -p1 # Disable some of the failing tests (some are random) ++++++ boost_string_fixes.patch ++++++ Author: Adam Majer <[email protected]> Date: Sat Feb 17 12:13:32 CET 2018 Old boost seems to be missing some boost::optional functionality. This patch is a simple fix for a few problem spots. If this problem gets larger, it may need a more generic solution instead. Index: libreoffice-6.0.1.1/sw/source/core/txtnode/txatbase.cxx =================================================================== --- libreoffice-6.0.1.1.orig/sw/source/core/txtnode/txatbase.cxx +++ libreoffice-6.0.1.1/sw/source/core/txtnode/txatbase.cxx @@ -100,21 +100,21 @@ void SwTextAttr::dumpAsXml(xmlTextWriter { pWhich = "character format"; if (SwCharFormat* pCharFormat = GetCharFormat().GetCharFormat()) - oValue = "name: " + OUStringToOString(pCharFormat->GetName(), RTL_TEXTENCODING_UTF8); + *oValue = OString("name: " + OUStringToOString(pCharFormat->GetName(), RTL_TEXTENCODING_UTF8)); break; } case RES_TXTATR_INETFMT: { pWhich = "inet format"; const SwFormatINetFormat& rFormat = GetINetFormat(); - oValue = "url: " + rFormat.GetValue().toUtf8(); + *oValue = OString("url: " + rFormat.GetValue().toUtf8()); break; } case RES_TXTATR_CJK_RUBY: { pWhich = "ruby"; const SwFormatRuby& rFormat = GetRuby(); - oValue = "rubytext: " + rFormat.GetText().toUtf8(); + *oValue = OString("rubytext: " + rFormat.GetText().toUtf8()); break; } case RES_TXTATR_META: ++++++ orcus-0.13.3.patch ++++++ >From 20945a9a4de6684010fd5b3603595e6da543807d Mon Sep 17 00:00:00 2001 From: Kohei Yoshida <[email protected]> Date: Wed, 31 Jan 2018 21:27:44 -0500 Subject: Correctly import solid fill color. In orcus, a solid fill type uses the foreground color only and ignores the background color. Also, let's not use the alpha component as it would cause the color to not get rendered at all. Some patches are applied against liborcus in order to adjust the ODF styles import code for this change. These changes will be incorporated in 0.13.3. Change-Id: I9e8c243cc6a7f366de2393e7b7ecf77366f5f9ea Reviewed-on: https://gerrit.libreoffice.org/49071 Reviewed-by: Kohei Yoshida <[email protected]> Tested-by: Kohei Yoshida <[email protected]> --- ...-of-0-means-fully-transparent.-I-m-sure-2.patch | 50 ++++++++++++++++++++++ ...osed-to-use-the-foreground-color-for-soli.patch | 49 +++++++++++++++++++++ external/liborcus/UnpackedTarball_liborcus.mk | 2 + sc/source/filter/orcus/interface.cxx | 15 ++++--- 4 files changed, 111 insertions(+), 5 deletions(-) create mode 100644 external/liborcus/0001-Alpha-value-of-0-means-fully-transparent.-I-m-sure-2.patch create mode 100644 external/liborcus/0002-We-are-supposed-to-use-the-foreground-color-for-soli.patch diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx index e40a71b..4cfd844 100644 --- a/sc/source/filter/orcus/interface.cxx +++ b/sc/source/filter/orcus/interface.cxx @@ -1148,7 +1148,8 @@ void ScOrcusStyles::fill::applyToItemSet(SfxItemSet& rSet) const return; } - rSet.Put(SvxBrushItem(maBgColor, ATTR_BACKGROUND)); + if (maPattern.equalsIgnoreAsciiCase("solid")) + rSet.Put(SvxBrushItem(maFgColor, ATTR_BACKGROUND)); } ScOrcusStyles::protection::protection(): @@ -1574,15 +1575,19 @@ void ScOrcusStyles::set_fill_pattern_type(const char* s, size_t n) maCurrentFill.mbHasFillAttr = true; } -void ScOrcusStyles::set_fill_fg_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) +void ScOrcusStyles::set_fill_fg_color( + orcus::spreadsheet::color_elem_t /*alpha*/, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) { - maCurrentFill.maFgColor = Color(alpha, red, green, blue); + // Ignore the alpha element for now. + maCurrentFill.maFgColor = Color(red, green, blue); maCurrentFill.mbHasFillAttr = true; } -void ScOrcusStyles::set_fill_bg_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) +void ScOrcusStyles::set_fill_bg_color( + orcus::spreadsheet::color_elem_t /*alpha*/, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) { - maCurrentFill.maBgColor = Color(alpha, red, green, blue); + // Ignore the alpha element for now. + maCurrentFill.maBgColor = Color(red, green, blue); maCurrentFill.mbHasFillAttr = true; } -- cgit v1.1
