Date: Wednesday, December 26, 2018 @ 11:38:23 Author: svenstaro Revision: 342742
upgpkg: protobuf 3.6.1.3-1 Also enable cpp support to try to fix FS#60585. Modified: protobuf/trunk/PKGBUILD ----------+ PKGBUILD | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-12-26 02:35:24 UTC (rev 342741) +++ PKGBUILD 2018-12-26 11:38:23 UTC (rev 342742) @@ -8,7 +8,7 @@ pkgbase='protobuf' pkgname=('protobuf' 'python2-protobuf' 'python-protobuf') -pkgver=3.6.1 +pkgver=3.6.1.3 _gtestver=1.8.0 pkgrel=1 pkgdesc="Protocol Buffers - Google's data interchange format" @@ -16,10 +16,10 @@ url='https://developers.google.com/protocol-buffers/' license=('BSD') depends=('gcc-libs' 'zlib') -makedepends=('unzip' 'python-setuptools' 'python2-setuptools' 'clang') +makedepends=('unzip' 'python-setuptools' 'python2-setuptools') 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=('e8ce2659ea4f5df1a1e0dbd107dd61d9' +md5sums=('df2b44d14d8745c06232d90f35845765' '16877098823401d1bf2ed7891d7dce36') prepare() { @@ -32,10 +32,6 @@ } build() { - # GCC is stuck on src/google/protobuf/util/internal/protostream_objectsource_test.cc - # and src/google/protobuf/util/internal/protostream_objectwriter_test.cc. - export CC=/usr/bin/clang CXX=/usr/bin/clang++ - cd "$srcdir/$pkgbase-$pkgver" ./autogen.sh @@ -59,8 +55,6 @@ } package_protobuf() { - conflicts=('protobuf' 'protobuf-cpp') - provides=('protobuf' 'protobuf-cpp') replaces=('protobuf-cpp') cd "$srcdir/$pkgbase-$pkgver" @@ -73,11 +67,9 @@ package_python2-protobuf() { pkgdesc='Python 2 bindings for Google Protocol Buffers' depends=('python2' 'python2-six' "protobuf=$pkgver") - conflicts=('python2-protobuf') - provides=('python2-protobuf') cd "$srcdir/$pkgbase-$pkgver/python" - python2 setup.py install --root="$pkgdir" + python2 setup.py install --root="$pkgdir" --cpp_implementation install -d "$pkgdir/usr/share/licenses/$pkgname" ln -s "/usr/share/licenses/$pkgbase/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/" @@ -86,11 +78,9 @@ package_python-protobuf() { pkgdesc='Python 3 bindings for Google Protocol Buffers' depends=('python' 'python-six' "protobuf=$pkgver") - conflicts=('python-protobuf') - provides=('python-protobuf') cd "$srcdir/$pkgbase-$pkgver/python" - python3 setup.py install --root="$pkgdir" + python3 setup.py install --root="$pkgdir" --cpp_implementation install -d "$pkgdir/usr/share/licenses/$pkgname" ln -s "/usr/share/licenses/$pkgbase/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/"