[arch-commits] Commit in rethinkdb/trunk (PKGBUILD protobuf-2.6-compat.patch)

2014-10-14 Thread Anatol Pomozov 
Date: Tuesday, October 14, 2014 @ 17:21:04
  Author: anatolik
Revision: 120646

upgpkg: rethinkdb 1.15.1-2

Modified:
  rethinkdb/trunk/PKGBUILD
Deleted:
  rethinkdb/trunk/protobuf-2.6-compat.patch

---+
 PKGBUILD  |   11 ---
 protobuf-2.6-compat.patch |   20 
 2 files changed, 4 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-14 14:55:08 UTC (rev 120645)
+++ PKGBUILD2014-10-14 15:21:04 UTC (rev 120646)
@@ -4,8 +4,8 @@
 # Contributor: Sigmund Lahn sigm...@lahn.no
 
 pkgname=rethinkdb
-pkgver=1.15.0
-_tag=rethinkdb-$pkgver-1
+pkgver=1.15.1
+_tag=rethinkdb-$pkgver
 pkgrel=2
 pkgdesc='An open-source distributed database built with love.'
 arch=(i686 x86_64)
@@ -21,13 +21,11 @@
   rethinkdb-tmpfile.conf
   rethinkdb.service
   boost_1.56_compat.patch
-  protobuf-2.6-compat.patch
 )
-sha256sums=('8cb1cdd176d9a6e87b315c65de084158a1b2fc9910127d21ec930181c52d838e'
+sha256sums=('b05184a812a3cc6f5140af4490ffee4fc69884b5b7963b64532ffc829c10f3f4'
 '656d3a42e75d087e723f71aa320fdd91cbbb82071ef72eb11fd3e4a619b429a4'
 'e56bffa2b9ebc3a00ef566ab2be0719a633c89d961a2461dfa2d9ffdb258c1a2'
-'1c55b12df452ceb2470d3ec48dde21bcdc2785be371f6f0858af034e282b1f21'
-'0bc035df3e84945efac2ed6e48c781e2a3a33b6e4f9a551ec9bc4958462e0bbe')
+'1c55b12df452ceb2470d3ec48dde21bcdc2785be371f6f0858af034e282b1f21')
 
 prepare() {
   cd $_tag
@@ -34,7 +32,6 @@
   # boost 1.56 workaround https://github.com/rethinkdb/rethinkdb/issues/3044
   rm src/unittest/print_secondary.cc
   patch -p1  ../boost_1.56_compat.patch
-  patch -p1  ../protobuf-2.6-compat.patch
 }
 
 build() {

Deleted: protobuf-2.6-compat.patch
===
--- protobuf-2.6-compat.patch   2014-10-14 14:55:08 UTC (rev 120645)
+++ protobuf-2.6-compat.patch   2014-10-14 15:21:04 UTC (rev 120646)
@@ -1,20 +0,0 @@
-commit 3d1d3cb6ac53a15996a8fc25df25c91e451f200b
-Author: Etienne Laurin at...@rethinkdb.com
-Date:   Thu Oct 2 18:55:36 2014 -0700
-
-allow building with protobuf 2.6.0
-
-OTS review by mlucy
-Closes #3137
-
-diff --git a/src/rdb_protocol/ql2_extensions.proto 
b/src/rdb_protocol/ql2_extensions.proto
-index 7cdfb2d..a2016b2 100644
 a/src/rdb_protocol/ql2_extensions.proto
-+++ b/src/rdb_protocol/ql2_extensions.proto
-@@ -3,5 +3,5 @@ package ql2.extension;
- import rdb_protocol/ql2.proto;
- 
- extend Term {
--required Backtrace backtrace = 1;
-+optional Backtrace backtrace = 1;
- };

[arch-commits] Commit in rethinkdb/trunk (PKGBUILD protobuf-2.6-compat.patch)

2014-10-03 Thread Anatol Pomozov 
Date: Saturday, October 4, 2014 @ 00:19:08
  Author: anatolik
Revision: 120118

upgpkg: rethinkdb 1.15.0-2

rebuild for protobuf-2.6.0

Added:
  rethinkdb/trunk/protobuf-2.6-compat.patch
Modified:
  rethinkdb/trunk/PKGBUILD

---+
 PKGBUILD  |7 +--
 protobuf-2.6-compat.patch |   20 
 2 files changed, 25 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-03 22:15:42 UTC (rev 120117)
+++ PKGBUILD2014-10-03 22:19:08 UTC (rev 120118)
@@ -6,7 +6,7 @@
 pkgname=rethinkdb
 pkgver=1.15.0
 _tag=rethinkdb-$pkgver-1
-pkgrel=1
+pkgrel=2
 pkgdesc='An open-source distributed database built with love.'
 arch=(i686 x86_64)
 url='http://www.rethinkdb.com/'
@@ -21,11 +21,13 @@
   rethinkdb-tmpfile.conf
   rethinkdb.service
   boost_1.56_compat.patch
+  protobuf-2.6-compat.patch
 )
 sha256sums=('8cb1cdd176d9a6e87b315c65de084158a1b2fc9910127d21ec930181c52d838e'
 '656d3a42e75d087e723f71aa320fdd91cbbb82071ef72eb11fd3e4a619b429a4'
 'e56bffa2b9ebc3a00ef566ab2be0719a633c89d961a2461dfa2d9ffdb258c1a2'
-'1c55b12df452ceb2470d3ec48dde21bcdc2785be371f6f0858af034e282b1f21')
+'1c55b12df452ceb2470d3ec48dde21bcdc2785be371f6f0858af034e282b1f21'
+'0bc035df3e84945efac2ed6e48c781e2a3a33b6e4f9a551ec9bc4958462e0bbe')
 
 prepare() {
   cd $_tag
@@ -32,6 +34,7 @@
   # boost 1.56 workaround https://github.com/rethinkdb/rethinkdb/issues/3044
   rm src/unittest/print_secondary.cc
   patch -p1  ../boost_1.56_compat.patch
+  patch -p1  ../protobuf-2.6-compat.patch
 }
 
 build() {

Added: protobuf-2.6-compat.patch
===
--- protobuf-2.6-compat.patch   (rev 0)
+++ protobuf-2.6-compat.patch   2014-10-03 22:19:08 UTC (rev 120118)
@@ -0,0 +1,20 @@
+commit 3d1d3cb6ac53a15996a8fc25df25c91e451f200b
+Author: Etienne Laurin at...@rethinkdb.com
+Date:   Thu Oct 2 18:55:36 2014 -0700
+
+allow building with protobuf 2.6.0
+
+OTS review by mlucy
+Closes #3137
+
+diff --git a/src/rdb_protocol/ql2_extensions.proto 
b/src/rdb_protocol/ql2_extensions.proto
+index 7cdfb2d..a2016b2 100644
+--- a/src/rdb_protocol/ql2_extensions.proto
 b/src/rdb_protocol/ql2_extensions.proto
+@@ -3,5 +3,5 @@ package ql2.extension;
+ import rdb_protocol/ql2.proto;
+ 
+ extend Term {
+-required Backtrace backtrace = 1;
++optional Backtrace backtrace = 1;
+ };