[Libreoffice-commits] .: libcmis/boost-win.patch libcmis/makefile.mk ooo.lst.in

[Cédric Bosdonnat]

 libcmis/boost-win.patch |   21 ++++++++++-----------
 libcmis/makefile.mk     |    4 ++--
 ooo.lst.in              |    2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

New commits:
commit 293f6a7a24c30f4d4234d973dba1d90005165455
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date:   Mon Jun 4 18:58:40 2012 +0200

    update libcmis to 0.2.2 to fix macos old libcurl problems
    
    Change-Id: I0ea2191a281405a0672fac2f8c1d4dafea224ef4

diff --git a/libcmis/boost-win.patch b/libcmis/boost-win.patch
index 02188c0..fde29df 100644
--- a/libcmis/boost-win.patch
+++ b/libcmis/boost-win.patch
@@ -1,5 +1,5 @@
---- misc/libcmis-0.2.1/src/libcmis/atom-object.cxx	2012-06-01 07:44:26.000000000 -0600
-+++ misc/build/libcmis-0.2.1/src/libcmis/atom-object.cxx	2012-06-04 07:52:24.131190200 -0600
+--- misc/libcmis-0.2.2/src/libcmis/atom-object.cxx	2012-06-01 07:44:26.000000000 -0600
++++ misc/build/libcmis-0.2.2/src/libcmis/atom-object.cxx	2012-06-04 07:52:24.131190200 -0600
 @@ -29,6 +29,9 @@
  #include <algorithm>
  #include <sstream>
@@ -10,8 +10,8 @@
  #include <boost/date_time/posix_time/posix_time.hpp>
  
  #include "atom-object.hxx"
---- misc/libcmis-0.2.1/src/libcmis/object.hxx	2012-06-01 07:38:36.000000000 -0600
-+++ misc/build/libcmis-0.2.1/src/libcmis/object.hxx	2012-06-04 07:52:21.900386200 -0600
+--- misc/libcmis-0.2.2/src/libcmis/object.hxx	2012-06-01 07:38:36.000000000 -0600
++++ misc/build/libcmis-0.2.2/src/libcmis/object.hxx	2012-06-04 07:52:21.900386200 -0600
 @@ -32,6 +32,9 @@
  #include <map>
  #include <string>
@@ -22,8 +22,8 @@
  #include <boost/date_time.hpp>
  #include <boost/shared_ptr.hpp>
  
---- misc/libcmis-0.2.1/src/libcmis/property-type.hxx	2012-02-17 08:00:50.000000000 -0700
-+++ misc/build/libcmis-0.2.1/src/libcmis/property-type.hxx	2012-06-04 07:52:17.157977900 -0600
+--- misc/libcmis-0.2.2/src/libcmis/property-type.hxx	2012-02-17 08:00:50.000000000 -0700
++++ misc/build/libcmis-0.2.2/src/libcmis/property-type.hxx	2012-06-04 07:52:17.157977900 -0600
 @@ -28,6 +28,9 @@
  #ifndef _PROPERTY_TYPE_HXX_
  #define _PROPERTY_TYPE_HXX_
@@ -34,8 +34,8 @@
  #include <boost/date_time.hpp>
  #include <libxml/tree.h>
  
---- misc/libcmis-0.2.1/src/libcmis/property.hxx	2012-02-17 06:38:33.000000000 -0700
-+++ misc/build/libcmis-0.2.1/src/libcmis/property.hxx	2012-06-04 07:52:19.388781800 -0600
+--- misc/libcmis-0.2.2/src/libcmis/property.hxx	2012-02-17 06:38:33.000000000 -0700
++++ misc/build/libcmis-0.2.2/src/libcmis/property.hxx	2012-06-04 07:52:19.388781800 -0600
 @@ -31,6 +31,9 @@
  #include <libxml/tree.h>
  #include <libxml/xmlwriter.h>
@@ -46,8 +46,8 @@
  #include <boost/date_time.hpp>
  #include <boost/shared_ptr.hpp>
  
---- misc/libcmis-0.2.1/src/libcmis/xml-utils.hxx	2012-05-30 06:17:12.000000000 -0600
-+++ misc/build/libcmis-0.2.1/src/libcmis/xml-utils.hxx	2012-06-04 07:52:10.621566400 -0600
+--- misc/libcmis-0.2.2/src/libcmis/xml-utils.hxx	2012-05-30 06:17:12.000000000 -0600
++++ misc/build/libcmis-0.2.2/src/libcmis/xml-utils.hxx	2012-06-04 07:52:10.621566400 -0600
 @@ -30,6 +30,9 @@
  
  #include <string>
@@ -56,4 +56,4 @@
 +#define BOOST_DATE_TIME_NO_LIB
 +#endif
  #include <boost/date_time.hpp>
- #include <libxml/tree.h>
\ No newline at end of file
+ #include <libxml/tree.h>
diff --git a/libcmis/makefile.mk b/libcmis/makefile.mk
index ec04b45..fb07f95 100644
--- a/libcmis/makefile.mk
+++ b/libcmis/makefile.mk
@@ -41,8 +41,8 @@ TARGET=cmis
     @echo "Using system libcmis..."
 .ENDIF
 
-TARFILE_NAME=libcmis-0.2.1
-TARFILE_MD5=aba670de3beaafac1e287a9399dcc023
+TARFILE_NAME=libcmis-0.2.2
+TARFILE_MD5=ce31ac7b92cb5e66459f67213bbb6168
 
 .IF "$(OS)$(COM)" == "WNTMSC"
 PATCH_FILES+=boost-win.patch
diff --git a/ooo.lst.in b/ooo.lst.in
index 98eb1ea..a49e66c 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -88,7 +88,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
 90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
-aba670de3beaafac1e287a9399dcc023-libcmis-0.2.1.tar.gz
+ce31ac7b92cb5e66459f67213bbb6168-libcmis-0.2.2.tar.gz
 c216ded0275129ccfef44fbc236ac16a-libcdr-0.0.7.tar.bz2
 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
 @GOOGLE_DOCS_EXTENSION_PACK@