rpms/openoffice.org/devel openoffice.org-2.0.2.ooo61178.ucb.neon25.patch, NONE, 1.1 openoffice.org.spec, 1.610, 1.611
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jan 27 17:14:06 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16459
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-2.0.2.ooo61178.ucb.neon25.patch
Log Message:
missing defattr
openoffice.org-2.0.2.ooo61178.ucb.neon25.patch:
source/ucp/webdav/LinkSequence.cxx | 0
source/ucp/webdav/LockEntrySequence.cxx | 0
source/ucp/webdav/LockSequence.cxx | 0
source/ucp/webdav/NeonHeadRequest.cxx | 0
source/ucp/webdav/NeonSession.cxx | 0
source/ucp/webdav/NeonSession.hxx | 0
source/ucp/webdav/UCBDeadPropertyValue.cxx | 0
source/ucp/webdav/makefile.mk | 0
ucb/source/ucp/webdav/LinkSequence.cxx | 4 +
ucb/source/ucp/webdav/LockEntrySequence.cxx | 4 +
ucb/source/ucp/webdav/LockSequence.cxx | 4 +
ucb/source/ucp/webdav/NeonHeadRequest.cxx | 59 +++++++++++++++++++++++++
ucb/source/ucp/webdav/NeonSession.cxx | 52 ++++++++++++++++++----
ucb/source/ucp/webdav/NeonSession.hxx | 4 +
ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx | 4 +
ucb/source/ucp/webdav/makefile.mk | 4 +
16 files changed, 127 insertions(+), 8 deletions(-)
--- NEW FILE openoffice.org-2.0.2.ooo61178.ucb.neon25.patch ---
Index: source/ucp/webdav/LinkSequence.cxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/LinkSequence.cxx,v
retrieving revision 1.7
diff -u -r1.7 LinkSequence.cxx
--- openoffice.org.orig/ucb/source/ucp/webdav/LinkSequence.cxx 20 Jan 2006 14:19:24 -0000 1.7
+++ openoffice.org/ucb/source/ucp/webdav/LinkSequence.cxx 26 Jan 2006 09:51:37 -0000
@@ -181,7 +181,11 @@
rInData.getStr() + nStart,
nEnd - nStart + TOKEN_LENGTH );
+#ifdef NEONTWOFIVE
+ success = !ne_xml_failed( parser );
+#else
success = !!ne_xml_valid( parser );
+#endif
ne_xml_destroy( parser );
Index: source/ucp/webdav/LockEntrySequence.cxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/LockEntrySequence.cxx,v
retrieving revision 1.7
diff -u -r1.7 LockEntrySequence.cxx
--- openoffice.org.orig/ucb/source/ucp/webdav/LockEntrySequence.cxx 20 Jan 2006 14:19:37 -0000 1.7
+++ openoffice.org/ucb/source/ucp/webdav/LockEntrySequence.cxx 26 Jan 2006 09:51:38 -0000
@@ -206,7 +206,11 @@
rInData.getStr() + nStart,
nEnd - nStart + TOKEN_LENGTH );
+#ifdef NEONTWOFIVE
+ success = !ne_xml_failed( parser );
+#else
success = !!ne_xml_valid( parser );
+#endif
ne_xml_destroy( parser );
Index: source/ucp/webdav/LockSequence.cxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/LockSequence.cxx,v
retrieving revision 1.8
diff -u -r1.8 LockSequence.cxx
--- openoffice.org.orig/ucb/source/ucp/webdav/LockSequence.cxx 20 Jan 2006 14:19:52 -0000 1.8
+++ openoffice.org/ucb/source/ucp/webdav/LockSequence.cxx 26 Jan 2006 09:51:38 -0000
@@ -339,7 +339,11 @@
rInData.getStr() + nStart,
nEnd - nStart + TOKEN_LENGTH );
+#ifdef NEONTWOFIVE
+ success = !ne_xml_failed( parser );
+#else
success = !!ne_xml_valid( parser );
+#endif
ne_xml_destroy( parser );
Index: source/ucp/webdav/NeonHeadRequest.cxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/NeonHeadRequest.cxx,v
retrieving revision 1.3
diff -u -r1.3 NeonHeadRequest.cxx
--- openoffice.org.orig/ucb/source/ucp/webdav/NeonHeadRequest.cxx 9 Sep 2005 16:11:23 -0000 1.3
+++ openoffice.org/ucb/source/ucp/webdav/NeonHeadRequest.cxx 26 Jan 2006 09:51:38 -0000
@@ -51,6 +51,58 @@
using namespace webdav_ucp;
using namespace com::sun::star;
+#ifdef NEONTWOFIVE
+static void process_headers(ne_request *req,
+ DAVResource &rResource,
+ const std::vector< ::rtl::OUString > &rHeaderNames)
+{
+ void *cursor = NULL;
+ const char *name, *value;
+
+ while ((cursor = ne_response_header_iterate(req, cursor,
+ &name, &value)) != NULL) {
+ rtl::OUString aHeaderName( rtl::OUString::createFromAscii( name ) );
+ rtl::OUString aHeaderValue( rtl::OUString::createFromAscii( value ) );
+
+ // Note: Empty vector means that all headers are requested.
+ bool bIncludeIt = ( rHeaderNames.size() == 0 );
+
+ if ( !bIncludeIt )
+ {
+ // Check whether this header was requested.
+ std::vector< ::rtl::OUString >::const_iterator it(
+ rHeaderNames.begin() );
+ const std::vector< ::rtl::OUString >::const_iterator end(
+ rHeaderNames.end() );
+
+ while ( it != end )
+ {
+ if ( (*it) == aHeaderName )
+ break;
+
+ ++it;
+ }
+
+ if ( it != end )
+ bIncludeIt = true;
+ }
+
+ if ( bIncludeIt )
+ {
+ // Create & set the PropertyValue
+ beans::PropertyValue thePropertyValue;
+ thePropertyValue.Handle = -1;
+ thePropertyValue.Name = aHeaderName;
+ thePropertyValue.State = beans::PropertyState_DIRECT_VALUE;
+
+ thePropertyValue.Value <<= aHeaderValue;
+
+ // Add the newly created PropertyValue
+ rResource.properties.push_back( thePropertyValue );
+ }
+ }
+}
+#else
struct NeonHeadRequestContext
{
DAVResource * pResource;
@@ -113,6 +165,7 @@
}
}
}
+#endif
// -------------------------------------------------------------------
@@ -137,11 +190,17 @@
inPath,
RTL_TEXTENCODING_UTF8 ) );
+#ifndef NEONTWOFIVE
NeonHeadRequestContext aCtx( &ioResource, &inHeaderNames );
ne_add_response_header_catcher( req, NHR_ResponseHeaderCatcher, &aCtx );
+#endif
nError = ne_request_dispatch( req );
+#ifdef NEONTWOFIVE
+ process_headers(req, ioResource, inHeaderNames);
+#endif
+
if ( nError == NE_OK && ne_get_status( req )->klass != 2 )
nError = NE_ERROR;
Index: source/ucp/webdav/NeonSession.cxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/NeonSession.cxx,v
retrieving revision 1.37
diff -u -r1.37 NeonSession.cxx
--- openoffice.org.orig/ucb/source/ucp/webdav/NeonSession.cxx 20 Jan 2006 14:20:06 -0000 1.37
+++ openoffice.org/ucb/source/ucp/webdav/NeonSession.cxx 26 Jan 2006 09:51:41 -0000
@@ -106,6 +106,10 @@
using namespace com::sun::star;
using namespace webdav_ucp;
+#ifndef EOL
+# define EOL "\r\n"
+#endif
+
// -------------------------------------------------------------------
// RequestData
// -------------------------------------------------------------------
@@ -233,9 +237,12 @@
// ResponseBlockReader
// A simple Neon response_block_reader for use with an XInputStream
// -------------------------------------------------------------------
-extern "C" void NeonSession_ResponseBlockReader( void * inUserData,
- const char * inBuf,
- size_t inLen )
+#ifdef NEONTWOFIVE
+extern "C" int NeonSession_ResponseBlockReader
+#else
+extern "C" void NeonSession_ResponseBlockReader
+#endif
+ (void * inUserData, const char * inBuf, size_t inLen )
{
// neon calls this function with (inLen == 0)...
if ( inLen > 0 )
@@ -253,15 +260,21 @@
xInputStream->AddToStream( inBuf, inLen );
}
}
+#ifdef NEONTWOFIVE
+ return 0;
+#endif
}
// -------------------------------------------------------------------
// ResponseBlockWriter
// A simple Neon response_block_reader for use with an XOutputStream
// -------------------------------------------------------------------
-extern "C" void NeonSession_ResponseBlockWriter( void * inUserData,
- const char * inBuf,
- size_t inLen )
+#ifdef NEONTWOFIVE
+extern "C" int NeonSession_ResponseBlockWriter
+#else
+extern "C" void NeonSession_ResponseBlockWriter
+#endif
+ ( void * inUserData, const char * inBuf, size_t inLen )
{
// neon calls this function with (inLen == 0)...
if ( inLen > 0 )
@@ -276,6 +289,9 @@
xOutputStream->writeBytes( aSeq );
}
}
+#ifdef NEONTWOFIVE
+ return 0;
+#endif
}
// -------------------------------------------------------------------
@@ -1538,6 +1554,23 @@
}
*/
+#ifdef NEONTWOFIVE
+static void run_header_handler(ne_request *req, ne_header_handler handler, void *userdata)
+{
+ void *cursor = NULL;
+ const char *name, *value;
+
+ while ((cursor = ne_response_header_iterate(req, cursor, &name, &value)) != NULL)
+ {
+ char buffer[8192];
+
+ ne_snprintf(buffer, sizeof buffer, "%s: %s", name, value);
+
+ handler(userdata, buffer);
+ }
+}
+#endif
+
// -------------------------------------------------------------------
// static
int NeonSession::GET( ne_session * sess,
@@ -1549,12 +1582,15 @@
//struct get_context ctx;
ne_request * req = ne_request_create( sess, "GET", uri );
int ret;
-
+#ifndef NEONTWOFIVE
ne_add_response_header_catcher( req, handler, userdata );
-
+#endif
ne_add_response_body_reader( req, ne_accept_2xx, reader, userdata );
ret = ne_request_dispatch( req );
+#ifdef NEONTWOFIVE
+ run_header_handler(req, handler, userdata);
+#endif
if ( ret == NE_OK && ne_get_status( req )->klass != 2 )
ret = NE_ERROR;
Index: source/ucp/webdav/NeonSession.hxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/NeonSession.hxx,v
retrieving revision 1.23
diff -u -r1.23 NeonSession.hxx
--- openoffice.org.orig/ucb/source/ucp/webdav/NeonSession.hxx 18 Oct 2005 08:47:16 -0000 1.23
+++ openoffice.org/ucb/source/ucp/webdav/NeonSession.hxx 26 Jan 2006 09:51:41 -0000
@@ -49,6 +49,10 @@
#include "NeonTypes.hxx"
#endif
+#ifdef NEONTWOFIVE
+typedef void (*ne_header_handler)(void *userdata, const char *value);
+#endif
+
namespace ucbhelper { class ProxyDecider; }
namespace webdav_ucp
Index: source/ucp/webdav/UCBDeadPropertyValue.cxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx,v
retrieving revision 1.8
diff -u -r1.8 UCBDeadPropertyValue.cxx
--- openoffice.org.orig/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx 20 Jan 2006 14:20:45 -0000 1.8
+++ openoffice.org/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx 26 Jan 2006 09:51:42 -0000
@@ -394,7 +394,11 @@
ne_xml_parse( parser, rInData.getStr(), rInData.getLength() );
+#ifdef NEONTWOFIVE
+ success = !ne_xml_failed( parser );
+#else
success = !!ne_xml_valid( parser );
+#endif
ne_xml_destroy( parser );
Index: source/ucp/webdav/makefile.mk
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/makefile.mk,v
retrieving revision 1.26
diff -u -r1.26 makefile.mk
--- openoffice.org.orig/ucb/source/ucp/webdav/makefile.mk 10 Nov 2005 16:43:55 -0000 1.26
+++ openoffice.org/ucb/source/ucp/webdav/makefile.mk 26 Jan 2006 09:51:42 -0000
@@ -59,6 +59,10 @@
.IF "$(SYSTEM_NEON)" == "YES"
CFLAGS+= $(NEON_CFLAGS)
+TWOFIVE:=$(shell pkg-config --atleast-version=0.25.0 neon && echo YES || echo NO)
+.IF "$(TWOFIVE)" == "YES"
+CFLAGS+=-DNEONTWOFIVE
+.ENDIF
.ELSE
NEONINCDIR=external$/neon
CFLAGS+= -I$(SOLARINCDIR)$/$(NEONINCDIR)
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.610
retrieving revision 1.611
diff -u -r1.610 -r1.611
--- openoffice.org.spec 26 Jan 2006 08:49:35 -0000 1.610
+++ openoffice.org.spec 27 Jan 2006 17:14:03 -0000 1.611
@@ -1,6 +1,6 @@
%define oootag OOA680
%define ooomilestone 1
-%define rh_rpm_release 8
+%define rh_rpm_release 9
%define build_fc5 1
%define build_fc4 0
@@ -215,6 +215,7 @@
Patch50: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
Patch51: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch
Patch52: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
+Patch53: openoffice.org-2.0.2.ooo61178.ucb.neon25.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -895,6 +896,7 @@
%patch50 -p1 -b .ooo59675.sysui.rtfmimetype.patch
%patch51 -p1 -b .ooo59997.sw.defaultbullets.patch
%patch52 -p1 -b .ooo19976.framework.nofocussteal.patch
+%patch53 -p1 -b .ooo61178.ucb.neon25.patch
%if %{includingexternals}
#start ludicrous workaround
@@ -2943,6 +2945,7 @@
%if %{seperatebase}
%files base
+%defattr(-,root,root)
%{instdir}/help/en/sdatabase.*
%{instdir}/program/sbase
%dir %{instdir}/share/registry
@@ -3374,8 +3377,14 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Fri Jan 27 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-9
+- add openoffice.org-2.0.2.ooo61178.ucb.neon25.patch for future neon 0.25.X
+- missing %defattr(-,root,root)
+
* Thu Jan 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-8
- rh#178971# defer exec mem until bridge code
+- add openoffice.org-2.0.2.ooo61178.ucb.neon25.patch for future neon 0.25.X
+- missing %defattr(-,root,root)
* Tue Jan 17 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-7
- rh#177933# add Serbian sr_CS language pack
More information about the fedora-cvs-commits
mailing list