From 615e85f533b3c62c384d4017a528d7c074a1bc20 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Fri, 31 Jan 2020 11:46:35 -0500 Subject: [PATCH] protobuf: update to 3.11.2 --- common/shlibs | 6 +++--- srcpkgs/EternalTerminal/template | 2 +- srcpkgs/astroid/template | 2 +- srcpkgs/clementine/template | 2 +- srcpkgs/cura-engine/template | 2 +- srcpkgs/grpc/template | 2 +- srcpkgs/hyperion/template | 2 +- srcpkgs/kismet/template | 2 +- srcpkgs/libArcus/template | 2 +- srcpkgs/libcompizconfig/template | 2 +- srcpkgs/{libprotobuf-lite18 => libprotobuf} | 0 srcpkgs/{libprotobuf18 => libprotobuf-lite} | 0 srcpkgs/{libprotoc18 => libprotoc} | 0 srcpkgs/litecoin/template | 2 +- srcpkgs/mixxx/template | 2 +- srcpkgs/mosh/template | 2 +- srcpkgs/mozc/template | 2 +- srcpkgs/mumble/template | 2 +- srcpkgs/nsjail/template | 2 +- srcpkgs/paraview/template | 2 +- srcpkgs/protobuf-c/template | 2 +- srcpkgs/protobuf/template | 23 ++++++++++++--------- srcpkgs/strawberry/template | 2 +- srcpkgs/sysdig/template | 2 +- srcpkgs/usbguard/template | 2 +- srcpkgs/vlc/template | 2 +- srcpkgs/zbackup/template | 2 +- 27 files changed, 38 insertions(+), 35 deletions(-) rename srcpkgs/{libprotobuf-lite18 => libprotobuf} (100%) rename srcpkgs/{libprotobuf18 => libprotobuf-lite} (100%) rename srcpkgs/{libprotoc18 => libprotoc} (100%) diff --git a/common/shlibs b/common/shlibs index b512768c75b..b6c96728c22 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3020,9 +3020,9 @@ libm17n-flt.so.0 m17n-lib-1.7.0_1 libm17n-gui.so.0 m17n-lib-1.7.0_1 libm17n-core.so.0 m17n-lib-1.7.0_1 libm17n.so.0 m17n-lib-1.7.0_1 -libprotobuf-lite.so.18 libprotobuf-lite18-3.7.0_1 -libprotoc.so.18 libprotoc18-3.7.0_1 -libprotobuf.so.18 libprotobuf18-3.7.0_1 +libprotobuf-lite.so.22 libprotobuf-lite-3.11.2_1 +libprotoc.so.22 libprotoc-3.11.2_1 +libprotobuf.so.22 libprotobuf-3.11.2_1 libsombok.so.3 sombok-2.4.0_1 libdeviceclient.so.0 pragha-1.3.3_1 libguile-srfi-srfi-1-v-3.so.3 guile1.8-1.8.8_1 diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template index e234e5ee896..c1cd574bf51 100644 --- a/srcpkgs/EternalTerminal/template +++ b/srcpkgs/EternalTerminal/template @@ -1,7 +1,7 @@ # Template file for 'EternalTerminal' pkgname=EternalTerminal version=6.0.5 -revision=2 +revision=3 wrksrc="${pkgname}-et-v${version}" build_style=cmake hostmakedepends="protobuf" diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template index 3d0fad865c5..e0c486a4a72 100644 --- a/srcpkgs/astroid/template +++ b/srcpkgs/astroid/template @@ -1,7 +1,7 @@ # Template file for 'astroid' pkgname=astroid version=0.15 -revision=2 +revision=3 build_style=cmake hostmakedepends="pkg-config scdoc protobuf gobject-introspection" makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template index bcbef4257d4..dc611f23cd5 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -1,7 +1,7 @@ # Template file for 'clementine' pkgname=clementine version=1.3.1 -revision=22 +revision=23 _commit=75f18dab23f0842713a4200a7e362efd51b12e31 wrksrc="Clementine-${_commit}" build_style=cmake diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template index ff6240ea2c2..510a1672b50 100644 --- a/srcpkgs/cura-engine/template +++ b/srcpkgs/cura-engine/template @@ -1,7 +1,7 @@ # Template file for 'cura-engine' pkgname=cura-engine version=4.4.1 -revision=1 +revision=2 wrksrc="CuraEngine-${version}" build_style=cmake configure_args="-DCURA_ENGINE_VERSION=${version}" diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template index 4dee11f5f3f..24ec61862f3 100644 --- a/srcpkgs/grpc/template +++ b/srcpkgs/grpc/template @@ -1,7 +1,7 @@ # Template file for 'grpc' pkgname=grpc version=1.26.0 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="prefix=\$(DESTDIR)/usr AROPTS=rc LD=\$(CC)" make_install_args="prefix=\$(DESTDIR)/usr" diff --git a/srcpkgs/hyperion/template b/srcpkgs/hyperion/template index 7ce415e929e..09a2110bbac 100644 --- a/srcpkgs/hyperion/template +++ b/srcpkgs/hyperion/template @@ -1,7 +1,7 @@ # Template file for 'hyperion' pkgname=hyperion version=1.03.2 -revision=3 +revision=4 build_style=cmake configure_args="-DUSE_SYSTEM_PROTO_LIBS=ON -DENABLE_QT5=ON -DPROTOBUF_PROTOC_EXECUTABLE=/usr/bin/protoc -DENABLE_AMLOGIC=ON diff --git a/srcpkgs/kismet/template b/srcpkgs/kismet/template index bb42be12bd5..ce34b424963 100644 --- a/srcpkgs/kismet/template +++ b/srcpkgs/kismet/template @@ -1,7 +1,7 @@ # Template file for 'kismet' pkgname=kismet version=2019.12.R2 -revision=1 +revision=2 _realver="${version//./-}" wrksrc="${pkgname}-${_realver}" build_style=gnu-configure diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template index 97cf6fbb930..3f4b5c69d81 100644 --- a/srcpkgs/libArcus/template +++ b/srcpkgs/libArcus/template @@ -1,7 +1,7 @@ # Template file for 'libArcus' pkgname=libArcus version=4.4.1 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_EXAMPLES=OFF" hostmakedepends="protobuf python3-sip-devel" diff --git a/srcpkgs/libcompizconfig/template b/srcpkgs/libcompizconfig/template index 3d66d68de48..6fadb4059f0 100644 --- a/srcpkgs/libcompizconfig/template +++ b/srcpkgs/libcompizconfig/template @@ -1,7 +1,7 @@ # Template file for 'libcompizconfig' pkgname=libcompizconfig version=0.8.16 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake intltool libtool pkg-config protobuf" diff --git a/srcpkgs/libprotobuf-lite18 b/srcpkgs/libprotobuf similarity index 100% rename from srcpkgs/libprotobuf-lite18 rename to srcpkgs/libprotobuf diff --git a/srcpkgs/libprotobuf18 b/srcpkgs/libprotobuf-lite similarity index 100% rename from srcpkgs/libprotobuf18 rename to srcpkgs/libprotobuf-lite diff --git a/srcpkgs/libprotoc18 b/srcpkgs/libprotoc similarity index 100% rename from srcpkgs/libprotoc18 rename to srcpkgs/libprotoc diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template index e1a443563d9..207b0bff782 100644 --- a/srcpkgs/litecoin/template +++ b/srcpkgs/litecoin/template @@ -1,7 +1,7 @@ # Template file for 'litecoin' pkgname=litecoin version=0.17.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static --disable-tests --with-libressl" diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template index 08857d07f63..af406613a07 100644 --- a/srcpkgs/mixxx/template +++ b/srcpkgs/mixxx/template @@ -1,7 +1,7 @@ # Template file for 'mixxx' pkgname=mixxx version=2.2.2 -revision=1 +revision=2 wrksrc="mixxx-release-${version}" build_style=scons hostmakedepends="pkg-config protobuf" diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template index ac3d8112a79..ad93d97a071 100644 --- a/srcpkgs/mosh/template +++ b/srcpkgs/mosh/template @@ -1,7 +1,7 @@ # Template file for 'mosh' pkgname=mosh version=1.3.2 -revision=14 +revision=15 build_style=gnu-configure hostmakedepends="pkg-config protobuf" makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel" diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template index ade9bdabefc..4673405a633 100644 --- a/srcpkgs/mozc/template +++ b/srcpkgs/mozc/template @@ -1,7 +1,7 @@ # Template file for 'mozc' pkgname=mozc version=2.23.2815.102 -revision=5 +revision=6 create_wrksrc=yes build_wrksrc=mozc/src hostmakedepends="ninja pkg-config protobuf protobuf-devel python" diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index 31305a5601e..9b5ef0c76fc 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -1,7 +1,7 @@ # Template file for 'mumble' pkgname=mumble version=1.3.0 -revision=1 +revision=2 build_style=qmake configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template index 3cec6c688f5..fd07ed4bd8c 100644 --- a/srcpkgs/nsjail/template +++ b/srcpkgs/nsjail/template @@ -1,7 +1,7 @@ # Template file for 'nsjail' pkgname=nsjail version=2.9 -revision=2 +revision=3 build_style=gnu-makefile hostmakedepends="bison flex pkg-config protobuf" makedepends="libnl3-devel protobuf-devel" diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template index 615f8d9b0cf..e476e84d543 100644 --- a/srcpkgs/paraview/template +++ b/srcpkgs/paraview/template @@ -1,7 +1,7 @@ # Template file for 'paraview' pkgname=paraview version=5.6.1 -revision=3 +revision=4 wrksrc=ParaView-v${version} build_style=cmake configure_args="-DPARAVIEW_ENABLE_FFMPEG=ON diff --git a/srcpkgs/protobuf-c/template b/srcpkgs/protobuf-c/template index c2056413a56..1f85af52108 100644 --- a/srcpkgs/protobuf-c/template +++ b/srcpkgs/protobuf-c/template @@ -1,7 +1,7 @@ # Template file for 'protobuf-c' pkgname=protobuf-c version=1.3.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="$(vopt_enable protoc)" hostmakedepends="pkg-config protobuf" diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template index 9200764343b..599ee2ed359 100644 --- a/srcpkgs/protobuf/template +++ b/srcpkgs/protobuf/template @@ -1,7 +1,7 @@ # Template file for 'protobuf' pkgname=protobuf -version=3.7.1 -revision=2 +version=3.11.2 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config automake libtool" makedepends="zlib-devel" @@ -11,7 +11,7 @@ license="BSD-3-Clause" homepage="https://developers.google.com/protocol-buffers/" changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt" distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz" -checksum=f1748989842b46fa208b2a6e4e2785133cfcc3e4d43c17fecb023733f0f5443f +checksum=e8c7601439dbd4489fe5069c33d374804990a56c2f710e00227ee5d8fd650e67 if [ "$CROSS_BUILD" ]; then # needs host protoc @@ -34,24 +34,27 @@ post_install() { vlicense LICENSE } -libprotobuf18_package() { +libprotobuf_package() { short_desc="Protocol buffers C++ library" + replaces="libprotobuf18>=0" pkg_install() { vmove "usr/lib/libprotobuf.so.*" vlicense LICENSE } } -libprotobuf-lite18_package() { +libprotobuf-lite_package() { short_desc="Protocol buffers C++ library (lite version)" + replaces="libprotobuf-lite18>=0" pkg_install() { vmove "usr/lib/libprotobuf-lite.so.*" vlicense LICENSE } } -libprotoc18_package() { +libprotoc_package() { short_desc="Protocol buffers compiler library" + replaces="libprotoc18>=0" pkg_install() { vmove "usr/lib/libprotoc*.so.*" vlicense LICENSE @@ -59,7 +62,7 @@ libprotoc18_package() { } libprotoc-devel_package() { - depends="libprotoc18-${version}_${revision}" + depends="libprotoc-${version}_${revision}" short_desc="Protocol buffers compiler library - development files" pkg_install() { vmove usr/lib/libprotoc.a @@ -70,8 +73,8 @@ libprotoc-devel_package() { protobuf-devel_package() { depends="zlib-devel - libprotobuf18-${version}_${revision} - libprotobuf-lite18-${version}_${revision}" + libprotobuf-${version}_${revision} + libprotobuf-lite-${version}_${revision}" short_desc="Protocol buffers C++ library - development files" pkg_install() { vmove usr/include @@ -86,6 +89,6 @@ protobuf-devel_package() { protobuf-lite_package() { build_style=meta short_desc="Protocol buffers C++ library (lite version)" - depends="libprotobuf-lite18-${version}_${revision}" + depends="libprotobuf-lite-${version}_${revision}" archs=noarch } diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template index 10c6ad626a6..527300391c3 100644 --- a/srcpkgs/strawberry/template +++ b/srcpkgs/strawberry/template @@ -1,7 +1,7 @@ # Template file for 'strawberry' pkgname=strawberry version=0.6.5 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-devel protobuf" makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template index 7be9e2aee17..a02d4fb168c 100644 --- a/srcpkgs/sysdig/template +++ b/srcpkgs/sysdig/template @@ -1,7 +1,7 @@ # Template file for 'sysdig' pkgname=sysdig version=0.26.5 -revision=2 +revision=3 archs="i686 x86_64 ppc64le" build_style=cmake configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template index 8811663093f..6c40641ea3b 100644 --- a/srcpkgs/usbguard/template +++ b/srcpkgs/usbguard/template @@ -1,7 +1,7 @@ # Template file for 'usbguard' pkgname=usbguard version=0.7.6 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-crypto-library=sodium --with-bundled-catch --with-bundled-pegtl" conf_files="/etc/usbguard/*" diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index e5a37aecedc..564c21a9601 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc version=3.0.8 -revision=7 +revision=8 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --enable-live555 --disable-fluidsynth --enable-dvdread diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template index 68438296b7b..dea9ae2fb7b 100644 --- a/srcpkgs/zbackup/template +++ b/srcpkgs/zbackup/template @@ -1,7 +1,7 @@ # Template file for 'zbackup' pkgname=zbackup version=1.4.4 -revision=15 +revision=16 build_style=cmake hostmakedepends="protobuf" makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"