libreoffice: fix build with boost >= 1.69.0
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user