diff options
author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-03-22 06:35:12 +0000 |
---|---|---|
committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-03-22 06:35:12 +0000 |
commit | d0fd8d80cae022a4401411c686d2ed7758a969d4 (patch) | |
tree | 55759a10d5a625251545b1ec8124327dc02267a9 /user/libreoffice/boost.patch | |
parent | f9dffe1158c9b5dee29ea3def908cb6da2f77cd9 (diff) | |
download | packages-d0fd8d80cae022a4401411c686d2ed7758a969d4.tar.gz packages-d0fd8d80cae022a4401411c686d2ed7758a969d4.tar.bz2 packages-d0fd8d80cae022a4401411c686d2ed7758a969d4.tar.xz packages-d0fd8d80cae022a4401411c686d2ed7758a969d4.zip |
user/libreoffice: fix build with Boost 1.69.0
Diffstat (limited to 'user/libreoffice/boost.patch')
-rw-r--r-- | user/libreoffice/boost.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/user/libreoffice/boost.patch b/user/libreoffice/boost.patch new file mode 100644 index 000000000..f72016725 --- /dev/null +++ b/user/libreoffice/boost.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}; + } + + } |