Byron Clark avatar Byron Clark committed fcaa459

Update to thrift 0.9.0.

Comments (0)

Files changed (3)

owned/thrift/PKGBUILD

 # Contributor: Byron Clark <byron@theclarkfamily.name>
 # based on thrift-git PKGBUILD
 pkgname=thrift
-pkgver=0.8.0
-pkgrel=4
+pkgver=0.9.0
+pkgrel=1
 pkgdesc="Scalable cross-language services framework for IPC/RPC"
 arch=(i686 x86_64)
 url="http://thrift.apache.org/"
             'perl: to use Perl bindings'
             'perl-bit-vector: to use Perl bindings'
             'perl-class-accessor: to use Perl bindings')
-options=(!emptydirs)
+options=(!emptydirs !makeflags)
 source=(http://www.apache.org/dist/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz
-        maven-repo-path.patch
-        thrift-phpext.patch)
-md5sums=('d29dfcd38d476cbc420b6f4d80ab966c'
-         '65bbe2a4260d9f7e3a8e385919788ff0'
-         '22ac4d4d06f2d61d6aa21607dd3c9743')
+        maven-repo-path.patch)
+md5sums=('beb2c8290e97c93e3b2844f558cc5c7d'
+         'bfcb3b12a8c07d5d0d9e96a7e712a74c')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
   patch -p1 -i $srcdir/maven-repo-path.patch
-  patch -p1 -i $srcdir/thrift-phpext.patch
 
   # apache-ant is not installed in a normal path location
   . /etc/profile.d/apache-ant.sh
 
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --without-ruby
-
+  make
 }
 
 package() {

owned/thrift/maven-repo-path.patch

-# HG changeset patch
-# Parent 2b3eae08cf81c23c638fa2e628fe3b2f848550b1
-
 diff --git a/lib/java/build.xml b/lib/java/build.xml
 --- a/lib/java/build.xml
 +++ b/lib/java/build.xml
-@@ -314,7 +314,9 @@
+@@ -317,7 +317,9 @@
      <artifact:writepom pomRefId="pom" file="${pom.xml}"/>
  
      <!-- Download the dependencies -->
  
      <!-- Copy the dependencies to the build/lib dir -->
      <copy todir="${build.dir}/lib">
-@@ -324,6 +326,7 @@
+@@ -327,6 +329,7 @@
  
      <!-- Dependencies needed for testing -->
      <artifact:dependencies filesetId="test-dependency-jars" useScope="runtime">

owned/thrift/thrift-phpext.patch

-diff -ru a/lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp b/lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp
---- a/lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp	2012-03-21 08:17:30.000000000 +0800
-+++ b/lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp	2012-03-21 08:18:29.000000000 +0800
-@@ -92,7 +92,7 @@
- #include "zend_exceptions.h"
- #include "php_thrift_protocol.h"
- 
--static function_entry thrift_protocol_functions[] = {
-+static zend_function_entry thrift_protocol_functions[] = {
-   PHP_FE(thrift_protocol_write_binary, NULL)
-   PHP_FE(thrift_protocol_read_binary, NULL)
-   {NULL, NULL, NULL}
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.