From 4861cbb06d4ef497dcaed3e5c93372a40feedae4 Mon Sep 17 00:00:00 2001
From: Michael Gehring <mg@ebfe.org>
Date: Wed, 7 Sep 2016 09:47:50 +0200
Subject: [PATCH] swiften: update to 3.0.

---
 .../swiften/patches/add-boost-optional.patch  | 22 -------------------
 .../swiften/patches/fix-missing-include.patch | 13 -----------
 .../fix-missing-lockguard-include.patch       | 12 ----------
 srcpkgs/swiften/template                      |  6 ++---
 4 files changed, 3 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/swiften/patches/add-boost-optional.patch
 delete mode 100644 srcpkgs/swiften/patches/fix-missing-include.patch
 delete mode 100644 srcpkgs/swiften/patches/fix-missing-lockguard-include.patch

diff --git a/srcpkgs/swiften/patches/add-boost-optional.patch b/srcpkgs/swiften/patches/add-boost-optional.patch
deleted file mode 100644
index c6a0fc996a..0000000000
--- a/srcpkgs/swiften/patches/add-boost-optional.patch
+++ /dev/null
@@ -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());
- }
diff --git a/srcpkgs/swiften/patches/fix-missing-include.patch b/srcpkgs/swiften/patches/fix-missing-include.patch
deleted file mode 100644
index de65724fe5..0000000000
--- a/srcpkgs/swiften/patches/fix-missing-include.patch
+++ /dev/null
@@ -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 {
- 
-
diff --git a/srcpkgs/swiften/patches/fix-missing-lockguard-include.patch b/srcpkgs/swiften/patches/fix-missing-lockguard-include.patch
deleted file mode 100644
index eab42f462e..0000000000
--- a/srcpkgs/swiften/patches/fix-missing-lockguard-include.patch
+++ /dev/null
@@ -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>
-
diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index b7c51fb6dd..daaadc262b 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -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"