svn commit: r482786 - head/editors/libreoffice/files

Jan Beich jbeich at FreeBSD.org
Mon Oct 22 20:30:04 UTC 2018


Author: jbeich
Date: Mon Oct 22 20:30:03 2018
New Revision: 482786
URL: https://svnweb.freebsd.org/changeset/ports/482786

Log:
  editors/libreoffice: unbreak with boost 1.69
  
  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;
             ^~~~~~
  
  PR:		232525

Added:
  head/editors/libreoffice/files/patch-boost-1.69   (contents, props changed)

Added: head/editors/libreoffice/files/patch-boost-1.69
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/libreoffice/files/patch-boost-1.69	Mon Oct 22 20:30:03 2018	(r482786)
@@ -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};
+ }
+ 
+ }


More information about the svn-ports-all mailing list