Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2019-09-02 12:40:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Mon Sep 2 12:40:09 2019 rev:186 rq:726861 version:6.3.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2019-08-22 15:11:39.858439665 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new.7948/libreoffice.changes 2019-09-02 12:40:27.889800101 +0200 @@ -1,0 +2,26 @@ +Thu Aug 29 01:37:24 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Update to 6.3.1.1: + * 6.3.1 RC1 +- Remove merged patch: + * gcc.patch + +------------------------------------------------------------------- +Fri Aug 23 07:36:16 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Add one more patch for the old boost: + * old-boost2.patch + +------------------------------------------------------------------- +Tue Aug 20 10:27:08 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Add patch to fix building on SLE12: + * old-boost.patch + +------------------------------------------------------------------- +Mon Aug 19 11:49:21 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Add patch to fix build with SLE12 boost: + * 0001-Fix-buidling-with-older-boost.patch + +------------------------------------------------------------------- Old: ---- gcc.patch libreoffice-6.3.0.4.tar.xz libreoffice-6.3.0.4.tar.xz.asc libreoffice-help-6.3.0.4.tar.xz libreoffice-help-6.3.0.4.tar.xz.asc libreoffice-translations-6.3.0.4.tar.xz libreoffice-translations-6.3.0.4.tar.xz.asc New: ---- 0001-Fix-buidling-with-older-boost.patch libreoffice-6.3.1.1.tar.xz libreoffice-6.3.1.1.tar.xz.asc libreoffice-help-6.3.1.1.tar.xz libreoffice-help-6.3.1.1.tar.xz.asc libreoffice-translations-6.3.1.1.tar.xz libreoffice-translations-6.3.1.1.tar.xz.asc old-boost.patch old-boost2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.VM2Qwc/_old 2019-09-02 12:40:37.857798303 +0200 +++ /var/tmp/diff_new_pack.VM2Qwc/_new 2019-09-02 12:40:37.861798303 +0200 @@ -52,7 +52,7 @@ %bcond_with gtk3 %endif Name: libreoffice -Version: 6.3.0.4 +Version: 6.3.1.1 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -100,8 +100,10 @@ # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files Patch2: nlpsolver-no-broken-help.diff Patch3: mediawiki-no-broken-help.diff -Patch4: gcc.patch Patch5: mdds-1-5.patch +Patch6: 0001-Fix-buidling-with-older-boost.patch +Patch7: old-boost.patch +Patch8: old-boost2.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff # save time by relying on rpm check rather than doing stupid find+grep @@ -985,8 +987,10 @@ %endif # Leap 42/SLE-12 %patch2 %patch3 -%patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %patch990 -p1 %patch991 -p1 ++++++ 0001-Fix-buidling-with-older-boost.patch ++++++ >From 85a60cfe498f278087edbf88d221929a32e8f2e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <[email protected]> Date: Mon, 19 Aug 2019 13:30:23 +0200 Subject: [PATCH] Fix buidling with older boost Change-Id: I49691e8bf708aa9146d5c4f61532e7a215f4ac2d --- sw/source/core/layout/calcmove.cxx | 8 ++++++++ sw/source/core/layout/flowfrm.cxx | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 1856e6b69d40..ff2befe5d969 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -409,12 +409,20 @@ void SwFrame::PrepareCursor() if ( bTab ) { +#if BOOST_VERSION < 105600 + tabGuard.reset(static_cast<SwTabFrame*>(this)); // tdf#125741 +#else tabGuard.emplace(static_cast<SwTabFrame*>(this)); // tdf#125741 +#endif pThis = static_cast<SwTabFrame*>(this); } else if (IsRowFrame()) { +#if BOOST_VERSION < 105600 + rowGuard.reset(SwFrameDeleteGuard(this)); // tdf#125741 keep this alive +#else rowGuard.emplace(this); // tdf#125741 keep this alive +#endif } else if( IsSctFrame() ) { diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 6c9e61595f23..dbe7d9c7feec 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -2527,7 +2527,11 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat ) && pTabFrame->GetFirstNonHeadlineRow() == m_rThis.GetUpper()->GetUpper()) { // lock follow-flow-row (similar to sections above) +#if BOOST_VERSION < 105600 + g.reset(SwFrameDeleteGuard(m_rThis.GetUpper()->GetUpper())); +#else g.emplace(m_rThis.GetUpper()->GetUpper()); +#endif assert(m_rThis.GetUpper()->GetUpper()->IsDeleteForbidden()); } } -- 2.22.0 ++++++ libreoffice-6.3.0.4.tar.xz -> libreoffice-6.3.1.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-6.3.0.4.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.7948/libreoffice-6.3.1.1.tar.xz differ: char 27, line 1 ++++++ libreoffice-help-6.3.0.4.tar.xz -> libreoffice-help-6.3.1.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-help-6.3.0.4.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.7948/libreoffice-help-6.3.1.1.tar.xz differ: char 27, line 1 ++++++ libreoffice-translations-6.3.0.4.tar.xz -> libreoffice-translations-6.3.1.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-6.3.0.4.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.7948/libreoffice-translations-6.3.1.1.tar.xz differ: char 27, line 1 ++++++ old-boost.patch ++++++ diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index bad7d74672d0..07d3549e750d 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1287,7 +1287,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) OUString sSetupVersion = utl::ConfigManager::getProductVersion(); sal_Int32 iCurrent = sSetupVersion.getToken(0,'.').toInt32() * 10 + sSetupVersion.getToken(1,'.').toInt32(); OUString sLastVersion - = officecfg::Setup::Product::ooSetupLastVersion::get().value_or("0.0"); + = officecfg::Setup::Product::ooSetupLastVersion::get().get_value_or("0.0"); sal_Int32 iLast = sLastVersion.getToken(0,'.').toInt32() * 10 + sLastVersion.getToken(1,'.').toInt32(); if ((iCurrent > iLast) && !Application::IsHeadlessModeEnabled() && !bIsUITest) { ++++++ old-boost2.patch ++++++ >From e63ec6c40c9cb6a265c2060c28491405413b3200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <[email protected]> Date: Fri, 23 Aug 2019 09:44:01 +0200 Subject: [PATCH] Fix old boost build for good With the previous approach the code could lead to crashes in the flowfrm.cxx Change-Id: I3b56ed46db9d37a606a1cd793a20b8aff22db6e2 --- sw/source/core/inc/frame.hxx | 5 +++++ sw/source/core/layout/calcmove.cxx | 9 +++++++-- sw/source/core/layout/flowfrm.cxx | 6 +++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index ab1047d0348f..312957a02593 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -1238,7 +1238,12 @@ public: //it in e.g. SwSectionFrame::MergeNext etc because we will need it //again after the SwFrameDeleteGuard dtor explicit SwFrameDeleteGuard(SwFrame* pFrame); + + SwFrameDeleteGuard(const SwFrameDeleteGuard&) =delete; + ~SwFrameDeleteGuard(); + + SwFrameDeleteGuard& operator=(const SwFrameDeleteGuard&) =delete; }; typedef long (SwFrame:: *SwFrameGet)() const; diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 3502450c2a47..cb956d8f916c 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -404,14 +404,19 @@ void SwFrame::PrepareCursor() const bool bTab = IsTabFrame(); bool bNoSect = IsInSct(); +#if BOOST_VERSION < 105600 + std::list<FlowFrameJoinLockGuard> tabGuard; + std::list<SwFrameDeleteGuard> rowGuard; +#else boost::optional<FlowFrameJoinLockGuard> tabGuard; boost::optional<SwFrameDeleteGuard> rowGuard; +#endif SwFlowFrame* pThis = bCnt ? static_cast<SwContentFrame*>(this) : nullptr; if ( bTab ) { #if BOOST_VERSION < 105600 - tabGuard.reset(static_cast<SwTabFrame*>(this)); // tdf#125741 + tabGuard.emplace_back(static_cast<SwTabFrame*>(this)); // tdf#125741 #else tabGuard.emplace(static_cast<SwTabFrame*>(this)); // tdf#125741 #endif @@ -420,7 +425,7 @@ void SwFrame::PrepareCursor() else if (IsRowFrame()) { #if BOOST_VERSION < 105600 - rowGuard.reset(SwFrameDeleteGuard(this)); // tdf#125741 keep this alive + rowGuard.emplace_back(this); // tdf#125741 keep this alive #else rowGuard.emplace(this); // tdf#125741 keep this alive #endif diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 54f0bdd4e567..fb87c6025061 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -2522,7 +2522,11 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat ) { auto const pOld = m_rThis.GetUpper(); +#if BOOST_VERSION < 105600 + std::list<SwFrameDeleteGuard> g; +#else ::boost::optional<SwFrameDeleteGuard> g; +#endif if (m_rThis.GetUpper()->IsCellFrame()) { // note: IsFollowFlowRow() is never set for new-style tables @@ -2533,7 +2537,7 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat ) { // lock follow-flow-row (similar to sections above) #if BOOST_VERSION < 105600 - g.reset(SwFrameDeleteGuard(m_rThis.GetUpper()->GetUpper())); + g.emplace_back(m_rThis.GetUpper()->GetUpper()); #else g.emplace(m_rThis.GetUpper()->GetUpper()); #endif -- 2.22.0
