swiften: update to 3.0.

This commit is contained in:
Michael Gehring 2016-09-07 09:47:50 +02:00
parent c2e1592aa7
commit 4861cbb06d
4 changed files with 3 additions and 50 deletions

View file

@ -1,22 +0,0 @@
--- Swiften/Serializer/StreamResumeSerializer.cpp
+++ Swiften/Serializer/StreamResumeSerializer.cpp
@@ -22,7 +22,7 @@
XMLElement element("resume", "urn:xmpp:sm:2");
element.setAttribute("previd", e->getResumeID());
if (e->getHandledStanzasCount()) {
- element.setAttribute("h", boost::lexical_cast<std::string>(e->getHandledStanzasCount()));
+ element.setAttribute("h", boost::lexical_cast<std::string>(e->getHandledStanzasCount().get()));
}
return createSafeByteArray(element.serialize());
}
--- Swiften/Serializer/StreamResumedSerializer.cpp
+++ Swiften/Serializer/StreamResumedSerializer.cpp
@@ -22,7 +22,7 @@
XMLElement element("resumed", "urn:xmpp:sm:2");
element.setAttribute("previd", e->getResumeID());
if (e->getHandledStanzasCount()) {
- element.setAttribute("h", boost::lexical_cast<std::string>(e->getHandledStanzasCount()));
+ element.setAttribute("h", boost::lexical_cast<std::string>(e->getHandledStanzasCount().get()));
}
return createSafeByteArray(element.serialize());
}

View file

@ -1,13 +0,0 @@
diff --git Swiften/Base/Algorithm.h Swiften/Base/Algorithm.h
index 4e68e70..0382a63 100644
--- Swiften/Base/Algorithm.h
+++ Swiften/Base/Algorithm.h
@@ -10,6 +10,7 @@
#include <list>
#include <map>
#include <algorithm>
+#include <string>
namespace Swift {

View file

@ -1,12 +0,0 @@
diff --git Swiften/EventLoop/EventLoop.cpp Swiften/EventLoop/EventLoop.cpp
index afb6858..507de0b 100644
--- Swiften/EventLoop/EventLoop.cpp
+++ Swiften/EventLoop/EventLoop.cpp
@@ -8,6 +8,7 @@
#include <algorithm>
#include <boost/bind.hpp>
+#include <boost/thread/locks.hpp>
#include <iostream>
#include <cassert>

View file

@ -1,7 +1,7 @@
# Template file for 'swiften'
pkgname=swiften
version=2.0
revision=2
version=3.0
revision=1
build_style=scons
hostmakedepends="scons"
makedepends="boost-devel libressl-devel libxml2-devel libidn-devel"
@ -10,7 +10,7 @@ maintainer="John Regan <john@jrjrtech.com>"
license="GPL-3"
homepage="http://swift.im/"
distfiles="http://swift.im/git/swift/snapshot/swift-${version}.tar.bz2"
checksum=4de4255e6981de031d4d8df4bd1f838222c9eb0f7c778f31963a9a7e93098ebb
checksum=2e48f081d337f471b4eba7c0c807a7b640216a76ed3568ced55abb5b927c7fd2
wrksrc="swift-${version}"
make_build_targets="Swiften"