[arch-commits] Commit in protobuf/trunk (PKGBUILD)

[Lukas Fleischer]

    Date: Sunday, July 22, 2018 @ 09:47:22
  Author: lfleischer
Revision: 329358

upgpkg: protobuf 3.6.0.1-1

Upstream update.

Modified:
  protobuf/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-22 06:56:10 UTC (rev 329357)
+++ PKGBUILD	2018-07-22 09:47:22 UTC (rev 329358)
@@ -8,9 +8,9 @@
 
 pkgbase='protobuf'
 pkgname=('protobuf' 'python2-protobuf' 'python-protobuf')
-pkgver=3.5.2
+pkgver=3.6.0.1
 _gtestver=1.8.0
-pkgrel=2
+pkgrel=1
 pkgdesc="Protocol Buffers - Google's data interchange format"
 arch=('x86_64')
 url='https://developers.google.com/protocol-buffers/'
@@ -19,17 +19,16 @@
 makedepends=('unzip' 'python-setuptools' 'python2-setuptools' 'clang')
 source=("$pkgbase-$pkgver.tgz::https://github.com/google/${pkgbase}/archive/v${pkgver}.tar.gz"
         "gtest-${_gtestver}.tar.gz::https://github.com/google/googletest/archive/release-${_gtestver}.tar.gz")
-md5sums=('ff6742018c172c66ecc627029ad54280'
+md5sums=('64827a068c449b5793ac4af886ea10a2'
          '16877098823401d1bf2ed7891d7dce36')
 
 prepare() {
   cd "$pkgbase-$pkgver"
 
-  rm -rf gmock && cp -r "$srcdir/googletest-release-${_gtestver}/googlemock" gmock
-  rm -rf googletest && cp -r "$srcdir/googletest-release-${_gtestver}/googletest" googletest
-  ln -sf ../googletest gmock/gtest
+  cp -r "$srcdir/googletest-release-${_gtestver}/googletest" third_party/googletest/googletest
+  cp -r "$srcdir/googletest-release-${_gtestver}/googlemock" third_party/googletest/googlemock
 
-  sed -r 's|/usr/bin/env python|/usr/bin/env python2|' -i googletest/scripts/*.py
+  sed -r 's|/usr/bin/env python|/usr/bin/env python2|' -i third_party/googletest/googletest/scripts/*.py
 }
 
 build() {
@@ -40,11 +39,13 @@
   cd "$srcdir/$pkgbase-$pkgver"
   ./autogen.sh
 
-  cd "$srcdir/$pkgbase-$pkgver/googletest"
+  cd "$srcdir/$pkgbase-$pkgver/third_party/googletest/googletest"
+  autoreconf -fiv
   ./configure
   make
 
-  cd "$srcdir/$pkgbase-$pkgver/gmock"
+  cd "$srcdir/$pkgbase-$pkgver/third_party/googletest/googlemock"
+  autoreconf -fiv
   ./configure
   make