Hello community,
here is the log from the commit of package cmis-client for openSUSE:Factory
checked in at 2014-07-24 06:58:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cmis-client (Old)
and /work/SRC/openSUSE:Factory/.cmis-client.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmis-client"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cmis-client/cmis-client.changes 2014-03-06
11:53:13.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.cmis-client.new/cmis-client.changes
2014-07-24 06:58:42.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jul 2 12:31:44 UTC 2014 - fst...@suse.com
+
+- 0001-Remove-C-11-only-std-to_string.patch
+ Fix some C++11-isms.
+
+-------------------------------------------------------------------
New:
----
0001-Remove-C-11-only-std-to_string.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cmis-client.spec ++++++
--- /var/tmp/diff_new_pack.ABXn3t/_old 2014-07-24 06:58:43.000000000 +0200
+++ /var/tmp/diff_new_pack.ABXn3t/_new 2014-07-24 06:58:43.000000000 +0200
@@ -30,6 +30,7 @@
# 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
@@ -84,6 +85,7 @@
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
+%patch1 -p1
%build
export CFLAGS="%{optflags} -D_GNU_SOURCE $(getconf LFS_CFLAGS)"
++++++ 0001-Remove-C-11-only-std-to_string.patch ++++++
>From 9f4613246c433d1a9c803cf79dada6a74b4979c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.st...@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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
