cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* openoffice

Browse Source 
- fix build after neon update

input from and ok robert@
This commit is contained in:
ajacoutot 2008-11-13 13:17:43 +00:00
parent c868c6dc18
commit a4c7a0fd29
10 changed files with 249 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editors/openoffice/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.79 2008/10/30 10:27:28 robert Exp $
# $OpenBSD: Makefile,v 1.80 2008/11/13 13:17:43 ajacoutot Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -10,7 +10,7 @@ VERSION= 2.4.2
DISTNAME= OOo_${VERSION}
WRKDIST= ${WRKDIR}/OOH680_m18
PKGNAME= openoffice-${VERSION}
PKGNAME-main= openoffice-${VERSION}
PKGNAME-main= openoffice-${VERSION}p0
PKGNAME-kde= openoffice-kde-${VERSION}
PKGNAME-java= openoffice-java-${VERSION}
CATEGORIES= editors productivity

12
editors/openoffice/patches/patch-ucb_source_ucp_webdav_LinkSequence_cxx Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-ucb_source_ucp_webdav_LinkSequence_cxx,v 1.1 2008/11/13 13:17:43 ajacoutot Exp $
--- ucb/source/ucp/webdav/LinkSequence.cxx.orig.port Wed Nov 12 16:20:31 2008
+++ ucb/source/ucp/webdav/LinkSequence.cxx Wed Nov 12 16:14:18 2008
@@ -180,7 +180,7 @@ bool LinkSequence::createFromXML( const rtl::OString &
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 );

12
editors/openoffice/patches/patch-ucb_source_ucp_webdav_LockEntrySequence_cxx Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-ucb_source_ucp_webdav_LockEntrySequence_cxx,v 1.1 2008/11/13 13:17:43 ajacoutot Exp $
--- ucb/source/ucp/webdav/LockEntrySequence.cxx.orig.port Wed Nov 12 16:20:37 2008
+++ ucb/source/ucp/webdav/LockEntrySequence.cxx Wed Nov 12 16:14:39 2008
@@ -205,7 +205,7 @@ bool LockEntrySequence::createFromXML( const rtl::OStr
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 );

12
editors/openoffice/patches/patch-ucb_source_ucp_webdav_LockSequence_cxx Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-ucb_source_ucp_webdav_LockSequence_cxx,v 1.1 2008/11/13 13:17:43 ajacoutot Exp $
--- ucb/source/ucp/webdav/LockSequence.cxx.orig.port Wed Nov 12 16:20:44 2008
+++ ucb/source/ucp/webdav/LockSequence.cxx Wed Nov 12 16:14:56 2008
@@ -338,7 +338,7 @@ bool LockSequence::createFromXML( const rtl::OString &
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 );

29
editors/openoffice/patches/patch-ucb_source_ucp_webdav_NeonHeadRequest_cxx Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-ucb_source_ucp_webdav_NeonHeadRequest_cxx,v 1.1 2008/11/13 13:17:43 ajacoutot Exp $
--- ucb/source/ucp/webdav/NeonHeadRequest.cxx.orig.port Wed Nov 12 16:20:51 2008
+++ ucb/source/ucp/webdav/NeonHeadRequest.cxx Wed Nov 12 16:15:23 2008
@@ -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( HttpSession* inSessi
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

39
editors/openoffice/patches/patch-ucb_source_ucp_webdav_NeonPropFindRequest_cxx Normal file
View File

@ -0,0 +1,39 @@
$OpenBSD: patch-ucb_source_ucp_webdav_NeonPropFindRequest_cxx,v 1.1 2008/11/13 13:17:43 ajacoutot Exp $
--- ucb/source/ucp/webdav/NeonPropFindRequest.cxx.orig.port Wed Nov 12 16:20:24 2008
+++ ucb/source/ucp/webdav/NeonPropFindRequest.cxx Wed Nov 12 16:13:56 2008
@@ -176,7 +176,7 @@ extern "C" int NPFR_propfind_iter( void* userdata,
// -------------------------------------------------------------------
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( void* userdata,
{
// @@@ 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* userdata,
// -------------------------------------------------------------------
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( void* userdata
{
// @@@ 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

57
editors/openoffice/patches/patch-ucb_source_ucp_webdav_NeonSession_cxx Normal file
View File

@ -0,0 +1,57 @@
$OpenBSD: patch-ucb_source_ucp_webdav_NeonSession_cxx,v 1.1 2008/11/13 13:17:43 ajacoutot Exp $
--- ucb/source/ucp/webdav/NeonSession.cxx.orig.port Wed Nov 12 16:20:57 2008
+++ ucb/source/ucp/webdav/NeonSession.cxx Wed Nov 12 16:16:03 2008
@@ -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_ResponseBlockReader(void *
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_ResponseBlockReader(void *
// 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_ResponseBlockWriter( void
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))

62
editors/openoffice/patches/patch-ucb_source_ucp_webdav_NeonUri_cxx Normal file
View File

@ -0,0 +1,62 @@
$OpenBSD: patch-ucb_source_ucp_webdav_NeonUri_cxx,v 1.1 2008/11/13 13:17:43 ajacoutot Exp $
--- ucb/source/ucp/webdav/NeonUri.cxx.orig.port Wed Nov 12 16:21:04 2008
+++ ucb/source/ucp/webdav/NeonUri.cxx Wed Nov 12 16:16:54 2008
@@ -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 & rUri, const n
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 & rUri, const n
pUri->path ? pUri->path : pUriDefs->path,
RTL_TEXTENCODING_UTF8 );
-#if NEON_VERSION >= 0260
+#if NEON_VERSION >= 0x0260
if ( pUri->query )
{
mPath += rtl::OUString::createFromAscii( "?" );

12
editors/openoffice/patches/patch-ucb_source_ucp_webdav_UCBDeadPropertyValue_cxx Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-ucb_source_ucp_webdav_UCBDeadPropertyValue_cxx,v 1.1 2008/11/13 13:17:43 ajacoutot Exp $
--- ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx.orig.port Wed Nov 12 16:21:10 2008
+++ ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx Wed Nov 12 16:17:13 2008
@@ -393,7 +393,7 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::O
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 );

12
editors/openoffice/patches/patch-ucb_source_ucp_webdav_makefile_mk Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-ucb_source_ucp_webdav_makefile_mk,v 1.1 2008/11/13 13:17:43 ajacoutot Exp $
--- ucb/source/ucp/webdav/makefile.mk.orig.port Wed Nov 12 20:02:16 2008
+++ ucb/source/ucp/webdav/makefile.mk Wed Nov 12 20:02:35 2008
@@ -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)