diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-02-06 12:00:47 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-02-06 12:00:47 +0000 |
| commit | 41daf47e201a1088efd6cb9071465aed0fff6907 (patch) | |
| tree | 371421dbc3c11e203a80fb1ebaa5bb7fbab7906f /user/libreoffice/boost.patch | |
| parent | 204843f672d41ab08c1ede03eaa5f032691bfdb3 (diff) | |
| parent | 00075f842380bff25a1b88a27056973d0341fb31 (diff) | |
| download | packages-41daf47e201a1088efd6cb9071465aed0fff6907.tar.gz packages-41daf47e201a1088efd6cb9071465aed0fff6907.tar.bz2 packages-41daf47e201a1088efd6cb9071465aed0fff6907.tar.xz packages-41daf47e201a1088efd6cb9071465aed0fff6907.zip | |
Merge branch 'libreoffice' into 'master'
Bump LibreOffice to 6.4.0.3
See merge request adelie/packages!334
Diffstat (limited to 'user/libreoffice/boost.patch')
| -rw-r--r-- | user/libreoffice/boost.patch | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/user/libreoffice/boost.patch b/user/libreoffice/boost.patch deleted file mode 100644 index cd8ef9dba..000000000 --- a/user/libreoffice/boost.patch +++ /dev/null @@ -1,17 +0,0 @@ -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; - ^~~~~~ - ---- lo/sfx2/source/appl/shutdownicon.cxx.orig 2018-06-19 22:27:30 UTC -+++ lo/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}; - } - - } |