Fix build with boost-1.56.0. From upstream git.

4 files changed, 49 insertions, 1 deletions

diff --git a/chat/swift/distinfo b/chat/swift/distinfo
index 1193a2ff6d8..d081d997ad6 100644
--- a/chat/swift/distinfo
+++ b/chat/swift/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.1 2014/04/26 11:41:46 wiz Exp $
+$NetBSD: distinfo,v 1.2 2014/09/19 07:05:24 wiz Exp $
 
 SHA1 (swift-2.0.tar.gz) = b04ba098fffb1edc2ef0215957371c249458f0be
 RMD160 (swift-2.0.tar.gz) = f1e8f38e650a3178e236ec8d6f3cb97fecb4910d
 Size (swift-2.0.tar.gz) = 8816954 bytes
 SHA1 (patch-BuildTools_SCons_Tools_qt4.py) = 9c1f20a0dae15f73db02bbfe0d11e077176f2fcc
+SHA1 (patch-Swift_QtUI_UserSearch_QtUserSearchWindow.cpp) = 1bb39d5b89bbd0d1d77c8cda7db55c3fbec066b8
 SHA1 (patch-Swiften_EventLoop_EventLoop.cpp) = a840ad43cd5082c3f511c6efd1a49e910c3fb6ea
+SHA1 (patch-Swiften_Serializer_StreamResumeSerializer.cpp) = 6db493f2bb45caf686289e2b93d204627e27abea
+SHA1 (patch-Swiften_Serializer_StreamResumedSerializer.cpp) = da36fb7f97c8b61092745733f79360deb7cc9820
diff --git a/chat/swift/patches/patch-Swift_QtUI_UserSearch_QtUserSearchWindow.cpp b/chat/swift/patches/patch-Swift_QtUI_UserSearch_QtUserSearchWindow.cpp
new file mode 100644
index 00000000000..a6a5182faa5
--- /dev/null
+++ b/chat/swift/patches/patch-Swift_QtUI_UserSearch_QtUserSearchWindow.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-Swift_QtUI_UserSearch_QtUserSearchWindow.cpp,v 1.1 2014/09/19 07:05:24 wiz Exp $
+
+Fix build with boost-1.56.0. From upstream git.
+
+--- Swift/QtUI/UserSearch/QtUserSearchWindow.cpp.orig	2012-12-22 12:23:58.000000000 +0000
++++ Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
+@@ -221,7 +221,7 @@ void QtUserSearchWindow::setSearchFields
+ 		fieldsPage_->setFormWidget(new QtFormWidget(fields->getForm(), fieldsPage_));
+ 	} else {
+ 		fieldsPage_->setFormWidget(NULL);
+-		bool enabled[8] = {fields->getNick(), fields->getNick(), fields->getFirst(), fields->getFirst(), fields->getLast(), fields->getLast(), fields->getEMail(), fields->getEMail()};
++		bool enabled[8] = {!!fields->getNick(), !!fields->getNick(), !!fields->getFirst(), !!fields->getFirst(), !!fields->getLast(), !!fields->getLast(), !!fields->getEMail(), !!fields->getEMail()};
+ 		QWidget* legacySearchWidgets[8] = {fieldsPage_->nickInputLabel_, fieldsPage_->nickInput_, fieldsPage_->firstInputLabel_, fieldsPage_->firstInput_, fieldsPage_->lastInputLabel_, fieldsPage_->lastInput_, fieldsPage_->emailInputLabel_, fieldsPage_->emailInput_};
+ 		for (int i = 0; i < 8; i++) {
+ 			legacySearchWidgets[i]->setVisible(enabled[i]);
diff --git a/chat/swift/patches/patch-Swiften_Serializer_StreamResumeSerializer.cpp b/chat/swift/patches/patch-Swiften_Serializer_StreamResumeSerializer.cpp
new file mode 100644
index 00000000000..fb8a5146ba2
--- /dev/null
+++ b/chat/swift/patches/patch-Swiften_Serializer_StreamResumeSerializer.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-Swiften_Serializer_StreamResumeSerializer.cpp,v 1.1 2014/09/19 07:05:24 wiz Exp $
+
+Fix build with boost-1.56.0. From upstream git.
+
+--- Swiften/Serializer/StreamResumeSerializer.cpp.orig	2012-12-22 12:23:59.000000000 +0000
++++ Swiften/Serializer/StreamResumeSerializer.cpp
+@@ -22,7 +22,7 @@ SafeByteArray StreamResumeSerializer::se
+ 	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());
+ }
diff --git a/chat/swift/patches/patch-Swiften_Serializer_StreamResumedSerializer.cpp b/chat/swift/patches/patch-Swiften_Serializer_StreamResumedSerializer.cpp
new file mode 100644
index 00000000000..b12987904d2
--- /dev/null
+++ b/chat/swift/patches/patch-Swiften_Serializer_StreamResumedSerializer.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-Swiften_Serializer_StreamResumedSerializer.cpp,v 1.1 2014/09/19 07:05:24 wiz Exp $
+
+Fix build with boost-1.56.0. From upstream git.
+
+--- Swiften/Serializer/StreamResumedSerializer.cpp.orig	2012-12-22 12:23:59.000000000 +0000
++++ Swiften/Serializer/StreamResumedSerializer.cpp
+@@ -22,7 +22,7 @@ SafeByteArray StreamResumedSerializer::s
+ 	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());
+ }