From 284dd30237d9beeaf386fbb0513d578ca318a125 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 16 Jan 2019 20:36:39 +0000
Subject: [PATCH] extra/libreoffice-fresh to 6.1.4-2

---
 extra/libreoffice-fresh/PKGBUILD                |  6 +++++-
 .../libreoffice-boost-1.69.patch                | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 extra/libreoffice-fresh/libreoffice-boost-1.69.patch

diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD
index c1c1b8dff..34d75b0c8 100644
--- a/extra/libreoffice-fresh/PKGBUILD
+++ b/extra/libreoffice-fresh/PKGBUILD
@@ -20,7 +20,7 @@ pkgbase=libreoffice-fresh
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
 _LOver=6.1.4.2
 pkgver=6.1.4
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -66,6 +66,7 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
 	poppler-0.70.patch
         libreoffice-poppler-0.71.patch
         libreoffice-poppler-0.72.patch
+        libreoffice-boost-1.69.patch
 	0001-Update-mdds-to-1.4.1.patch
 	0001-Update-orcus-to-0.14.0.patch
 	libreoffice-fresh.sh libreoffice-fresh.csh)
@@ -110,6 +111,7 @@ sha256sums=('648fe9177e0813625a99e775dac1354a416eef2f3ef44eab4e770d08293b37fe'
             '4cac21ffdb711803c0d5372c6b0ba04f1310afa7907081fdd01c11e68c1785bf'
             'ffe1698d3db3320a9213a459e7619f4962c9792a8b256ea0fe2b7e0af1df430a'
             'dc8b5b0d1a4a1fed4f5cab048cd7ecd78630725458311bcbfe0a660c82357b49'
+            '5099c5e7818a327b661c45c0bd218835c1e70b14861b5112525da1d48beebf8c'
             '8e8460302a7febc9a29b32b98fb77c85910ccadc65c73e0e9997dc5aabaaeb2a'
             '60560283a5e22acad7f341b16dff4a654559b36db5d49b1e59f3bb9ae9b2336c'
             '28c97effbe55e43a1370ab141c676cec9daba9e3dc408bec78136dfefc892a8b'
@@ -145,6 +147,8 @@ prepare() {
         patch -p1 -i ../libreoffice-poppler-0.71.patch
         # fix build with poppler 0.72
         patch -p1 -i ../libreoffice-poppler-0.72.patch
+        # fix build with boost 1.69 (freebsd)
+        patch -p0 -i ../libreoffice-boost-1.69.patch
 
 	# fix build with new mdds 1.4.x, liborcus 0.14.x
 #	sed -i "s:mdds-1.2 >= 1.2.3:mdds-1.4 >= 1.4.2:" configure.ac
diff --git a/extra/libreoffice-fresh/libreoffice-boost-1.69.patch b/extra/libreoffice-fresh/libreoffice-boost-1.69.patch
new file mode 100644
index 000000000..f72016725
--- /dev/null
+++ b/extra/libreoffice-fresh/libreoffice-boost-1.69.patch
@@ -0,0 +1,17 @@
+After https://github.com/boostorg/logic/commit/23cd89d4c80f build fails:
+
+sfx2/source/appl/shutdownicon.cxx:170:12: error: no viable conversion from returned value of type 'boost::logic::tribool' to function return type 'bool'
+    return loaded;
+           ^~~~~~
+
+--- sfx2/source/appl/shutdownicon.cxx.orig	2018-06-19 22:27:30 UTC
++++ sfx2/source/appl/shutdownicon.cxx
+@@ -167,7 +167,7 @@ bool LoadModule()
+ #endif // ENABLE_QUICKSTART_APPLET
+     }
+     assert(!boost::logic::indeterminate(loaded));
+-    return loaded;
++    return bool{loaded};
+ }
+ 
+ }