diff --git a/libreoffice.changes b/libreoffice.changes index 06220ce..0f31057 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 19 10:44:31 UTC 2019 - Adam Majer + +- old-boost.patch: update patch to fix build with Boost from SLE-12 + ------------------------------------------------------------------- Mon Mar 18 12:27:36 UTC 2019 - Tomáš Chvátal diff --git a/old-boost.patch b/old-boost.patch index 601788a..c3beefb 100644 --- a/old-boost.patch +++ b/old-boost.patch @@ -1,7 +1,7 @@ -Index: libreoffice-6.1.0.0.beta2/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx +Index: libreoffice-6.2.2.1/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx =================================================================== ---- libreoffice-6.1.0.0.beta2.orig/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx -+++ libreoffice-6.1.0.0.beta2/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx +--- libreoffice-6.2.2.1.orig/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx ++++ libreoffice-6.2.2.1/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx @@ -58,7 +58,7 @@ OUString applicationDirPath() const auto utf8Path = applicationSystemPath.toUtf8(); auto ret = boost::filesystem::path(utf8Path.getStr(), utf8Path.getStr() + utf8Path.getLength()); @@ -11,3 +11,46 @@ Index: libreoffice-6.1.0.0.beta2/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx } OUString findPickerExecutable() +Index: libreoffice-6.2.2.1/sw/source/core/crsr/findtxt.cxx +=================================================================== +--- libreoffice-6.2.2.1.orig/sw/source/core/crsr/findtxt.cxx ++++ libreoffice-6.2.2.1/sw/source/core/crsr/findtxt.cxx +@@ -152,7 +152,11 @@ public: + { + if (pFrame) + { ++#if BOOST_VERSION < 105600 ++ m_oMergedIter.reset(*pFrame); ++#else + m_oMergedIter.emplace(*pFrame); ++#endif + } + } + +Index: libreoffice-6.2.2.1/sw/source/core/inc/txtfrm.hxx +=================================================================== +--- libreoffice-6.2.2.1.orig/sw/source/core/inc/txtfrm.hxx ++++ libreoffice-6.2.2.1/sw/source/core/inc/txtfrm.hxx +@@ -24,6 +24,8 @@ + #include + #include "TextFrameIndex.hxx" + ++#include ++ + namespace com { namespace sun { namespace star { namespace linguistic2 { class XHyphenatedWord; } } } } + + namespace sw { namespace mark { class IMark; } } +@@ -980,8 +982,13 @@ struct MergedPara + class MergedAttrIterBase + { + protected: ++#if BOOST_VERSION < 105600 ++ sw::MergedPara const* m_pMerged; ++ SwTextNode const* m_pNode; ++#else + sw::MergedPara const*const m_pMerged; + SwTextNode const*const m_pNode; ++#endif + size_t m_CurrentExtent; + size_t m_CurrentHint; + MergedAttrIterBase(SwTextFrame const& rFrame);