libcmis/libcmis-0.2.3.patch | 34 ++++++++++++++++++++++++++++++++++
libcmis/libcurl-version-fix.patch | 21 ---------------------
libcmis/makefile.mk | 3 +++
ooo.lst.in | 2 +-
4 files changed, 38 insertions(+), 22 deletions(-)
New commits:
commit 2b6e9bd89a5f93e4352ef1cd0801310d9558343f
Author: Cédric Bosdonnat <cedric.bosdon...@free.fr>
Date: Mon Jul 2 14:57:43 2012 +0200
libcmis: fixed unexpected exception thrown
Change-Id: Iaa42756f596333747a9100e075a2638b839175b3
diff --git a/libcmis/libcmis-0.2.3.patch b/libcmis/libcmis-0.2.3.patch
new file mode 100644
index 0000000..3b21e70
--- /dev/null
+++ b/libcmis/libcmis-0.2.3.patch
@@ -0,0 +1,34 @@
+diff -ru libcmis-0.2.3/src/libcmis/atom-document.cxx
misc/build/libcmis-0.2.3/src/libcmis/atom-document.cxx
+--- libcmis-0.2.3/src/libcmis/atom-document.cxx 2012-07-02
14:39:04.815222889 +0200
++++ misc/build/libcmis-0.2.3/src/libcmis/atom-document.cxx 2012-07-02
14:41:09.088229625 +0200
+@@ -129,15 +129,22 @@
+ vector< string > AtomDocument::getPaths( )
+ {
+ vector< string > paths;
+- vector< libcmis::FolderPtr > parents = getParents( );
+- for ( vector< libcmis::FolderPtr >::iterator it = parents.begin( );
+- it != parents.end(); ++it )
++ try
+ {
+- string path = ( *it )->getPath( );
+- if ( path[path.size() - 1] != '/' )
+- path += "/";
+- path += getName( );
+- paths.push_back( path );
++ vector< libcmis::FolderPtr > parents = getParents( );
++ for ( vector< libcmis::FolderPtr >::iterator it = parents.begin( );
++ it != parents.end(); ++it )
++ {
++ string path = ( *it )->getPath( );
++ if ( path[path.size() - 1] != '/' )
++ path += "/";
++ path += getName( );
++ paths.push_back( path );
++ }
++ }
++ catch ( const libcmis::Exception& )
++ {
++ // We may not have the permission to get the parents
+ }
+ return paths;
+ }
diff --git a/libcmis/makefile.mk b/libcmis/makefile.mk
index 37e4f6b..cedddf9 100644
--- a/libcmis/makefile.mk
+++ b/libcmis/makefile.mk
@@ -44,6 +44,9 @@ TARGET=cmis
TARFILE_NAME=libcmis-0.2.3
TARFILE_MD5=0d2dcdfbf28d6208751b33057f5361f0
+# Pushed upstream in both master and libcmis-0.2 branches
+PATCH_FILES+=libcmis-0.2.3.patch
+
.IF "$(OS)$(COM)" == "WNTMSC"
PATCH_FILES+=boost-win.patch
.ENDIF
commit 514081036fb208b79818eb73cd17c10aa97ccb3e
Author: Cédric Bosdonnat <cedric.bosdon...@free.fr>
Date: Mon Jul 2 14:57:06 2012 +0200
curl: forgot to add the file to download to ooo.lst.in
Change-Id: I97d28d76f32a787c8808551a6f38d1571365476a
diff --git a/ooo.lst.in b/ooo.lst.in
index 914c435..ed7e6db 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -28,7 +28,7 @@ f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz
+3fa4d5236f2a36ca5c3af6715e837691-curl-7.26.0.tar.gz
8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar
0c65c839854edd43d9294d1431a2b292-cppunit-1.13.0.tar.gz
a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
commit 066d321b8f9483523c60e6115cb62eefbf054de8
Author: Cédric Bosdonnat <cedric.bosdon...@free.fr>
Date: Mon Jul 2 14:38:33 2012 +0200
libcmis: forgot to remove now unneeded patch
Change-Id: I61e04283702f0ae839bfdd15c51a42ddbe002b86
diff --git a/libcmis/libcurl-version-fix.patch
b/libcmis/libcurl-version-fix.patch
deleted file mode 100644
index 075fc6c..0000000
--- a/libcmis/libcurl-version-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
