From 504e5c4a8619e6fe87ec21e53be8f068c7edfad4ef04e4083dbdd9bc4877879a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Tue, 20 Aug 2019 10:27:38 +0000
Subject: [PATCH] - Add patch to fix building on SLE12:   * old-boost.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=815
---
 libreoffice.changes |  6 ++++++
 libreoffice.spec    |  2 ++
 old-boost.patch     | 13 +++++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 old-boost.patch

diff --git a/libreoffice.changes b/libreoffice.changes
index 531c7ec..5fe7f9f 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug 20 10:27:08 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Add patch to fix building on SLE12:
+  * old-boost.patch
+
 -------------------------------------------------------------------
 Mon Aug 19 11:49:21 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/libreoffice.spec b/libreoffice.spec
index bd0832f..5f42f97 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -103,6 +103,7 @@ 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
 # 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
@@ -989,6 +990,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 %patch990 -p1
 %patch991 -p1
 
diff --git a/old-boost.patch b/old-boost.patch
new file mode 100644
index 0000000..eca5324
--- /dev/null
+++ b/old-boost.patch
@@ -0,0 +1,13 @@
+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)
+                     {