Bump version to 0.31.0 (with patches)

3 files changed, 30 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d0b050d3880d..9f3449ee6b53 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
+# Generated by mksrcinfo v8
+# Sun Dec 27 21:51:03 UTC 2015
 pkgbase = fbthrift
 	pkgdesc = Facebook's branch of Apache Thrift, including a new C++ server
-	pkgver = 0.27.0
+	pkgver = 0.31.0
 	pkgrel = 1
 	url = https://github.com/facebook/fbthrift
 	arch = i686
 	arch = x86_64
 	license = Apache
 	makedepends = scons
-	depends = folly<=0.48.0
+	depends = folly
 	depends = krb5
 	depends = numactl
 	depends = python2
@@ -15,18 +17,18 @@ pkgbase = fbthrift
 	conflicts = thrift
 	options = !emptydirs
 	options = staticlibs
-	source = https://github.com/facebook/fbthrift/archive/v0.27.0.tar.gz
+	source = https://github.com/facebook/fbthrift/archive/v0.31.0.tar.gz
 	source = BinaryProtocol.h.patch
 	source = CompactProtocol.h.patch
 	source = Serializer.h.patch
 	source = Krb5CredentialsCacheManager.cpp.patch
-	source = t_rb_generator.cc.patch
-	md5sums = dc555767b60dc165c3c8ee9c1697dcae
+	source = GeneratedCodeHelper.h.patch
+	md5sums = 80d180ea65b03c7f68834159ab45a7ae
 	md5sums = 5a410a5ffdd4813f9844c06b37cdd048
 	md5sums = 067b4fc38a9e73cc06bd8d29eeb95c4f
 	md5sums = ae028ff57127ee3f3c44b5b592b09199
 	md5sums = bda963346b5171e59bacc0034868fa63
-	md5sums = 54be1e53c1bd49d2855a3c52e13ed137
+	md5sums = 15166953d352fdf64c1009a5b7dbdc6c
 
 pkgname = fbthrift
 
diff --git a/GeneratedCodeHelper.h.patch b/GeneratedCodeHelper.h.patch
new file mode 100644
index 000000000000..33161ddbdb04
--- /dev/null
+++ b/GeneratedCodeHelper.h.patch
@@ -0,0 +1,11 @@
+--- GeneratedCodeHelper.h~	2015-08-24 21:47:32.000000000 +0100
++++ GeneratedCodeHelper.h	2015-12-27 20:36:06.330000000 +0000
+@@ -921,7 +921,7 @@
+ void process_pmap(
+     Processor* proc,
+     const typename GeneratedAsyncProcessor::ProcessMap<
+-        typename GeneratedAsyncProcessor::ProcessFunc<
++        GeneratedAsyncProcessor::ProcessFunc<
+             Processor, ProtocolReader>>& pmap,
+     std::unique_ptr<ResponseChannel::Request> req,
+     std::unique_ptr<folly::IOBuf> buf,
diff --git a/PKGBUILD b/PKGBUILD
index a847fe4fd20e..13910ae92b0f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Daichi Shinozaki <dsdseg@gmail.com>
 pkgname=fbthrift
-pkgver=0.27.0
+pkgver=0.31.0
 pkgrel=1
 pkgdesc="Facebook's branch of Apache Thrift, including a new C++ server"
 arch=('i686' 'x86_64')
 url="https://github.com/facebook/fbthrift"
 license=('Apache')
-depends=('folly<=0.48.0' 'krb5' 'numactl' 'python2')
+depends=('folly' 'krb5' 'numactl' 'python2')
 conflicts=('thrift')
 provides=('thrift')
 makedepends=('scons')
@@ -16,14 +16,15 @@ source=("https://github.com/facebook/$pkgname/archive/v${pkgver}.tar.gz"
 'CompactProtocol.h.patch'
 'Serializer.h.patch'
 'Krb5CredentialsCacheManager.cpp.patch'
-'t_rb_generator.cc.patch'
+#'t_rb_generator.cc.patch'
+'GeneratedCodeHelper.h.patch'
 )
-md5sums=('dc555767b60dc165c3c8ee9c1697dcae'
+md5sums=('80d180ea65b03c7f68834159ab45a7ae'
          '5a410a5ffdd4813f9844c06b37cdd048'
          '067b4fc38a9e73cc06bd8d29eeb95c4f'
          'ae028ff57127ee3f3c44b5b592b09199'
          'bda963346b5171e59bacc0034868fa63'
-         '54be1e53c1bd49d2855a3c52e13ed137')
+         '15166953d352fdf64c1009a5b7dbdc6c')
 
 prepare() {
   cd "$pkgname-$pkgver/thrift"
@@ -31,7 +32,11 @@ prepare() {
   patch -p2 --verbose < $srcdir/CompactProtocol.h.patch
   patch -p2 --verbose < $srcdir/Serializer.h.patch
   patch -p2 --verbose < $srcdir/Krb5CredentialsCacheManager.cpp.patch
-  patch -p2 --verbose < $srcdir/t_rb_generator.cc.patch
+#  patch -p2 --verbose < $srcdir/t_rb_generator.cc.patch
+  cd lib/cpp2
+  patch -p0 --verbose < $srcdir/GeneratedCodeHelper.h.patch
+  cd ../../
+
   sed -ie '1 s/python/python2/' ./compiler/py/main.py
   # ArchLinux system has both libboost_python.so and libboost3_python.so.
   # Use python2 for build, so prevent libboost3_python.so to be chosen