ooo-build r11610 - in trunk: . patches/src680
- From: rengelhard svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r11610 - in trunk: . patches/src680
- Date: Mon, 18 Feb 2008 12:27:37 +0000 (GMT)
Author: rengelhard
Date: Mon Feb 18 12:27:37 2008
New Revision: 11610
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11610&view=rev
Log:
2008-02-18 Rene Engelhard <rene debian org>
* patches/src680/apply,
patches/src680/cws-cmcfixes42-ucb.diff: backport fix for
building with neon 0.28
Added:
trunk/patches/src680/cws-cmcfixes42-ucb.diff
Modified:
trunk/ChangeLog
Added: trunk/patches/src680/cws-cmcfixes42-ucb.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/cws-cmcfixes42-ucb.diff Mon Feb 18 12:27:37 2008
@@ -0,0 +1,292 @@
+Index: ucb/source/ucp/webdav/LinkSequence.cxx
+===================================================================
+RCS file: /cvs/ucb/ucb/source/ucp/webdav/LinkSequence.cxx,v
+retrieving revision 1.14
+retrieving revision 1.14.20.1
+diff -u -u -p -b -w -B -r1.14 -r1.14.20.1
+--- ucb/source/ucp/webdav/LinkSequence.cxx 12 Dec 2007 15:32:27 -0000 1.14
++++ ucb/source/ucp/webdav/LinkSequence.cxx 15 Feb 2008 10:51:05 -0000 1.14.20.1
+@@ -180,7 +180,7 @@ bool LinkSequence::createFromXML( const
+ rInData.getStr() + nStart,
+ nEnd - nStart + TOKEN_LENGTH );
+
+-#if NEON_VERSION >= 0250
++#if NEON_VERSION >= 0x0250
+ success = !ne_xml_failed( parser );
+ #else
+ success = !!ne_xml_valid( parser );
+Index: ucb/source/ucp/webdav/LockEntrySequence.cxx
+===================================================================
+RCS file: /cvs/ucb/ucb/source/ucp/webdav/LockEntrySequence.cxx,v
+retrieving revision 1.14
+retrieving revision 1.14.20.1
+diff -u -u -p -b -w -B -r1.14 -r1.14.20.1
+--- ucb/source/ucp/webdav/LockEntrySequence.cxx 12 Dec 2007 15:32:46 -0000 1.14
++++ ucb/source/ucp/webdav/LockEntrySequence.cxx 15 Feb 2008 10:51:05 -0000 1.14.20.1
+@@ -205,7 +205,7 @@ bool LockEntrySequence::createFromXML( c
+ rInData.getStr() + nStart,
+ nEnd - nStart + TOKEN_LENGTH );
+
+-#if NEON_VERSION >= 0250
++#if NEON_VERSION >= 0x0250
+ success = !ne_xml_failed( parser );
+ #else
+ success = !!ne_xml_valid( parser );
+Index: ucb/source/ucp/webdav/LockSequence.cxx
+===================================================================
+RCS file: /cvs/ucb/ucb/source/ucp/webdav/LockSequence.cxx,v
+retrieving revision 1.15
+retrieving revision 1.15.20.1
+diff -u -u -p -b -w -B -r1.15 -r1.15.20.1
+--- ucb/source/ucp/webdav/LockSequence.cxx 12 Dec 2007 15:33:03 -0000 1.15
++++ ucb/source/ucp/webdav/LockSequence.cxx 15 Feb 2008 10:51:05 -0000 1.15.20.1
+@@ -338,7 +338,7 @@ bool LockSequence::createFromXML( const
+ rInData.getStr() + nStart,
+ nEnd - nStart + TOKEN_LENGTH );
+
+-#if NEON_VERSION >= 0250
++#if NEON_VERSION >= 0x0250
+ success = !ne_xml_failed( parser );
+ #else
+ success = !!ne_xml_valid( parser );
+Index: ucb/source/ucp/webdav/NeonHeadRequest.cxx
+===================================================================
+RCS file: /cvs/ucb/ucb/source/ucp/webdav/NeonHeadRequest.cxx,v
+retrieving revision 1.9
+retrieving revision 1.9.20.1
+diff -u -u -p -b -w -B -r1.9 -r1.9.20.1
+--- ucb/source/ucp/webdav/NeonHeadRequest.cxx 12 Dec 2007 15:33:24 -0000 1.9
++++ ucb/source/ucp/webdav/NeonHeadRequest.cxx 15 Feb 2008 10:51:05 -0000 1.9.20.1
+@@ -56,7 +56,7 @@ using namespace com::sun::star;
+
+ namespace {
+
+-#if NEON_VERSION >= 0250
++#if NEON_VERSION >= 0x0250
+ void process_headers(ne_request *req,
+ DAVResource &rResource,
+ const std::vector< ::rtl::OUString > &rHeaderNames)
+@@ -193,14 +193,14 @@ NeonHeadRequest::NeonHeadRequest( HttpSe
+ inPath,
+ RTL_TEXTENCODING_UTF8 ) );
+
+-#if NEON_VERSION < 0250
++#if NEON_VERSION < 0x0250
+ NeonHeadRequestContext aCtx( &ioResource, &inHeaderNames );
+ ne_add_response_header_catcher( req, NHR_ResponseHeaderCatcher, &aCtx );
+ #endif
+
+ nError = ne_request_dispatch( req );
+
+-#if NEON_VERSION >= 0250
++#if NEON_VERSION >= 0x0250
+ process_headers(req, ioResource, inHeaderNames);
+ #endif
+
+Index: ucb/source/ucp/webdav/NeonPropFindRequest.cxx
+===================================================================
+RCS file: /cvs/ucb/ucb/source/ucp/webdav/NeonPropFindRequest.cxx,v
+retrieving revision 1.22
+retrieving revision 1.22.12.1
+diff -u -u -p -b -w -B -r1.22 -r1.22.12.1
+--- ucb/source/ucp/webdav/NeonPropFindRequest.cxx 7 Jan 2008 12:58:15 -0000 1.22
++++ ucb/source/ucp/webdav/NeonPropFindRequest.cxx 15 Feb 2008 10:51:05 -0000 1.22.12.1
+@@ -176,7 +176,7 @@ extern "C" int NPFR_propfind_iter( void*
+
+ // -------------------------------------------------------------------
+ extern "C" void NPFR_propfind_results( void* userdata,
+-#if NEON_VERSION >= 0260
++#if NEON_VERSION >= 0x0260
+ const ne_uri* uri,
+ #else
+ const char* href,
+@@ -185,7 +185,7 @@ extern "C" void NPFR_propfind_results( v
+ {
+ // @@@ href is not the uri! DAVResource ctor wants uri!
+
+-#if NEON_VERSION >= 0260
++#if NEON_VERSION >= 0x0260
+ DAVResource theResource(
+ OStringToOUString( uri->path, RTL_TEXTENCODING_UTF8 ) );
+ #else
+@@ -218,7 +218,7 @@ extern "C" int NPFR_propnames_iter( void
+
+ // -------------------------------------------------------------------
+ extern "C" void NPFR_propnames_results( void* userdata,
+-#if NEON_VERSION >= 0260
++#if NEON_VERSION >= 0x0260
+ const ne_uri* uri,
+ #else
+ const char* href,
+@@ -227,7 +227,7 @@ extern "C" void NPFR_propnames_results(
+ {
+ // @@@ href is not the uri! DAVResourceInfo ctor wants uri!
+ // Create entry for the resource.
+-#if NEON_VERSION >= 0260
++#if NEON_VERSION >= 0x0260
+ DAVResourceInfo theResource(
+ OStringToOUString( uri->path, RTL_TEXTENCODING_UTF8 ) );
+ #else
+Index: ucb/source/ucp/webdav/NeonSession.cxx
+===================================================================
+RCS file: /cvs/ucb/ucb/source/ucp/webdav/NeonSession.cxx,v
+retrieving revision 1.52
+retrieving revision 1.52.20.1
+diff -u -u -p -b -w -B -r1.52 -r1.52.20.1
+--- ucb/source/ucp/webdav/NeonSession.cxx 12 Dec 2007 15:34:02 -0000 1.52
++++ ucb/source/ucp/webdav/NeonSession.cxx 15 Feb 2008 10:51:05 -0000 1.52.20.1
+@@ -252,7 +252,7 @@ struct NeonRequestContext
+ // A simple Neon response_block_reader for use with an XInputStream
+ // -------------------------------------------------------------------
+
+-#if NEON_VERSION >= 0250
++#if NEON_VERSION >= 0x0250
+ extern "C" int NeonSession_ResponseBlockReader(void * inUserData,
+ #else
+ extern "C" void NeonSession_ResponseBlockReader(void * inUserData,
+@@ -272,7 +272,7 @@ extern "C" void NeonSession_ResponseBloc
+ if ( xInputStream.is() )
+ xInputStream->AddToStream( inBuf, inLen );
+ }
+-#if NEON_VERSION >= 0250
++#if NEON_VERSION >= 0x0250
+ return 0;
+ #endif
+ }
+@@ -282,7 +282,7 @@ extern "C" void NeonSession_ResponseBloc
+ // A simple Neon response_block_reader for use with an XOutputStream
+ // -------------------------------------------------------------------
+
+-#if NEON_VERSION >= 0250
++#if NEON_VERSION >= 0x0250
+ extern "C" int NeonSession_ResponseBlockWriter( void * inUserData,
+ #else
+ extern "C" void NeonSession_ResponseBlockWriter( void * inUserData,
+@@ -304,7 +304,7 @@ extern "C" void NeonSession_ResponseBloc
+ xOutputStream->writeBytes( aSeq );
+ }
+ }
+-#if NEON_VERSION >= 0250
++#if NEON_VERSION >= 0x0250
+ return 0;
+ #endif
+ }
+@@ -1667,7 +1667,7 @@ int NeonSession::GET( ne_session * sess,
+ void *cursor = NULL;
+ const char *name, *value;
+
+-#if NEON_VERSION < 0250
++#if NEON_VERSION < 0x0250
+ if ( getheaders )
+ ne_add_response_header_catcher( req, runResponseHeaderHandler, userdata );
+ #endif
+@@ -1675,7 +1675,7 @@ int NeonSession::GET( ne_session * sess,
+
+ ret = ne_request_dispatch( req );
+
+-#if NEON_VERSION >= 0250
++#if NEON_VERSION >= 0x0250
+ if ( getheaders )
+ {
+ while ((cursor = ne_response_header_iterate(req, cursor, &name, &value))
+Index: ucb/source/ucp/webdav/NeonUri.cxx
+===================================================================
+RCS file: /cvs/ucb/ucb/source/ucp/webdav/NeonUri.cxx,v
+retrieving revision 1.22
+retrieving revision 1.22.12.1
+diff -u -u -p -b -w -B -r1.22 -r1.22.12.1
+--- ucb/source/ucp/webdav/NeonUri.cxx 4 Jan 2008 14:32:03 -0000 1.22
++++ ucb/source/ucp/webdav/NeonUri.cxx 15 Feb 2008 10:51:05 -0000 1.22.12.1
+@@ -73,34 +73,34 @@ using namespace webdav_ucp;
+ namespace {
+
+ const ne_uri g_sUriDefaultsHTTP = { "http",
+-#if NEON_VERSION >= 0260
++#if NEON_VERSION >= 0x0260
+ NULL,
+ #endif
+ NULL,
+ DEFAULT_HTTP_PORT,
+-#if NEON_VERSION >= 0260
++#if NEON_VERSION >= 0x0260
+ NULL,
+ #endif
+ NULL,
+ NULL };
+ const ne_uri g_sUriDefaultsHTTPS = { "https",
+-#if NEON_VERSION >= 0260
++#if NEON_VERSION >= 0x0260
+ NULL,
+ #endif
+ NULL,
+ DEFAULT_HTTPS_PORT,
+-#if NEON_VERSION >= 0260
++#if NEON_VERSION >= 0x0260
+ NULL,
+ #endif
+ NULL,
+ NULL };
+ const ne_uri g_sUriDefaultsFTP = { "ftp",
+-#if NEON_VERSION >= 0260
++#if NEON_VERSION >= 0x0260
+ NULL,
+ #endif
+ NULL,
+ DEFAULT_FTP_PORT,
+-#if NEON_VERSION >= 0260
++#if NEON_VERSION >= 0x0260
+ NULL,
+ #endif
+ NULL,
+@@ -188,7 +188,7 @@ void NeonUri::init( const rtl::OString &
+ pUri->scheme ? pUri->scheme : pUriDefs->scheme,
+ RTL_TEXTENCODING_UTF8 );
+ mUserInfo = rtl::OStringToOUString(
+-#if NEON_VERSION >= 0260
++#if NEON_VERSION >= 0x0260
+ pUri->userinfo ? pUri->userinfo : pUriDefs->userinfo,
+ #else
+ pUri->authinfo ? pUri->authinfo : pUriDefs->authinfo,
+@@ -202,7 +202,7 @@ void NeonUri::init( const rtl::OString &
+ pUri->path ? pUri->path : pUriDefs->path,
+ RTL_TEXTENCODING_UTF8 );
+
+-#if NEON_VERSION >= 0260
++#if NEON_VERSION >= 0x0260
+ if ( pUri->query )
+ {
+ mPath += rtl::OUString::createFromAscii( "?" );
+Index: ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
+===================================================================
+RCS file: /cvs/ucb/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx,v
+retrieving revision 1.17
+retrieving revision 1.17.20.1
+diff -u -u -p -b -w -B -r1.17 -r1.17.20.1
+--- ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx 12 Dec 2007 15:34:39 -0000 1.17
++++ ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx 15 Feb 2008 10:51:05 -0000 1.17.20.1
+@@ -393,7 +393,7 @@ bool UCBDeadPropertyValue::createFromXML
+
+ ne_xml_parse( parser, rInData.getStr(), rInData.getLength() );
+
+-#if NEON_VERSION >= 0250
++#if NEON_VERSION >= 0x0250
+ success = !ne_xml_failed( parser );
+ #else
+ success = !!ne_xml_valid( parser );
+Index: ucb/source/ucp/webdav/makefile.mk
+===================================================================
+RCS file: /cvs/ucb/ucb/source/ucp/webdav/makefile.mk,v
+retrieving revision 1.41
+retrieving revision 1.41.26.1
+diff -u -u -p -b -w -B -r1.41 -r1.41.26.1
+--- ucb/source/ucp/webdav/makefile.mk 26 Nov 2007 12:43:52 -0000 1.41
++++ ucb/source/ucp/webdav/makefile.mk 15 Feb 2008 10:51:05 -0000 1.41.26.1
+@@ -68,7 +68,7 @@ NEONINCDIR=external$/neon
+ .INCLUDE: $(SOLARINCDIR)$/$(NEONINCDIR)$/version.mk
+ .ENDIF
+
+-CFLAGS+= -DNEON_VERSION=$(NEON_VERSION)
++CFLAGS+= -DNEON_VERSION=0x$(NEON_VERSION)
+
+ .IF "$(SYSTEM_NEON)" == "YES"
+ CFLAGS+= $(NEON_CFLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
