pool/libreoffice
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Also drop boost_string_fixes.patch merged in upstream differently

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=616
This commit is contained in:
Tomáš Chvátal 2018-03-26 08:12:15 +00:00 committed by Git OBS Bridge
parent fe1b0827de
commit ce9ae7ac79
3 changed files with 5 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
boost_string_fixes.patch
View File

@ -1,37 +0,0 @@
Author: Adam Majer <amajer@suse.de>
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:

5
libreoffice.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Mar 26 08:09:03 UTC 2018 - tchvatal@suse.com
- Also drop boost_string_fixes.patch merged in upstream differently
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 22 11:46:48 UTC 2018 - tchvatal@suse.com Thu Mar 22 11:46:48 UTC 2018 - tchvatal@suse.com

3
libreoffice.spec
View File

@ -95,7 +95,6 @@ Patch5: 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch
Patch7: bnc1039203.patch Patch7: bnc1039203.patch
# LO-L3: Slide with chart has some strange (too large?) elements (PPTX) # LO-L3: Slide with chart has some strange (too large?) elements (PPTX)
Patch8: bnc1060128.patch Patch8: bnc1060128.patch
Patch500: boost_string_fixes.patch
# try to save space by using hardlinks # try to save space by using hardlinks
Patch990: install-with-hardlinks.diff Patch990: install-with-hardlinks.diff
BuildRequires: %{name}-share-linker BuildRequires: %{name}-share-linker
@ -879,8 +878,6 @@ Provides additional %{langname} translations and resources for %{project}. \
%if 0%{?suse_version} < 1330 %if 0%{?suse_version} < 1330
# The rename of the configdir is needed only on older than factory for compat # The rename of the configdir is needed only on older than factory for compat
%patch1 %patch1
# fixes to satisfy old boost versions
%patch500 -p1
%endif # Leap 42/SLE-12 %endif # Leap 42/SLE-12
%patch2 %patch2
%patch3 %patch3