diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-10-30 14:32:53 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-10-30 14:32:53 +0100 |
| commit | 998e6cdcd2a9fcce18b46676ce47990867227945 (patch) | |
| tree | 5b6b08860183d164108257a3715e0c5673063f5a /gnu/packages/patches/libreoffice-boost.patch | |
| parent | a557810ac72effd6841b76772195b10c03dee345 (diff) | |
| parent | d8bb1097d764949e80f9e41d26b3b194163dd716 (diff) | |
| download | guix-998e6cdcd2a9fcce18b46676ce47990867227945.tar guix-998e6cdcd2a9fcce18b46676ce47990867227945.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/libreoffice-boost.patch')
| -rw-r--r-- | gnu/packages/patches/libreoffice-boost.patch | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/gnu/packages/patches/libreoffice-boost.patch b/gnu/packages/patches/libreoffice-boost.patch deleted file mode 100644 index b50664226b..0000000000 --- a/gnu/packages/patches/libreoffice-boost.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix compatibility with newer Boost. - -Extracted from this upstream commit: -https://cgit.freedesktop.org/libreoffice/core/commit/?id=23a8d5ffbbe58761b89f590f0735abccd69a3681 - -diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx ---- a/sfx2/source/appl/shutdownicon.cxx -+++ b/sfx2/source/appl/shutdownicon.cxx -@@ -144,7 +144,7 @@ bool LoadModule() - #endif // ENABLE_QUICKSTART_APPLET - } - assert(!boost::logic::indeterminate(loaded)); -- return loaded; -+ return bool(loaded); - } - - } |