bump to 3.0.0

3 files changed, 8 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 461ce9308ada..99ac894e0af1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = arrow
 	pkgdesc = A columnar in-memory analytics layer for big data.
-	pkgver = 2.0.0
+	pkgver = 3.0.0
 	pkgrel = 1
 	url = https://arrow.apache.org
 	arch = x86_64
@@ -29,10 +29,8 @@ pkgbase = arrow
 	depends = zstd
 	provides = parquet-cpp
 	conflicts = parquet-cpp
-	source = https://github.com/apache/arrow/archive/apache-arrow-2.0.0.tar.gz
-	source = cmake.patch
-	sha256sums = ea299df9cf440cfc43393ce12ee6d9a4c9d0dfa9fde33c3bc9b70ec25520a844
-	sha256sums = d29fec6754e4eb29d2409e1a3fcddc64c674a108d43efd048286399f1035106e
+	source = https://github.com/apache/arrow/archive/apache-arrow-3.0.0.tar.gz
+	sha256sums = fc461c4f0a60e7470a7c58b28e9344aa8fb0be5cc982e9658970217e084c3a82
 
 pkgname = arrow
 
diff --git a/PKGBUILD b/PKGBUILD
index f284b109a313..f6dec08ba7d0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname='arrow'
 _pkgname='arrow-apache-arrow'
-pkgver=2.0.0
+pkgver=3.0.0
 pkgrel=1
 pkgdesc="A columnar in-memory analytics layer for big data."
 arch=('x86_64')
@@ -14,15 +14,8 @@ optdepends=()
 provides=('parquet-cpp')
 conflicts=('parquet-cpp')
 makedepends=('apache-orc' 'boost' 'cmake' 'flatbuffers' 'gmock' 'python-numpy')
-source=("https://github.com/apache/arrow/archive/apache-arrow-$pkgver.tar.gz"
-  "cmake.patch")
-sha256sums=('ea299df9cf440cfc43393ce12ee6d9a4c9d0dfa9fde33c3bc9b70ec25520a844'
-            'd29fec6754e4eb29d2409e1a3fcddc64c674a108d43efd048286399f1035106e')
-
-prepare(){
-  cd "$_pkgname-$pkgver"
-  patch -p1 -i ../cmake.patch
-}
+source=("https://github.com/apache/arrow/archive/apache-arrow-$pkgver.tar.gz")
+sha256sums=('fc461c4f0a60e7470a7c58b28e9344aa8fb0be5cc982e9658970217e084c3a82')
 
 build(){
   mkdir -p build
@@ -49,7 +42,8 @@ build(){
                                       -DARROW_GFLAGS_USE_SHARED=ON \
                                       -DARROW_USE_GLOG=ON \
                                       -DARROW_WITH_ZSTD=ON \
-                                      -DARROW_WITH_BROTLI=ON
+                                      -DARROW_WITH_BROTLI=ON \
+                                      -DARROW_WITH_RE2=OFF
   make
 }
 
diff --git a/cmake.patch b/cmake.patch
deleted file mode 100644
index 73685504ebe8..000000000000
--- a/cmake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN arrow-apache-arrow-1.0.1-orig/cpp/cmake_modules/ThirdpartyToolchain.cmake arrow-apache-arrow-1.0.1/cpp/cmake_modules/ThirdpartyToolchain.cmake
---- arrow-apache-arrow-1.0.1-orig/cpp/cmake_modules/ThirdpartyToolchain.cmake	2020-08-04 23:11:30.376315780 -0400
-+++ arrow-apache-arrow-1.0.1/cpp/cmake_modules/ThirdpartyToolchain.cmake	2020-08-04 23:12:37.803601116 -0400
-@@ -2468,7 +2468,7 @@
-     endif()
-   endif()
- 
--  get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin IMPORTED_LOCATION)
-+  get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin LOCATION)
-   if(NOT GRPC_CPP_PLUGIN)
-     get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin IMPORTED_LOCATION_RELEASE)
-   endif()