diff options
| author | joerg <joerg> | 2011-11-23 15:39:21 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2011-11-23 15:39:21 +0000 |
| commit | 8d9465dcfee7a16a606e79efd8a269bed89ebe63 (patch) | |
| tree | ffb4437999d63a2328385b1902b8e74d1ea91aa2 /databases | |
| parent | 02fd935eaec1cd966099bbb0917d1ff59f6ab8f2 (diff) | |
| download | pkgsrc-8d9465dcfee7a16a606e79efd8a269bed89ebe63.tar.gz | |
Fix build with newer libthrift
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/libcassandra/distinfo | 4 | ||||
| -rw-r--r-- | databases/libcassandra/patches/patch-libgenthrift_Cassandra.cpp | 14 | ||||
| -rw-r--r-- | databases/libcassandra/patches/patch-libgenthrift_Cassandra.h | 13 |
3 files changed, 30 insertions, 1 deletions
diff --git a/databases/libcassandra/distinfo b/databases/libcassandra/distinfo index b8be8c834c4..11f18bcd758 100644 --- a/databases/libcassandra/distinfo +++ b/databases/libcassandra/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.3 2010/10/16 11:43:30 tonnerre Exp $ +$NetBSD: distinfo,v 1.4 2011/11/23 15:39:21 joerg Exp $ SHA1 (libcassandra-20101010.tar.gz) = 457dcf1fd24ad310c63eefb3b532f58835f326ef RMD160 (libcassandra-20101010.tar.gz) = e3e05861d1c1173d2492d49442aa68ee429d7b8f Size (libcassandra-20101010.tar.gz) = 873233 bytes SHA1 (patch-aa) = 387ea4e5ceb65c63e0a8d894035c9ae0fee2b792 +SHA1 (patch-libgenthrift_Cassandra.cpp) = b8ab38d7e28f98ad84d0f2cd3459d564a8decfc7 +SHA1 (patch-libgenthrift_Cassandra.h) = 02511eef6232f15e7e1f5c0ef2211c02f2ee5868 diff --git a/databases/libcassandra/patches/patch-libgenthrift_Cassandra.cpp b/databases/libcassandra/patches/patch-libgenthrift_Cassandra.cpp new file mode 100644 index 00000000000..88a73c47b75 --- /dev/null +++ b/databases/libcassandra/patches/patch-libgenthrift_Cassandra.cpp @@ -0,0 +1,14 @@ +$NetBSD: patch-libgenthrift_Cassandra.cpp,v 1.1 2011/11/23 15:39:21 joerg Exp $ + +--- libgenthrift/Cassandra.cpp.orig 2011-11-23 14:40:36.000000000 +0000 ++++ libgenthrift/Cassandra.cpp +@@ -6761,7 +6761,8 @@ void CassandraClient::recv_describe_spli + throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "describe_splits failed: unknown result"); + } + +-bool CassandraProcessor::process(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot) { ++bool CassandraProcessor::process(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot, void* connectionContext) { ++ (void)&connectionContext; + + ::apache::thrift::protocol::TProtocol* iprot = piprot.get(); + ::apache::thrift::protocol::TProtocol* oprot = poprot.get(); diff --git a/databases/libcassandra/patches/patch-libgenthrift_Cassandra.h b/databases/libcassandra/patches/patch-libgenthrift_Cassandra.h new file mode 100644 index 00000000000..8ea9d6f1b2b --- /dev/null +++ b/databases/libcassandra/patches/patch-libgenthrift_Cassandra.h @@ -0,0 +1,13 @@ +$NetBSD: patch-libgenthrift_Cassandra.h,v 1.1 2011/11/23 15:39:21 joerg Exp $ + +--- libgenthrift/Cassandra.h.orig 2011-11-23 14:36:26.000000000 +0000 ++++ libgenthrift/Cassandra.h +@@ -2609,7 +2609,7 @@ class CassandraProcessor : virtual publi + processMap_["describe_splits"] = &CassandraProcessor::process_describe_splits; + } + +- virtual bool process(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot); ++ virtual bool process(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot, void* connectionContext); + virtual ~CassandraProcessor() {} + }; + |