SHA256
1
0
forked from pool/cmis-client

Accepting request 266508 from home:posophe:branches:devel:libraries:c_c++

- Update to version 0.5.0
  + Completely removed the dependency on InMemory server for unit tests
  + Minimized the number of HTTP requests sent by 
    SessionFactory::createSession
  + Added Session::getBaseTypes()
- Remove merged patches;
  + 433fad3-Fix-int-bool-confusion-on-big-endian-architectures.patch
  + 0001-Remove-C-11-only-std-to_string.patch
- Bump soname to 0_5-5
- Bump incname to 0.5

OBS-URL: https://build.opensuse.org/request/show/266508
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/cmis-client?expand=0&rev=26
This commit is contained in:
Tomáš Chvátal 2014-12-29 16:02:28 +00:00 committed by Git OBS Bridge
parent 8b063364dd
commit cd6f8aa6b5
6 changed files with 20 additions and 98 deletions

View File

@ -1,61 +0,0 @@
From 9f4613246c433d1a9c803cf79dada6a74b4979c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Tue, 1 Jul 2014 17:17:03 +0200
Subject: [PATCH] Remove C++11 only std::to_string
(cherry picked from commit b05508b6e9d54cb0dfdb9a9a3f745a63aee6bea8)
Conflicts:
src/libcmis/ws-relatedmultipart.cxx
---
src/libcmis/ws-relatedmultipart.cxx | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/libcmis/ws-relatedmultipart.cxx b/src/libcmis/ws-relatedmultipart.cxx
index 6fa33ce..169d56c 100644
--- a/src/libcmis/ws-relatedmultipart.cxx
+++ b/src/libcmis/ws-relatedmultipart.cxx
@@ -26,6 +26,7 @@
* instead of those above.
*/
+#include <sstream>
#include <boost/uuid/uuid_generators.hpp>
#include <boost/uuid/uuid_io.hpp>
#include <curl/curl.h>
@@ -61,8 +62,9 @@ RelatedMultipart::RelatedMultipart( ) :
m_parts( ),
m_boundary( )
{
- uuid uuid = random_generator()();
- m_boundary = "--------uuid:" + to_string( uuid );
+ stringstream tmpStream("--------uuid:");
+ tmpStream << random_generator()();
+ m_boundary = tmpStream.str();
}
RelatedMultipart::RelatedMultipart( const string& body, const string& contentType ) :
@@ -273,15 +275,12 @@ boost::shared_ptr< istringstream > RelatedMultipart::toStream( )
string RelatedMultipart::createPartId( const string& name )
{
- string cid( name + "*" );
+ stringstream tmpStream(name);
+ tmpStream << "*";
+ tmpStream << random_generator()();
+ tmpStream << "@libcmis.sourceforge.net";
- // Generate the UUID part of the id
- uuid uuid = random_generator()();
- cid += to_string( uuid );
-
- cid += "@libcmis.sourceforge.net";
-
- return cid;
+ return tmpStream.str();
}
boost::shared_ptr< istream > getStreamFromNode( xmlNodePtr node, RelatedMultipart& multipart )
--
2.0.0

View File

@ -1,25 +0,0 @@
From 433fad370ddd30c43df281b40ff468a842bc1c70 Mon Sep 17 00:00:00 2001
From: Adam Conrad <adconrad@ubuntu.com>
Date: Thu, 6 Feb 2014 09:13:32 +0100
Subject: [PATCH] Fix int/bool confusion on big-endian architectures.
---
qa/libcmis-c/test-document.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qa/libcmis-c/test-document.cxx b/qa/libcmis-c/test-document.cxx
index ccf2224..eb2c01c 100644
--- a/qa/libcmis-c/test-document.cxx
+++ b/qa/libcmis-c/test-document.cxx
@@ -43,7 +43,7 @@
using namespace std;
-extern int isOutOfMemory;
+extern bool isOutOfMemory;
namespace
{
--
1.8.5.2

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Sat Dec 27 16:31:25 UTC 2014 - p.drouand@gmail.com
- Update to version 0.5.0
+ Completely removed the dependency on InMemory server for unit tests
+ Minimized the number of HTTP requests sent by
SessionFactory::createSession
+ Added Session::getBaseTypes()
- Remove merged patches;
+ 433fad3-Fix-int-bool-confusion-on-big-endian-architectures.patch
+ 0001-Remove-C-11-only-std-to_string.patch
- Bump soname to 0_5-5
- Bump incname to 0.5
-------------------------------------------------------------------
Wed Jul 2 12:31:44 UTC 2014 - fstrba@suse.com

View File

@ -16,11 +16,11 @@
#
%define soname 0_4-4
%define incname 0.4
%define soname 0_5-5
%define incname 0.5
%define _name libcmis
Name: cmis-client
Version: 0.4.1
Version: 0.5.0
Release: 0
Summary: Sample CMIS client
License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+
@ -28,10 +28,6 @@ Group: Development/Libraries/C and C++
Url: http://sourceforge.net/projects/libcmis/
Source0: %{_name}-%{version}.tar.gz
# Upstream patches
Patch0: 433fad3-Fix-int-bool-confusion-on-big-endian-architectures.patch
Patch1: 0001-Remove-C-11-only-std-to_string.patch
BuildRequires: boost-devel >= 1.42
BuildRequires: docbook2X
BuildRequires: gcc-c++
@ -84,8 +80,6 @@ This allows C applications to connect to any CMIS-enabled repositories. It is on
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%build
export CFLAGS="%{optflags} -D_GNU_SOURCE $(getconf LFS_CFLAGS)"

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7d52dcf2b5832d3663b18fbf40f0bdefb1e1a40cfb3cf01903301b0bf629395f
size 637615

3
libcmis-0.5.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a87e02913dee3ee659db5abf6d7dafcfcd85dd4b24bf4389d8d4afe8c8dcf9b6
size 738119