19.12.2014, 18:26, "Eike Rathke" <erackatredhat.com>: > Hi ungifted, > > On Thursday, 2014-12-18 22:56:24 +0300, ungifted wrote: >> I found I should report build issues into this maillist. Ok. >> >> Trying to build LibreOffice-4.4.9999 on my Gentoo and got subj. > > First thing you should do is not enable tubes in your build, remove the > --enable-telepathy option from the autogen.sh call. That is an highly > experimental framework not benefitting anyone except developers who want > to work on it.
This was Gentoo ebuild changed from 4.3.9999 to 4.4.9999 Proposed ebuild for 4.4 there: https://bugs.gentoo.org/show_bug.cgi?id=533138 still have USE flag "telepathy". >> With this patch I can at least build it now. >> >> +#include <osl/diagnose.h> > > Thanks anyway for the heads-up, the proper solution would be to convert > the old OSL_ENSURE() macro calls to SAL_WARN_IF() Proposed change looks simple even for me :) I found SAL_WARN_IF() used many times in tubes. Using this as example and by reading desc in log.hxx/log.h patch (not tested). I found I should negative bool value here because: from log.hxx for SAL_WARN_IF "if the given condition is true" from diagnose.h for OSL_ENSURE "If cond is false..." diff -Naur a/tubes/source/conference.cxx b/tubes/source/conference.cxx --- a/tubes/source/conference.cxx 2014-12-18 01:13:50.000000000 +0300 +++ b/tubes/source/conference.cxx 2015-01-07 00:23:50.821287600 +0300 @@ -248,7 +248,7 @@ void TeleConference::setChannel( TpAccount *pAccount, TpDBusTubeChannel* pChannel ) { - OSL_ENSURE( !mpChannel, "TeleConference::setChannel: already have channel"); + SAL_WARN_IF( mpChannel, "tubes", "TeleConference::setChannel: already have channel"); if (mpChannel) g_object_unref( mpChannel); if (mpAccount) @@ -297,7 +297,7 @@ { INFO_LOGGER( "TeleConference::offerTube"); - OSL_ENSURE( mpChannel, "TeleConference::offerTube: no channel"); + SAL_WARN_IF( !mpChannel, "tubes", "TeleConference::offerTube: no channel"); if (!mpChannel) return false; @@ -319,7 +319,7 @@ { INFO_LOGGER( "TeleConference::setTube"); - OSL_ENSURE( !pImpl->mpTube, "TeleConference::setTube: already tubed"); + SAL_WARN_IF( pImpl->mpTube, "tubes", "TeleConference::setTube: already tubed"); pImpl->mpTube = pTube; > and include sal/log.hxx for that It coming from #include #include <tubes/conference.hxx> and then from #include <rtl/ustring.hxx> > and add a proper section to include/sal/log-areas.dox Is "tubes" area into "other" section good? diff -Naur a/include/sal/log-areas.dox b/include/sal/log-areas.dox --- a/include/sal/log-areas.dox 2014-12-18 01:13:50.000000000 +0300 +++ b/include/sal/log-areas.dox 2015-01-07 00:55:31.143174332 +0300 @@ -501,6 +501,7 @@ @li @c store @li @c svg @li @c test +@li @c tubes @li @c ucbhelper @li @c unoidl @li @c unoxml And I found using SAL_INFO( "tubes.method"... in /tubes/source/conference.cxx and manager.cxx May be it should be added too? Please look. Thanks _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
