Fix compilation with libthrift 0.11.0

4 files changed, 5 insertions, 51 deletions

diff --git a/chat/line-purple/Makefile b/chat/line-purple/Makefile
index 635d88ae465..e599166a0fb 100644
--- a/chat/line-purple/Makefile
+++ b/chat/line-purple/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2018/03/16 21:06:31 scole Exp $
+# $NetBSD: Makefile,v 1.4 2018/04/08 10:14:15 scole Exp $
 
 VERSION=	0.1
 PKGNAME=	line-purple-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 
 CATEGORIES=	chat
 
@@ -29,6 +29,8 @@ USE_TOOLS+=	gmake pkg-config
 
 USE_LANGUAGES=	c++
 
+BUILDLINK_API_DEPENDS.libthrift+=   libthrift>=0.11.0
+
 INSTALLATION_DIRS=	lib/purple-2 \
 			share/pixmaps/pidgin/protocols/16 \
 			share/pixmaps/pidgin/protocols/22 \
diff --git a/chat/line-purple/distinfo b/chat/line-purple/distinfo
index e74c6e0cbdf..9146bc0de6b 100644
--- a/chat/line-purple/distinfo
+++ b/chat/line-purple/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.2 2018/03/16 21:06:31 scole Exp $
+$NetBSD: distinfo,v 1.3 2018/04/08 10:14:15 scole Exp $
 
 SHA1 (line-purple-0.1-20180221/archive.zip) = 66cebb3674733648743c1d34e3a965f8cea2bc3f
 RMD160 (line-purple-0.1-20180221/archive.zip) = b5ae36c80d8b698f189484b64742a2cb99b62af7
 SHA512 (line-purple-0.1-20180221/archive.zip) = 311495dd3695cef2367a0ba39081b9cdeafdb1d8909b366815259ca8182b30dcb66b230891130e4bcff74edbae3368cb472b874d7d61684e04fa4ffa74a24111
 Size (line-purple-0.1-20180221/archive.zip) = 56585 bytes
 SHA1 (patch-libpurple_Makefile) = 26590d9f3773e960ac7f9a1b3793342e6580df6d
-SHA1 (patch-libpurple_thriftclient.cpp) = e791acaa556ff63ca174dbd58d87fdcb9b1aa77a
-SHA1 (patch-libpurple_thriftclient.hpp) = fe71986a0c9fe6f0fa90d230c9f385debe7b89d5
diff --git a/chat/line-purple/patches/patch-libpurple_thriftclient.cpp b/chat/line-purple/patches/patch-libpurple_thriftclient.cpp
deleted file mode 100644
index 88e3f16e88f..00000000000
--- a/chat/line-purple/patches/patch-libpurple_thriftclient.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-libpurple_thriftclient.cpp,v 1.1 2018/03/16 21:06:31 scole Exp $
-
-std::make_shared does not seem to compile on NetBSD so use boost::make_shared
-	
---- libpurple/thriftclient.cpp.orig	2018-02-21 13:01:04.000000000 -0800
-+++ libpurple/thriftclient.cpp		2018-03-16 09:45:17.000000000 -0700
-@@ -8,11 +8,11 @@
- 
- ThriftClient::ThriftClient(PurpleAccount *acct, PurpleConnection *conn, std::string path)
-     : line::TalkServiceClient(
--        std::make_shared<apache::thrift::protocol::TCompactProtocol>(
--            std::make_shared<LineHttpTransport>(acct, conn, LINE_THRIFT_SERVER, 443, true))),
-+        boost::make_shared<apache::thrift::protocol::TCompactProtocol>(
-+            boost::make_shared<LineHttpTransport>(acct, conn, LINE_THRIFT_SERVER, 443, true))),
-     path(path)
- {
--    http = std::static_pointer_cast<LineHttpTransport>(getInputProtocol()->getTransport());
-+    http = boost::static_pointer_cast<LineHttpTransport>(getInputProtocol()->getTransport());
- }
- 
- void ThriftClient::set_path(std::string path) {
diff --git a/chat/line-purple/patches/patch-libpurple_thriftclient.hpp b/chat/line-purple/patches/patch-libpurple_thriftclient.hpp
deleted file mode 100644
index b6b3a4abecb..00000000000
--- a/chat/line-purple/patches/patch-libpurple_thriftclient.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-libpurple_thriftclient.hpp,v 1.1 2018/03/16 21:06:31 scole Exp $
-
-std::make_shared does not seem to compile on NetBSD so use boost::make_shared
-
---- libpurple/thriftclient.hpp.orig	2018-02-21 13:01:04.000000000 -0800
-+++ libpurple/thriftclient.hpp		2018-03-16 09:45:53.000000000 -0700
-@@ -3,6 +3,9 @@
- #include <string>
- #include <deque>
- 
-+#include <boost/shared_ptr.hpp>
-+#include <boost/make_shared.hpp>
-+
- #include <debug.h>
- #include <plugin.h>
- #include <prpl.h>
-@@ -14,7 +17,7 @@
- class ThriftClient : public line::TalkServiceClient {
- 
-     std::string path;
--    std::shared_ptr<LineHttpTransport> http;
-+    boost::shared_ptr<LineHttpTransport> http;
- 
- public:
-