Seeing -- "Building with external serf (which is recommended) has been broken for a while. Restore the proper include paths for the external serf to work.
While testing this change, I noticed that downloading the old serf can fail breaking the build but this is unrelated to this patch." means to totally correct this situation we should update "serf" in /trunk/ext-libraries, correct? On Fri, Jan 23, 2015 at 9:44 AM, <p...@apache.org> wrote: > Author: pfg > Date: Fri Jan 23 17:44:53 2015 > New Revision: 1654282 > > URL: http://svn.apache.org/r1654282 > Log: > Fix webdav build with external serf. > > Building with external serf (which is recommended) has been > broken for a while. Restore the proper include paths for > the external serf to work. > > While testing this change, I noticed that downloading the old serf > can fail breaking the build but this is unrelated to this patch. > > Authors: Don Lewis, maho@ > Obtained from: FreeBSD port > > Modified: > openoffice/trunk/main/ucb/source/ucp/webdav/SerfCallbacks.hxx > openoffice/trunk/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx > openoffice/trunk/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx > openoffice/trunk/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx > openoffice/trunk/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx > openoffice/trunk/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx > openoffice/trunk/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx > openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.hxx > > openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx > openoffice/trunk/main/ucb/source/ucp/webdav/SerfSession.cxx > openoffice/trunk/main/ucb/source/ucp/webdav/SerfTypes.hxx > openoffice/trunk/main/ucb/source/ucp/webdav/SerfUri.hxx > > Modified: openoffice/trunk/main/ucb/source/ucp/webdav/SerfCallbacks.hxx > URL: > http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfCallbacks.hxx?rev=1654282&r1=1654281&r2=1654282&view=diff > > ============================================================================== > --- openoffice/trunk/main/ucb/source/ucp/webdav/SerfCallbacks.hxx > (original) > +++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfCallbacks.hxx Fri Jan > 23 17:44:53 2015 > @@ -23,7 +23,7 @@ > #ifndef INCLUDED_CALLBACKS_HXX > #define INCLUDED_CALLBACKS_HXX > > -#include <serf/serf.h> > +#include <serf.h> > > extern "C" apr_status_t Serf_ConnectSetup( apr_socket_t *skt, > serf_bucket_t **read_bkt, > > Modified: > openoffice/trunk/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx > URL: > http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx?rev=1654282&r1=1654281&r2=1654282&view=diff > > ============================================================================== > --- openoffice/trunk/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx > (original) > +++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx > Fri Jan 23 17:44:53 2015 > @@ -24,7 +24,7 @@ > > #include "SerfCopyReqProcImpl.hxx" > > -#include <serf/serf.h> > +#include <serf.h> > > namespace http_dav_ucp > { > > Modified: > openoffice/trunk/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx > URL: > http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx?rev=1654282&r1=1654281&r2=1654282&view=diff > > ============================================================================== > --- openoffice/trunk/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx > (original) > +++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx > Fri Jan 23 17:44:53 2015 > @@ -24,7 +24,7 @@ > > #include "SerfDeleteReqProcImpl.hxx" > > -#include <serf/serf.h> > +#include <serf.h> > > namespace http_dav_ucp > { > > Modified: > openoffice/trunk/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx > URL: > http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx?rev=1654282&r1=1654281&r2=1654282&view=diff > > ============================================================================== > --- openoffice/trunk/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx > (original) > +++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx > Fri Jan 23 17:44:53 2015 > @@ -24,7 +24,7 @@ > > #include "SerfMkColReqProcImpl.hxx" > > -#include <serf/serf.h> > +#include <serf.h> > > namespace http_dav_ucp > { > > Modified: > openoffice/trunk/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx > URL: > http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx?rev=1654282&r1=1654281&r2=1654282&view=diff > > ============================================================================== > --- openoffice/trunk/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx > (original) > +++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx > Fri Jan 23 17:44:53 2015 > @@ -24,7 +24,7 @@ > > #include "SerfMoveReqProcImpl.hxx" > > -#include <serf/serf.h> > +#include <serf.h> > > namespace http_dav_ucp > { > > Modified: > openoffice/trunk/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx > URL: > http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx?rev=1654282&r1=1654281&r2=1654282&view=diff > > ============================================================================== > --- openoffice/trunk/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx > (original) > +++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx > Fri Jan 23 17:44:53 2015 > @@ -24,7 +24,7 @@ > > #include "SerfPostReqProcImpl.hxx" > > -#include <serf/serf.h> > +#include <serf.h> > > using namespace com::sun::star; > > > Modified: > openoffice/trunk/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx > URL: > http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx?rev=1654282&r1=1654281&r2=1654282&view=diff > > ============================================================================== > --- openoffice/trunk/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx > (original) > +++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx Fri > Jan 23 17:44:53 2015 > @@ -26,7 +26,7 @@ > > #include "SerfPutReqProcImpl.hxx" > > -#include <serf/serf.h> > +#include <serf.h> > > namespace http_dav_ucp > { > > Modified: > openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.hxx > URL: > http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.hxx?rev=1654282&r1=1654281&r2=1654282&view=diff > > ============================================================================== > --- openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.hxx > (original) > +++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessor.hxx > Fri Jan 23 17:44:53 2015 > @@ -26,7 +26,7 @@ > #include <apr_errno.h> > #include <apr_pools.h> > > -#include <serf/serf.h> > +#include <serf.h> > > #include "DAVTypes.hxx" > #include "DAVResource.hxx" > > Modified: > openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx > URL: > http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx?rev=1654282&r1=1654281&r2=1654282&view=diff > > ============================================================================== > --- > openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx > (original) > +++ > openoffice/trunk/main/ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx > Fri Jan 23 17:44:53 2015 > @@ -22,7 +22,7 @@ > #ifndef INCLUDED_SERFREQUESTPROCESSORIMPL_HXX > #define INCLUDED_SERFREQUESTPROCESSORIMPL_HXX > > -#include <serf/serf.h> > +#include <serf.h> > > #include <sal/types.h> > #include "DAVRequestEnvironment.hxx" > > Modified: openoffice/trunk/main/ucb/source/ucp/webdav/SerfSession.cxx > URL: > http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfSession.cxx?rev=1654282&r1=1654281&r2=1654282&view=diff > > ============================================================================== > --- openoffice/trunk/main/ucb/source/ucp/webdav/SerfSession.cxx (original) > +++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfSession.cxx Fri Jan 23 > 17:44:53 2015 > @@ -30,7 +30,7 @@ > #include "ucbhelper/simplecertificatevalidationrequest.hxx" > > #include "AprEnv.hxx" > -#include <apr/apr_strings.h> > +#include <apr_strings.h> > > #include "DAVAuthListener.hxx" > #include "SerfTypes.hxx" > > Modified: openoffice/trunk/main/ucb/source/ucp/webdav/SerfTypes.hxx > URL: > http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfTypes.hxx?rev=1654282&r1=1654281&r2=1654282&view=diff > > ============================================================================== > --- openoffice/trunk/main/ucb/source/ucp/webdav/SerfTypes.hxx (original) > +++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfTypes.hxx Fri Jan 23 > 17:44:53 2015 > @@ -24,7 +24,7 @@ > #ifndef INCLUDED_SERFTYPES_HXX > #define INCLUDED_SERFTYPES_HXX > > -#include <serf/serf.h> > +#include <serf.h> > > typedef serf_connection_t SerfConnection; > > > Modified: openoffice/trunk/main/ucb/source/ucp/webdav/SerfUri.hxx > URL: > http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/webdav/SerfUri.hxx?rev=1654282&r1=1654281&r2=1654282&view=diff > > ============================================================================== > --- openoffice/trunk/main/ucb/source/ucp/webdav/SerfUri.hxx (original) > +++ openoffice/trunk/main/ucb/source/ucp/webdav/SerfUri.hxx Fri Jan 23 > 17:44:53 2015 > @@ -23,7 +23,7 @@ > #ifndef INCLUDED_SERFURI_HXX > #define INCLUDED_SERFURI_HXX > > -#include <apr-util/apr_uri.h> > +#include <apr_uri.h> > #include <rtl/ustring.hxx> > #include "DAVException.hxx" > > > > -- ------------------------------------------------------------------------------------------------- MzK "There's a bit of magic in everything, and some loss to even things out." -- Lou Reed
