[Libreoffice-commits] .: libcmis/libcurl-version-fix.patch libcmis/makefile.mk

[Cédric Bosdonnat]

 libcmis/libcurl-version-fix.patch |   21 +++++++++++++++++++++
 libcmis/makefile.mk               |    3 +++
 2 files changed, 24 insertions(+)

New commits:
commit 4f1821203ec8fd4df3dafdf95c2e91f97d17fd8d
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date:   Mon Jun 4 20:48:16 2012 +0200

    Oops, fix a bad fix in libcmis for libcurl version checks
    
    Change-Id: I56b5bcd459c79de5be079d0c6563148e17f0bc9b

diff --git a/libcmis/libcurl-version-fix.patch b/libcmis/libcurl-version-fix.patch
new file mode 100644
index 0000000..075fc6c
--- /dev/null
+++ b/libcmis/libcurl-version-fix.patch
@@ -0,0 +1,21 @@
+diff -ur misc/build/libcmis-0.2.2.old/src/libcmis/atom-session.cxx misc/build/libcmis-0.2.2/src/libcmis/atom-session.cxx
+--- misc/build/libcmis-0.2.2.old/src/libcmis/atom-session.cxx	2012-06-04 20:35:46.400203393 +0200
++++ misc/build/libcmis-0.2.2/src/libcmis/atom-session.cxx	2012-06-04 20:36:16.255205010 +0200
+@@ -382,7 +382,7 @@
+         if ( pos != string::npos )
+         {
+             // Escape the URL by chunks
+-#if LIBCURL_VERSION_VALUE >= 71504
++#if LIBCURL_VERSION_VALUE >= 0x071504
+             char* escaped = curl_easy_escape( m_curlHandle, value.c_str(), value.length() );
+ #else
+             char* escaped = curl_escape( value.c_str(), value.length() );
+@@ -550,7 +550,7 @@
+     {
+         curl_easy_setopt( m_curlHandle, CURLOPT_HTTPAUTH, CURLAUTH_ANY );
+ 
+-#if LIBCURL_VERSION_VALUE >= 71901
++#if LIBCURL_VERSION_VALUE >= 0x071901
+         curl_easy_setopt( m_curlHandle, CURLOPT_USERNAME, m_username.c_str() );
+         curl_easy_setopt( m_curlHandle, CURLOPT_PASSWORD, m_password.c_str() );
+ #else
diff --git a/libcmis/makefile.mk b/libcmis/makefile.mk
index fb07f95..f3416ae 100644
--- a/libcmis/makefile.mk
+++ b/libcmis/makefile.mk
@@ -44,6 +44,9 @@ TARGET=cmis
 TARFILE_NAME=libcmis-0.2.2
 TARFILE_MD5=ce31ac7b92cb5e66459f67213bbb6168
 
+# Fixed for 0.2.3
+PATCH_FILES+=libcurl-version-fix.patch
+
 .IF "$(OS)$(COM)" == "WNTMSC"
 PATCH_FILES+=boost-win.patch
 .ENDIF