[ooo-build-commit] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply              |    4 ++--
 patches/dev300/ucb-neon-0.24.diff |   26 +++++++++++++++++---------
 2 files changed, 19 insertions(+), 11 deletions(-)

New commits:
commit adb89fe65f1ca27992c0a07c372450378d9cb3fa
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Thu Sep 9 14:56:58 2010 +0200

    fix build with neon-0.24

diff --git a/patches/dev300/apply b/patches/dev300/apply
index bed0b5d..4a982d6 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -11,7 +11,7 @@ OLDEST_SUPPORTED=ooo330-m7 ooo-build-3.2.98.0
 
 # -------- Functional sub-sets --------
 Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
-	 BuildFixes, Fixes, DefaultSettings, Features, VCL, Misc, HelpContent, \
+	 Fixes, DefaultSettings, Features, VCL, Misc, HelpContent, \
 	 Icons, Branding, CalcFixes, WriterFixes, EasterEgg, \
 	 GStreamer, CWSBackports, WPG, Cleanups, WMF, GnomeVFS, WebDAV, \
 	 Layout, VBABits, VBAObjects, CalcErrors, CJK, GCJ, Lwp, WPS, \
@@ -196,7 +196,7 @@ cws-vmiklos01.diff, vmiklos
 # add accelerator to the OK and Cancel buttons.
 ok-cancel-btn-add-accel.diff, kohei
 
-[ BuildFixes ]
+[ BuildBits ]
 # nss-3.12.0 does not support all the newly used features
 xmlsecurity-build-with-nss-3.12.0.diff, i#114417, pmladek
 
diff --git a/patches/dev300/ucb-neon-0.24.diff b/patches/dev300/ucb-neon-0.24.diff
index 8c466f3..b47efa4 100644
--- a/patches/dev300/ucb-neon-0.24.diff
+++ b/patches/dev300/ucb-neon-0.24.diff
@@ -1,11 +1,22 @@
----
- ucb/source/ucp/webdav/NeonSession.cxx |   11 +++++++----
- 1 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git ucb/source/ucp/webdav/NeonSession.cxx ucb/source/ucp/webdav/NeonSession.cxx
-index 254fae5..77d12ec 100644
 --- ucb/source/ucp/webdav/NeonSession.cxx
 +++ ucb/source/ucp/webdav/NeonSession.cxx
+@@ -38,7 +38,16 @@
+ #include <ne_auth.h>
+ #include <ne_redirect.h>
+ #include <ne_ssl.h>
++
++#if NEON_VERSION < 0x0260
++// old neon versions forgot to set this
++extern "C" {
++#endif
+ #include <ne_compress.h>
++#if NEON_VERSION < 0x0260
++}
++#endif
++
+ #include "libxml/parser.h"
+ #include "rtl/ustrbuf.hxx"
+ #include "comphelper/sequence.hxx"
 @@ -817,10 +817,13 @@ void NeonSession::Init()
          ne_redirect_register( m_pHttpSession );
  
@@ -24,6 +35,3 @@ index 254fae5..77d12ec 100644
      }
  }
  
--- 
-1.7.0.1
-