From c55ec329f06bf6f39c23c2ad969ea437cbf0bbbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 15 Mar 2019 22:54:36 +0100
Subject: [PATCH] libreoffice: fix build with boost >= 1.69.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../0009-Fix-build-with-boost-1.69.0.patch    | 33 +++++++++++++++++++
 .../libreoffice/libreoffice.inc               |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 recipes-libreoffice/libreoffice/files/0009-Fix-build-with-boost-1.69.0.patch

diff --git a/recipes-libreoffice/libreoffice/files/0009-Fix-build-with-boost-1.69.0.patch b/recipes-libreoffice/libreoffice/files/0009-Fix-build-with-boost-1.69.0.patch
new file mode 100644
index 0000000..0495980
--- /dev/null
+++ b/recipes-libreoffice/libreoffice/files/0009-Fix-build-with-boost-1.69.0.patch
@@ -0,0 +1,33 @@
+From ae6d997f605c5913ba8a10a8ae71a947f7e10f0c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Fri, 15 Mar 2019 22:29:26 +0100
+Subject: [PATCH] Fix build with boost >= 1.69.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Backport [1]
+
+[1] https://github.com/LibreOffice/core/commit/23a8d5ffbbe58761b89f590f0735abccd69a3681
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ sfx2/source/appl/shutdownicon.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
+index a8b8a13..4db03c4 100644
+--- a/sfx2/source/appl/shutdownicon.cxx
++++ b/sfx2/source/appl/shutdownicon.cxx
+@@ -177,7 +177,7 @@ bool LoadModule()
+ #endif // ENABLE_QUICKSTART_APPLET
+     }
+     assert(!boost::logic::indeterminate(loaded));
+-    return loaded;
++    return bool(loaded);
+ }
+ 
+ }
+-- 
+2.20.1
+
diff --git a/recipes-libreoffice/libreoffice/libreoffice.inc b/recipes-libreoffice/libreoffice/libreoffice.inc
index b89d89d..d06463b 100644
--- a/recipes-libreoffice/libreoffice/libreoffice.inc
+++ b/recipes-libreoffice/libreoffice/libreoffice.inc
@@ -18,6 +18,7 @@ SRC_URI += " \
     file://0006-Fix-build-with-recent-icu.patch \
     file://0007-fix-build-with-poppler-0.64.patch \
     file://0008-Make-virtual-ScValidationDlg-non-inline.patch \
+    file://0009-Fix-build-with-boost-1.69.0.patch \
 "
 SRCREV_unoconv = "260b815bf2c57118df439f381974f3f0987222a1"