Attachment 162095 Details for Bug 203767 – patch thrift ports

[patch] patch thrift ports

patch-thrift-0.9.3.diff (text/plain), 5.32 KB, created by David Carlier on 2015-10-15 19:19:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Carlier

Created: 2015-10-15 19:19:26 UTC

Size: 5.32 KB

patch

obsolete

>Index: thrift/Makefile
>===================================================================
>--- thrift/Makefile	(revision 399358)
>+++ thrift/Makefile	(working copy)
>@@ -43,7 +43,8 @@
> 		--without-php \
> 		--without-php_extension \
> 		--without-python \
>-		--without-ruby
>+		--without-ruby \
>+                --without-go
> 
> PLIST_FILES=	bin/thrift
> 
>Index: thrift/bsd.thrift.mk
>===================================================================
>--- thrift/bsd.thrift.mk	(revision 399358)
>+++ thrift/bsd.thrift.mk	(working copy)
>@@ -5,7 +5,7 @@
> # in your makefile, set:
> # PORTVERSION=	${THRIFT_PORTVERSION}
> # see $PORTSDIR/devel/thrift for examples 
>-THRIFT_PORTVERSION=	0.9.1
>+THRIFT_PORTVERSION=	0.9.3
> THRIFT_PORTREVISION=	1
> 
> CONFIGURE_ARGS+=	\
>Index: thrift/distinfo
>===================================================================
>--- thrift/distinfo	(revision 399358)
>+++ thrift/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (thrift-0.9.1.tar.gz) = ac175080c8cac567b0331e394f23ac306472c071628396db2850cb00c41b0017
>-SIZE (thrift-0.9.1.tar.gz) = 3402353
>+SHA256 (thrift-0.9.3.tar.gz) = b0740a070ac09adde04d43e852ce4c320564a292f26521c46b78e0641564969e
>+SIZE (thrift-0.9.3.tar.gz) = 8897936
>Index: thrift-c_glib/Makefile
>===================================================================
>--- thrift-c_glib/Makefile	(revision 399358)
>+++ thrift-c_glib/Makefile	(working copy)
>@@ -40,7 +40,8 @@
> 		--without-php \
> 		--without-php_extension \
> 		--without-python \
>-		--without-ruby
>+		--without-ruby \
>+		--without-go
> 
> post-patch:
> 	@${REINPLACE_CMD} 's,^pkgconfigdir = .*,pkgconfigdir=$${prefix}/libdata/pkgconfig,' ${WRKSRC}/lib/c_glib/Makefile.am
>Index: thrift-cpp/Makefile
>===================================================================
>--- thrift-cpp/Makefile	(revision 399358)
>+++ thrift-cpp/Makefile	(working copy)
>@@ -23,8 +23,6 @@
> USE_LDCONFIG=		yes
> MAKE_JOBS_UNSAFE=	yes
> PLIST_SUB=		PORTVERSION="${THRIFT_PORTVERSION}"
>-BUILD_WRKSRC=		${WRKSRC}/lib/cpp
>-INSTALL_WRKSRC=		${WRKSRC}/lib/cpp
> 
> OPTIONS_DEFINE=		QT4
> QT4_CONFIGURE_WITH=	qt4
>@@ -43,7 +41,8 @@
> 		--without-php \
> 		--without-php_extension \
> 		--without-python \
>-		--without-ruby
>+		--without-ruby \
>+                --without-go
> 
> .include <bsd.port.pre.mk>
> 
>Index: thrift-cpp/files/patch-lib__cpp__src__thrift__protocol__TBinaryProtocol.tcc
>===================================================================
>--- thrift-cpp/files/patch-lib__cpp__src__thrift__protocol__TBinaryProtocol.tcc	(revision 399358)
>+++ thrift-cpp/files/patch-lib__cpp__src__thrift__protocol__TBinaryProtocol.tcc	(working copy)
>@@ -1,11 +1,11 @@
>---- ./lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc.orig	2013-08-15 18:04:29.000000000 +0400
>-+++ ./lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc	2013-10-16 01:15:53.000000000 +0400
>-@@ -23,7 +23,7 @@
>- #include <thrift/protocol/TBinaryProtocol.h>
>+--- lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc.orig	2015-10-13 19:19:23 UTC
>++++ lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc
>+@@ -24,6 +24,8 @@
>  
>  #include <limits>
>--
>+ 
> +#include <netinet/in.h>
>- 
>- namespace apache { namespace thrift { namespace protocol {
>- 
>++
>+ namespace apache {
>+ namespace thrift {
>+ namespace protocol {
>Index: thrift-cpp/files/patch-lib__cpp__src__thrift__server__TNonblockingServer.h
>===================================================================
>--- thrift-cpp/files/patch-lib__cpp__src__thrift__server__TNonblockingServer.h	(revision 399358)
>+++ thrift-cpp/files/patch-lib__cpp__src__thrift__server__TNonblockingServer.h	(working copy)
>@@ -1,12 +1,12 @@
>---- ./lib/cpp/src/thrift/server/TNonblockingServer.h.orig	2013-08-15 18:04:29.000000000 +0400
>-+++ ./lib/cpp/src/thrift/server/TNonblockingServer.h	2013-10-16 01:15:53.000000000 +0400
>-@@ -38,7 +38,8 @@
>- #include <unistd.h>
>- #endif
>- #include <event.h>
>--
>+--- lib/cpp/src/thrift/server/TNonblockingServer.h.orig	2015-10-13 19:19:36 UTC
>++++ lib/cpp/src/thrift/server/TNonblockingServer.h
>+@@ -41,6 +41,9 @@
>+ #include <event2/event_compat.h>
>+ #include <event2/event_struct.h>
>+ 
> +#include <sys/types.h>
> +#include <sys/socket.h>
>- 
>- 
>- namespace apache { namespace thrift { namespace server {
>++
>+ namespace apache {
>+ namespace thrift {
>+ namespace server {
>Index: thrift-cpp/pkg-plist
>===================================================================
>--- thrift-cpp/pkg-plist	(revision 399358)
>+++ thrift-cpp/pkg-plist	(working copy)
>@@ -2,7 +2,6 @@
> include/thrift/TDispatchProcessor.h
> include/thrift/TLogging.h
> include/thrift/TProcessor.h
>-include/thrift/TReflectionLocal.h
> include/thrift/Thrift.h
> include/thrift/async/TAsyncBufferProcessor.h
> include/thrift/async/TAsyncChannel.h
>@@ -37,7 +36,6 @@
> include/thrift/protocol/TCompactProtocol.h
> include/thrift/protocol/TCompactProtocol.tcc
> include/thrift/protocol/TDebugProtocol.h
>-include/thrift/protocol/TDenseProtocol.h
> include/thrift/protocol/TJSONProtocol.h
> include/thrift/protocol/TMultiplexedProtocol.h
> include/thrift/protocol/TProtocol.h
>@@ -75,7 +73,7 @@
> include/thrift/transport/TTransportUtils.h
> include/thrift/transport/TVirtualTransport.h
> include/thrift/transport/TZlibTransport.h
>-lib/libthrift-0.9.1.so
>+lib/libthrift-0.9.3.so
> lib/libthrift.a
> lib/libthrift.so
> lib/libthrift.so.0
>@@ -87,7 +85,7 @@
> %%QT4%%lib/libthriftqt.a
> %%QT4%%lib/libthriftqt.so
> %%QT4%%lib/libthriftqt.so.0
>-lib/libthriftz-0.9.1.so
>+lib/libthriftz-0.9.3.so
> lib/libthriftz.a
> lib/libthriftz.so
> lib/libthriftz.so.0

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 203767: 162026 | 162095 | 162097