ooo-build r11619 - in trunk: . patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Feb 18 16:26:30 2008
New Revision: 11619
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11619&view=rev

Log:
2008-02-18  Rene Engelhard  <rene debian org>

        * patches/src680/apply,
          patches/src680/cws-cmcfixes42-ucb.diff: revert last two changes


Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/cws-cmcfixes42-ucb.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Mon Feb 18 16:26:30 2008
@@ -314,6 +314,9 @@
 [ CWSBackports ]
 cws-ia64port01.diff, i#84999
 
+# fix build with neon 0.28
+cws-cmcfixes42-ucb.diff, i#86123
+
 [ WPG ]
 # libwpg-based import filter for WordPerfect Graphics
 libwpg.diff
@@ -578,10 +581,6 @@
 # It is in this section because it needs part of the gvfs-related patches
 webdav-locking-m3.diff, n#346711, i#29152, jholesov
 
-[ CWSBackports ]
-# fix build with neon 0.28
-cws-cmcfixes42-ucb.diff, i#86123
-
 [ QuickStarter < ooh680-m2 ]
 # External splash screen implementation / 2nd time accelerator
 unxsplash-rework-m1.diff, i#60696, michael/jholesov

Modified: trunk/patches/src680/cws-cmcfixes42-ucb.diff
==============================================================================
--- trunk/patches/src680/cws-cmcfixes42-ucb.diff	(original)
+++ trunk/patches/src680/cws-cmcfixes42-ucb.diff	Mon Feb 18 16:26:30 2008
@@ -135,15 +135,15 @@
 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
-@@ -261,7 +261,7 @@ struct NeonRequestContext
+@@ -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
+ extern "C" int NeonSession_ResponseBlockReader(void * inUserData, 
  #else
- extern "C" void
+ extern "C" void NeonSession_ResponseBlockReader(void * inUserData, 
 @@ -272,7 +272,7 @@ extern "C" void NeonSession_ResponseBloc
          if ( xInputStream.is() )
              xInputStream->AddToStream( inBuf, inLen );
@@ -159,9 +159,9 @@
  
 -#if NEON_VERSION >= 0250
 +#if NEON_VERSION >= 0x0250
- extern "C" int
+ extern "C" int NeonSession_ResponseBlockWriter( void * inUserData, 
  #else
- extern "C" void
+ extern "C" void NeonSession_ResponseBlockWriter( void * inUserData, 
 @@ -304,7 +304,7 @@ extern "C" void NeonSession_ResponseBloc
              xOutputStream->writeBytes( aSeq );
          }