diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-06-04 20:48:16 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-06-04 20:48:30 +0200 |
| commit | 4f1821203ec8fd4df3dafdf95c2e91f97d17fd8d (patch) | |
| tree | 8d59d44cbcc8427d488367cb29093142ba8237b1 /libcmis | |
| parent | 1ca20c89c0a1f1ca34de4939d6fef66fb68ceff9 (diff) | |
Oops, fix a bad fix in libcmis for libcurl version checks
Change-Id: I56b5bcd459c79de5be079d0c6563148e17f0bc9b
Diffstat (limited to 'libcmis')
| -rw-r--r-- | libcmis/libcurl-version-fix.patch | 21 | ||||
| -rw-r--r-- | libcmis/makefile.mk | 3 |
2 files changed, 24 insertions, 0 deletions
diff --git a/libcmis/libcurl-version-fix.patch b/libcmis/libcurl-version-fix.patch new file mode 100644 index 000000000000..075fc6ce3eff --- /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 fb07f957eb7f..f3416ae3800b 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 |