[ooo-build-commit] 2 commits - patches/dev300

[Petr Mladek]

 patches/dev300/apply                        |   13 +++++++++++--
 patches/dev300/build-enable-boost-1.36.diff |   11 +++++++++++
 patches/dev300/ucb-neon-0.24-m58.diff       |   19 +++++++++++++++++++
 patches/dev300/ucb-neon-0.24.diff           |   19 ++++++++-----------
 4 files changed, 49 insertions(+), 13 deletions(-)

New commits:
commit 916466d43513c6bbc8bcd9f4456e1f632c821bb7
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Oct 9 21:08:42 2009 +0200

    Enable build with boost-1.36 (i#105772)
    
    * patches/dev300/build-enable-boost-1.36.diff:
    * patches/dev300/apply: it builds fine with boost-1.36 here (i#105772)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a16cb6b..d02e174 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1120,6 +1120,11 @@ ucb-neon-0.24.diff, pmladek
 # fix build with neon-0.24
 ucb-neon-0.24-m58.diff, pmladek
 
+[ BuildBits >= dev300-m60 ]
+# it builds fine with boost-1,36 here
+build-enable-boost-1.36.diff, i#105772, pmladek
+
+
 [ BuildBits ]
 # don't break dmake with environment variables containing space in the name
 # [which is a broken setup, but apparently most apps don't break with that ;-)] 
diff --git a/patches/dev300/build-enable-boost-1.36.diff b/patches/dev300/build-enable-boost-1.36.diff
new file mode 100644
index 0000000..de0e39c
--- /dev/null
+++ b/patches/dev300/build-enable-boost-1.36.diff
@@ -0,0 +1,11 @@
+--- configure.in.old	2009-10-09 15:58:58.000000000 +0200
++++ configure.in	2009-10-09 20:54:09.000000000 +0200
+@@ -4326,7 +4326,7 @@ if test -n "$with_system_boost" -o -n "$
+    AC_CHECK_HEADER(boost/shared_ptr.hpp, [],
+        [AC_MSG_ERROR(boost/shared_ptr.hpp not found. install boost)], [])
+    AC_CHECK_HEADER(boost/spirit/include/classic_core.hpp, [],
+-       [AC_MSG_ERROR(boost/spirit/include/classic_core.hpp not found. install boost >= 1.38)], [])
++       [AC_MSG_ERROR(boost/spirit/include/classic_core.hpp not found. install boost >= 1.36)], [])
+    AC_CHECK_HEADER(boost/function.hpp, [],
+        [AC_MSG_ERROR(boost/function.hpp not found. install boost)], [])
+ 
commit 08ff8cc0ae9cb6e415db3dffcd31b13cc3343b57
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Oct 9 19:57:35 2009 +0200

    Update ucb-neon-0.24.diff for dev300-m60
    
    * patches/dev300/ucb-neon-0.24-m58.diff:
    * patches/dev300/ucb-neon-0.24.diff:
    * patches/dev300/apply: update for dev300-m60

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a138d09..a16cb6b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1112,9 +1112,13 @@ installer-get-path-correctly.diff, pmladek
 # allow to use the prebuilt jsr173_1.0_api.jar
 build-prebuilt-stax.diff, i#93116, pmladek
 
+[ BuildBits > dev300-m58 ]
 # fix build with neon-0.24
-# FIXME: this no longer applies against dev300-m60. 
-#ucb-neon-0.24.diff, pmladek
+ucb-neon-0.24.diff, pmladek
+
+[ BuildBits <= dev300-m58 ]
+# fix build with neon-0.24
+ucb-neon-0.24-m58.diff, pmladek
 
 [ BuildBits ]
 # don't break dmake with environment variables containing space in the name
diff --git a/patches/dev300/ucb-neon-0.24-m58.diff b/patches/dev300/ucb-neon-0.24-m58.diff
new file mode 100644
index 0000000..dd67a1a
--- /dev/null
+++ b/patches/dev300/ucb-neon-0.24-m58.diff
@@ -0,0 +1,19 @@
+--- ucb/source/ucp/webdav/NeonSession.cxx.old	2009-02-26 09:39:43.000000000 +0100
++++ ucb/source/ucp/webdav/NeonSession.cxx	2009-03-09 13:25:15.000000000 +0100
+@@ -763,11 +763,13 @@ void NeonSession::Init()
+         // Note: Calling ne_set_[server|proxy]_auth more than once per
+         //       m_pHttpSession instance sometimes(?) crashes Neon! ( last
+         //       checked: 0.22.0)
+-        //ne_set_server_auth( m_pHttpSession, NeonSession_NeonAuth, this );
++#if NEON_VERSION >= 0x0260
+ 		ne_add_server_auth( m_pHttpSession, NE_AUTH_ALL, NeonSession_NeonAuth, this ); 
+-        //ne_set_proxy_auth ( m_pHttpSession, 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
+     }
+ }
+ 
diff --git a/patches/dev300/ucb-neon-0.24.diff b/patches/dev300/ucb-neon-0.24.diff
index dd67a1a..abb77ed 100644
--- a/patches/dev300/ucb-neon-0.24.diff
+++ b/patches/dev300/ucb-neon-0.24.diff
@@ -1,18 +1,15 @@
 --- ucb/source/ucp/webdav/NeonSession.cxx.old	2009-02-26 09:39:43.000000000 +0100
 +++ ucb/source/ucp/webdav/NeonSession.cxx	2009-03-09 13:25:15.000000000 +0100
-@@ -763,11 +763,13 @@ void NeonSession::Init()
-         // Note: Calling ne_set_[server|proxy]_auth more than once per
-         //       m_pHttpSession instance sometimes(?) crashes Neon! ( last
-         //       checked: 0.22.0)
--        //ne_set_server_auth( m_pHttpSession, NeonSession_NeonAuth, this );
+@@ -841,8 +841,13 @@ void NeonSession::Init()
+         ne_redirect_register( m_pHttpSession );
+ 
+         // authentication callbacks.
 +#if NEON_VERSION >= 0x0260
- 		ne_add_server_auth( m_pHttpSession, NE_AUTH_ALL, NeonSession_NeonAuth, this ); 
--        //ne_set_proxy_auth ( m_pHttpSession, NeonSession_NeonAuth, this );
- 		ne_add_proxy_auth ( m_pHttpSession, NE_AUTH_ALL, NeonSession_NeonAuth, this );
--
+         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 );
++        ne_set_server_auth( m_pHttpSession, NeonSession_NeonAuth, this );
++        ne_set_proxy_auth ( m_pHttpSession, NeonSession_NeonAuth, this );
 +#endif
      }
  }