[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply              |    3 ---
 patches/dev300/ucb-neon-0.24.diff |   37 -------------------------------------
 2 files changed, 40 deletions(-)

New commits:
commit a4f980d3f91e02cc1ed6279a5684c2811682cc5a
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 17:36:25 2011 +0200

    pushed ucb-neon-0.24.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index d549091..6432d2a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -420,9 +420,6 @@ jvmfwk-disable-gcj.diff
 libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
 
 [ BuildBits ]
-# fix build with neon-0.24
-ucb-neon-0.24.diff, pmladek
-
 # find gsicheck in the solver
 # FIXME dev300-m77 transex3-localize-gsicheck-path.diff, i#109378, pmladek # RENAMED transex3 -> l10ntools
 
diff --git a/patches/dev300/ucb-neon-0.24.diff b/patches/dev300/ucb-neon-0.24.diff
deleted file mode 100644
index b47efa4..0000000
--- a/patches/dev300/ucb-neon-0.24.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- 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 );
- 
-         // authentication callbacks.
--        ne_add_server_auth(
--            m_pHttpSession, NE_AUTH_ALL, NeonSession_NeonAuth, this );
--        ne_add_proxy_auth(
--            m_pHttpSession, NE_AUTH_ALL, NeonSession_NeonAuth, this );
-+#if NEON_VERSION >= 0x0260
-+        ne_add_server_auth( m_pHttpSession, NE_AUTH_ALL, NeonSession_NeonAuth, this ); 
-+        ne_add_proxy_auth ( m_pHttpSession, NE_AUTH_ALL, NeonSession_NeonAuth, this );
-+#else
-+        ne_set_server_auth( m_pHttpSession, NeonSession_NeonAuth, this );
-+        ne_set_proxy_auth ( m_pHttpSession, NeonSession_NeonAuth, this );
-+#endif
-     }
- }
-