Received: by mail.netbsd.org (Postfix, from userid 605) id A84D284EC8; Fri, 16 Mar 2018 21:06:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A007984D3E for ; Fri, 16 Mar 2018 21:06:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id GU6n2Kh5Ctwk for ; Fri, 16 Mar 2018 21:06:31 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 84ABF84CEF for ; Fri, 16 Mar 2018 21:06:31 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7DA47FB40; Fri, 16 Mar 2018 21:06:31 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1521234391262210" MIME-Version: 1.0 Date: Fri, 16 Mar 2018 21:06:31 +0000 From: "Sean Cole" Subject: CVS commit: pkgsrc/chat/line-purple To: pkgsrc-changes@NetBSD.org Reply-To: scole@netbsd.org X-Mailer: log_accum Message-Id: <20180316210631.7DA47FB40@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1521234391262210 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: scole Date: Fri Mar 16 21:06:31 UTC 2018 Modified Files: pkgsrc/chat/line-purple: Makefile distinfo pkgsrc/chat/line-purple/patches: patch-libpurple_Makefile Added Files: pkgsrc/chat/line-purple/patches: patch-libpurple_thriftclient.cpp patch-libpurple_thriftclient.hpp Log Message: Update to nb2/20180221 which mainly fixes login issue. Use boost::make_shared instead of std::make_shared in a few places where it doesn't compile with netbsd-7/gcc4.8.5. I'm not sure, there may be a more portable way to handle. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/line-purple/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/chat/line-purple/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/chat/line-purple/patches/patch-libpurple_Makefile cvs rdiff -u -r0 -r1.1 \ pkgsrc/chat/line-purple/patches/patch-libpurple_thriftclient.cpp \ pkgsrc/chat/line-purple/patches/patch-libpurple_thriftclient.hpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1521234391262210 Content-Disposition: inline Content-Length: 6562 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/chat/line-purple/Makefile diff -u pkgsrc/chat/line-purple/Makefile:1.2 pkgsrc/chat/line-purple/Makefile:1.3 --- pkgsrc/chat/line-purple/Makefile:1.2 Mon Jan 1 21:18:17 2018 +++ pkgsrc/chat/line-purple/Makefile Fri Mar 16 21:06:31 2018 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2018/01/01 21:18:17 adam Exp $ +# $NetBSD: Makefile,v 1.3 2018/03/16 21:06:31 scole Exp $ VERSION= 0.1 PKGNAME= line-purple-${VERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= chat @@ -13,12 +13,12 @@ COMMENT= LINE protocol plugin for libpur # XXX archive is at a github-type site, but its name doesn't # match "https://github.com/account", couldn't figure out # pkgsrc GITHUB* vars to work for fetching -#ALTREPO_TAG= b330e2b07372d0aea0100ab5a75ba5a6961b475c +#ALTREPO_TAG= 51cef1a66f6f4b1a90bd58a3746a2ea27fc74c36 MASTER_SITES= ${HOMEPAGE:=repository/} EXTRACT_SUFX= .zip DISTNAME= archive -DIST_SUBDIR= ${PKGNAME_NOREV} +DIST_SUBDIR= ${PKGNAME_NOREV}-20180221 LICENSE= mit Index: pkgsrc/chat/line-purple/distinfo diff -u pkgsrc/chat/line-purple/distinfo:1.1 pkgsrc/chat/line-purple/distinfo:1.2 --- pkgsrc/chat/line-purple/distinfo:1.1 Tue Nov 7 17:15:16 2017 +++ pkgsrc/chat/line-purple/distinfo Fri Mar 16 21:06:31 2018 @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.1 2017/11/07 17:15:16 scole Exp $ +$NetBSD: distinfo,v 1.2 2018/03/16 21:06:31 scole Exp $ -SHA1 (line-purple-0.1/archive.zip) = 2ee693cc9ba7fe0b833a0a932051dc9160ef4896 -RMD160 (line-purple-0.1/archive.zip) = 24c85b728dc53a0494e002c1115dec4b7420e374 -SHA512 (line-purple-0.1/archive.zip) = cb41ff49207678966554e1c96234fd6062340a1470df7536fdbe536ac78c94c598b179fca14a702e41f49ecc950975f8e865b4764d5ffec5f458d000c056c515 -Size (line-purple-0.1/archive.zip) = 56114 bytes -SHA1 (patch-libpurple_Makefile) = b682cf9197fc3ea0f359410a7f79a361fd9f36bc +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 Index: pkgsrc/chat/line-purple/patches/patch-libpurple_Makefile diff -u pkgsrc/chat/line-purple/patches/patch-libpurple_Makefile:1.1 pkgsrc/chat/line-purple/patches/patch-libpurple_Makefile:1.2 --- pkgsrc/chat/line-purple/patches/patch-libpurple_Makefile:1.1 Tue Nov 7 17:18:25 2017 +++ pkgsrc/chat/line-purple/patches/patch-libpurple_Makefile Fri Mar 16 21:06:31 2018 @@ -1,11 +1,11 @@ -$NetBSD: patch-libpurple_Makefile,v 1.1 2017/11/07 17:18:25 scole Exp $ +$NetBSD: patch-libpurple_Makefile,v 1.2 2018/03/16 21:06:31 scole Exp $ Modify for libtool ---- libpurple/Makefile.orig 2017-03-30 23:35:47.000000000 +0000 -+++ libpurple/Makefile 2017-07-04 11:22:31.000000000 +0000 -@@ -15,10 +15,10 @@ CXX ?= g++ - CXXFLAGS = -g -Wall -shared -fPIC \ +--- libpurple/Makefile.orig 2018-02-21 13:01:04.000000000 -0800 ++++ libpurple/Makefile 2018-03-16 08:32:33.000000000 -0700 +@@ -15,10 +15,10 @@ + CXXFLAGS = -g -Wall -Wextra -Werror -pedantic -shared -fPIC \ -DHAVE_INTTYPES_H -DHAVE_CONFIG_H -DPURPLE_PLUGINS \ `pkg-config --cflags purple` `libgcrypt-config --cflags` `gpg-error-config --cflags` \ - $(THRIFT_CXXFLAGS) @@ -13,11 +13,11 @@ Modify for libtool LIBS = `pkg-config --libs purple` `libgcrypt-config --libs` `gpg-error-config --libs` \ - $(THRIFT_LIBS) -+ `pkg-config --libs libidn` $(THRIFT_LIBS) ++ `pkg-config --libs libidn` $(THRIFT_LIBS) PURPLE_PLUGIN_DIR:=$(shell pkg-config --variable=plugindir purple) PURPLE_DATA_ROOT_DIR:=$(shell pkg-config --variable=datarootdir purple) -@@ -39,11 +39,12 @@ OBJS = $(SRCS:.cpp=.o) +@@ -39,11 +39,12 @@ all: $(MAIN) $(MAIN): $(OBJS) $(THRIFT_DEP) Added files: Index: pkgsrc/chat/line-purple/patches/patch-libpurple_thriftclient.cpp diff -u /dev/null pkgsrc/chat/line-purple/patches/patch-libpurple_thriftclient.cpp:1.1 --- /dev/null Fri Mar 16 21:06:31 2018 +++ pkgsrc/chat/line-purple/patches/patch-libpurple_thriftclient.cpp Fri Mar 16 21:06:31 2018 @@ -0,0 +1,21 @@ +$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( +- std::make_shared(acct, conn, LINE_THRIFT_SERVER, 443, true))), ++ boost::make_shared( ++ boost::make_shared(acct, conn, LINE_THRIFT_SERVER, 443, true))), + path(path) + { +- http = std::static_pointer_cast(getInputProtocol()->getTransport()); ++ http = boost::static_pointer_cast(getInputProtocol()->getTransport()); + } + + void ThriftClient::set_path(std::string path) { Index: pkgsrc/chat/line-purple/patches/patch-libpurple_thriftclient.hpp diff -u /dev/null pkgsrc/chat/line-purple/patches/patch-libpurple_thriftclient.hpp:1.1 --- /dev/null Fri Mar 16 21:06:31 2018 +++ pkgsrc/chat/line-purple/patches/patch-libpurple_thriftclient.hpp Fri Mar 16 21:06:31 2018 @@ -0,0 +1,25 @@ +$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 + #include + ++#include ++#include ++ + #include + #include + #include +@@ -14,7 +17,7 @@ + class ThriftClient : public line::TalkServiceClient { + + std::string path; +- std::shared_ptr http; ++ boost::shared_ptr http; + + public: + --_----------=_1521234391262210--