From 60daf0ecc191e27673222fa5adbc2bc4e53948ac Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:15:53 -0400 Subject: [PATCH 01/27] protobuf18: fix update version detection --- srcpkgs/protobuf18/template | 8 ++------ srcpkgs/protobuf18/update | 2 ++ 2 files changed, 4 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/protobuf18/update diff --git a/srcpkgs/protobuf18/template b/srcpkgs/protobuf18/template index 5d40bf2dda8..4ac0fd3741d 100644 --- a/srcpkgs/protobuf18/template +++ b/srcpkgs/protobuf18/template @@ -1,7 +1,7 @@ # Template file for 'protobuf18' pkgname=protobuf18 version=3.7.1 -revision=3 +revision=4 wrksrc="protobuf-${version}" build_style=gnu-configure hostmakedepends="pkg-config automake libtool" @@ -14,11 +14,9 @@ changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt" distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz" checksum=f1748989842b46fa208b2a6e4e2785133cfcc3e4d43c17fecb023733f0f5443f -conflicts="protobuf>=3.11.2" - if [ "$CROSS_BUILD" ]; then # needs host protoc - hostmakedepends+=" protobuf" + hostmakedepends+=" ${pkgname}" configure_args+=" --with-protoc=/usr/bin/protoc" fi @@ -63,7 +61,6 @@ libprotoc18_package() { libprotoc18-devel_package() { depends="libprotoc18-${version}_${revision}" short_desc="Protocol buffers compiler library - development files" - conflicts="libprotoc-devel>=3.11.2" pkg_install() { vmove usr/lib/libprotoc.a vmove usr/lib/libprotoc.so @@ -76,7 +73,6 @@ protobuf18-devel_package() { libprotobuf18-${version}_${revision} libprotobuf18-lite-${version}_${revision}" short_desc="Protocol buffers C++ library - development files" - conflicts="protobuf-devel>=3.11.2" pkg_install() { vmove usr/include vmove usr/lib/libprotobuf.a diff --git a/srcpkgs/protobuf18/update b/srcpkgs/protobuf18/update new file mode 100644 index 00000000000..83ea5d6bd9b --- /dev/null +++ b/srcpkgs/protobuf18/update @@ -0,0 +1,2 @@ +site="https://github.com/protocolbuffers/protobuf/tags?after=v3.8.0-rc1" +pattern="v\K3\.7\.[\d.]*(?=.zip)" From 4ea4e0cb3ed4a5be8186b698927130328061d44d Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 22:11:58 -0400 Subject: [PATCH 02/27] protobuf: rename all packages with major version 22 --- srcpkgs/libprotobuf22 | 2 +- srcpkgs/libprotobuf22-lite | 2 +- srcpkgs/libprotoc-devel | 1 - srcpkgs/libprotoc22 | 2 +- srcpkgs/libprotoc22-devel | 1 + srcpkgs/protobuf-devel | 1 - srcpkgs/protobuf-lite | 1 - srcpkgs/protobuf22-devel | 1 + srcpkgs/{protobuf => protobuf22}/template | 24 +++++++++++------------ srcpkgs/protobuf22/update | 2 ++ 10 files changed, 18 insertions(+), 19 deletions(-) delete mode 120000 srcpkgs/libprotoc-devel create mode 120000 srcpkgs/libprotoc22-devel delete mode 120000 srcpkgs/protobuf-devel delete mode 120000 srcpkgs/protobuf-lite create mode 120000 srcpkgs/protobuf22-devel rename srcpkgs/{protobuf => protobuf22}/template (86%) create mode 100644 srcpkgs/protobuf22/update diff --git a/srcpkgs/libprotobuf22 b/srcpkgs/libprotobuf22 index 779a5a300bc..e533946003b 120000 --- a/srcpkgs/libprotobuf22 +++ b/srcpkgs/libprotobuf22 @@ -1 +1 @@ -protobuf \ No newline at end of file +protobuf22 \ No newline at end of file diff --git a/srcpkgs/libprotobuf22-lite b/srcpkgs/libprotobuf22-lite index 779a5a300bc..e533946003b 120000 --- a/srcpkgs/libprotobuf22-lite +++ b/srcpkgs/libprotobuf22-lite @@ -1 +1 @@ -protobuf \ No newline at end of file +protobuf22 \ No newline at end of file diff --git a/srcpkgs/libprotoc-devel b/srcpkgs/libprotoc-devel deleted file mode 120000 index 779a5a300bc..00000000000 --- a/srcpkgs/libprotoc-devel +++ /dev/null @@ -1 +0,0 @@ -protobuf \ No newline at end of file diff --git a/srcpkgs/libprotoc22 b/srcpkgs/libprotoc22 index 779a5a300bc..e533946003b 120000 --- a/srcpkgs/libprotoc22 +++ b/srcpkgs/libprotoc22 @@ -1 +1 @@ -protobuf \ No newline at end of file +protobuf22 \ No newline at end of file diff --git a/srcpkgs/libprotoc22-devel b/srcpkgs/libprotoc22-devel new file mode 120000 index 00000000000..e533946003b --- /dev/null +++ b/srcpkgs/libprotoc22-devel @@ -0,0 +1 @@ +protobuf22 \ No newline at end of file diff --git a/srcpkgs/protobuf-devel b/srcpkgs/protobuf-devel deleted file mode 120000 index 779a5a300bc..00000000000 --- a/srcpkgs/protobuf-devel +++ /dev/null @@ -1 +0,0 @@ -protobuf \ No newline at end of file diff --git a/srcpkgs/protobuf-lite b/srcpkgs/protobuf-lite deleted file mode 120000 index 779a5a300bc..00000000000 --- a/srcpkgs/protobuf-lite +++ /dev/null @@ -1 +0,0 @@ -protobuf \ No newline at end of file diff --git a/srcpkgs/protobuf22-devel b/srcpkgs/protobuf22-devel new file mode 120000 index 00000000000..e533946003b --- /dev/null +++ b/srcpkgs/protobuf22-devel @@ -0,0 +1 @@ +protobuf22 \ No newline at end of file diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf22/template similarity index 86% rename from srcpkgs/protobuf/template rename to srcpkgs/protobuf22/template index 072139255b5..da9ae727d90 100644 --- a/srcpkgs/protobuf/template +++ b/srcpkgs/protobuf22/template @@ -1,7 +1,8 @@ -# Template file for 'protobuf' -pkgname=protobuf +# Template file for 'protobuf22' +pkgname=protobuf22 version=3.11.4 -revision=1 +revision=2 +wrksrc="protobuf-${version}" build_style=gnu-configure hostmakedepends="pkg-config automake libtool" makedepends="zlib-devel" @@ -13,9 +14,11 @@ changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt" distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz" checksum=a79d19dcdf9139fa4b81206e318e33d245c4c9da1ffed21c87288ed4380426f9 +conflicts="protobuf18>=0" + if [ "$CROSS_BUILD" ]; then # needs host protoc - hostmakedepends+=" protobuf" + hostmakedepends+=" ${pkgname}" configure_args+=" --with-protoc=/usr/bin/protoc" fi @@ -61,9 +64,10 @@ libprotoc22_package() { } } -libprotoc-devel_package() { +libprotoc22-devel_package() { depends="libprotoc22-${version}_${revision}" short_desc="Protocol buffers compiler library - development files" + conflicts="libprotoc18-devel>=0" pkg_install() { vmove usr/lib/libprotoc.a vmove usr/lib/libprotoc.so @@ -71,11 +75,12 @@ libprotoc-devel_package() { } } -protobuf-devel_package() { +protobuf22-devel_package() { depends="zlib-devel libprotobuf22-${version}_${revision} libprotobuf22-lite-${version}_${revision}" short_desc="Protocol buffers C++ library - development files" + conflicts="protobuf18-devel>=0" pkg_install() { vmove usr/include vmove usr/lib/libprotobuf.a @@ -85,10 +90,3 @@ protobuf-devel_package() { vmove usr/lib/pkgconfig } } - -protobuf-lite_package() { - build_style=meta - short_desc="Protocol buffers C++ library (lite version)" - depends="libprotobuf22-lite-${version}_${revision}" - archs=noarch -} diff --git a/srcpkgs/protobuf22/update b/srcpkgs/protobuf22/update new file mode 100644 index 00000000000..a575dd0beea --- /dev/null +++ b/srcpkgs/protobuf22/update @@ -0,0 +1,2 @@ +site="https://github.com/protocolbuffers/protobuf/tags?after=v3.12.0-rc1" +pattern="v\K3\.11\.[\d.]*(?=.zip)" From 187c386743a5c9b4cd980a211a789064def5a20b Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:48:39 -0400 Subject: [PATCH 03/27] New package: protobuf23-3.12.1 --- common/shlibs | 3 ++ srcpkgs/libprotobuf23 | 1 + srcpkgs/libprotobuf23-lite | 1 + srcpkgs/libprotoc23 | 1 + srcpkgs/libprotoc23-devel | 1 + srcpkgs/protobuf23-devel | 1 + srcpkgs/protobuf23/template | 92 +++++++++++++++++++++++++++++++++++++ 7 files changed, 100 insertions(+) create mode 120000 srcpkgs/libprotobuf23 create mode 120000 srcpkgs/libprotobuf23-lite create mode 120000 srcpkgs/libprotoc23 create mode 120000 srcpkgs/libprotoc23-devel create mode 120000 srcpkgs/protobuf23-devel create mode 100644 srcpkgs/protobuf23/template diff --git a/common/shlibs b/common/shlibs index 3abd2bcda5e..dbcc5d03c88 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3075,6 +3075,9 @@ libprotobuf.so.18 libprotobuf18-3.7.0_1 libprotobuf-lite.so.22 libprotobuf22-lite-3.11.2_1 libprotoc.so.22 libprotoc22-3.11.2_1 libprotobuf.so.22 libprotobuf22-3.11.2_1 +libprotobuf-lite.so.23 libprotobuf23-lite-3.12.1_1 +libprotoc.so.23 libprotoc23-3.12.1_1 +libprotobuf.so.23 libprotobuf23-3.12.1_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/libprotobuf23 b/srcpkgs/libprotobuf23 new file mode 120000 index 00000000000..519d8fd3126 --- /dev/null +++ b/srcpkgs/libprotobuf23 @@ -0,0 +1 @@ +protobuf23 \ No newline at end of file diff --git a/srcpkgs/libprotobuf23-lite b/srcpkgs/libprotobuf23-lite new file mode 120000 index 00000000000..519d8fd3126 --- /dev/null +++ b/srcpkgs/libprotobuf23-lite @@ -0,0 +1 @@ +protobuf23 \ No newline at end of file diff --git a/srcpkgs/libprotoc23 b/srcpkgs/libprotoc23 new file mode 120000 index 00000000000..519d8fd3126 --- /dev/null +++ b/srcpkgs/libprotoc23 @@ -0,0 +1 @@ +protobuf23 \ No newline at end of file diff --git a/srcpkgs/libprotoc23-devel b/srcpkgs/libprotoc23-devel new file mode 120000 index 00000000000..519d8fd3126 --- /dev/null +++ b/srcpkgs/libprotoc23-devel @@ -0,0 +1 @@ +protobuf23 \ No newline at end of file diff --git a/srcpkgs/protobuf23-devel b/srcpkgs/protobuf23-devel new file mode 120000 index 00000000000..519d8fd3126 --- /dev/null +++ b/srcpkgs/protobuf23-devel @@ -0,0 +1 @@ +protobuf23 \ No newline at end of file diff --git a/srcpkgs/protobuf23/template b/srcpkgs/protobuf23/template new file mode 100644 index 00000000000..f88e9d4fc9e --- /dev/null +++ b/srcpkgs/protobuf23/template @@ -0,0 +1,92 @@ +# Template file for 'protobuf23' +pkgname=protobuf23 +version=3.12.1 +revision=1 +wrksrc="protobuf-${version}" +build_style=gnu-configure +hostmakedepends="pkg-config automake libtool" +makedepends="zlib-devel" +short_desc="Protocol buffers compiler" +maintainer="Michael Aldridge " +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=cb9b3f9d625b5739a358268eb3421de11cacd90025f5f7672c3930553eca810e + +conflicts="protobuf18>=0 protobuf22>=0" + +if [ "$CROSS_BUILD" ]; then + # needs host protoc + hostmakedepends+=" ${pkgname}" + configure_args+=" --with-protoc=/usr/bin/protoc" +fi + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" + LDFLAGS+=" -latomic" +fi + +pre_configure() { + autoreconf -fi +} + +do_configure() { + # configure doesn't set proper linker flags when discovering pthread + PTHREAD_LIBS="-pthread" PTHREAD_CFLAGS="-pthread" ./configure ${configure_args} +} + +post_install() { + vlicense LICENSE +} + +libprotobuf23_package() { + short_desc="Protocol buffers C++ library" + pkg_install() { + vmove "usr/lib/libprotobuf.so.*" + vlicense LICENSE + } +} + +libprotobuf23-lite_package() { + short_desc="Protocol buffers C++ library (lite version)" + pkg_install() { + vmove "usr/lib/libprotobuf-lite.so.*" + vlicense LICENSE + } +} + +libprotoc23_package() { + short_desc="Protocol buffers compiler library" + pkg_install() { + vmove "usr/lib/libprotoc*.so.*" + vlicense LICENSE + } +} + +libprotoc23-devel_package() { + depends="libprotoc23-${version}_${revision}" + short_desc="Protocol buffers compiler library - development files" + conflicts="libprotoc18-devel>=0 libprotoc22-devel>=0" + pkg_install() { + vmove usr/lib/libprotoc.a + vmove usr/lib/libprotoc.so + vmove usr/include/google/protobuf/compiler + } +} + +protobuf23-devel_package() { + depends="zlib-devel + libprotobuf23-${version}_${revision} + libprotobuf23-lite-${version}_${revision}" + short_desc="Protocol buffers C++ library - development files" + conflicts="protobuf18-devel>=0 protobuf22-devel>=0" + pkg_install() { + vmove usr/include + vmove usr/lib/libprotobuf.a + vmove usr/lib/libprotobuf-lite.a + vmove usr/lib/libprotobuf.so + vmove usr/lib/libprotobuf-lite.so + vmove usr/lib/pkgconfig + } +} From 5716ef86611c0d317130797de498f502e9e9c023 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:50:43 -0400 Subject: [PATCH 04/27] protobuf: upgrade to 3.12.1, move to meta-package --- srcpkgs/libprotoc-devel | 1 + srcpkgs/protobuf-devel | 1 + srcpkgs/protobuf-lite | 1 + srcpkgs/protobuf/template | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 35 insertions(+) create mode 120000 srcpkgs/libprotoc-devel create mode 120000 srcpkgs/protobuf-devel create mode 120000 srcpkgs/protobuf-lite create mode 100644 srcpkgs/protobuf/template diff --git a/srcpkgs/libprotoc-devel b/srcpkgs/libprotoc-devel new file mode 120000 index 00000000000..779a5a300bc --- /dev/null +++ b/srcpkgs/libprotoc-devel @@ -0,0 +1 @@ +protobuf \ No newline at end of file diff --git a/srcpkgs/protobuf-devel b/srcpkgs/protobuf-devel new file mode 120000 index 00000000000..779a5a300bc --- /dev/null +++ b/srcpkgs/protobuf-devel @@ -0,0 +1 @@ +protobuf \ No newline at end of file diff --git a/srcpkgs/protobuf-lite b/srcpkgs/protobuf-lite new file mode 120000 index 00000000000..779a5a300bc --- /dev/null +++ b/srcpkgs/protobuf-lite @@ -0,0 +1 @@ +protobuf \ No newline at end of file diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template new file mode 100644 index 00000000000..2407e30da9f --- /dev/null +++ b/srcpkgs/protobuf/template @@ -0,0 +1,32 @@ +# Template file for 'protobuf' +pkgname=protobuf +version=3.12.1 +revision=1 +archs=noarch +build_style=meta +depends="protobuf23" +short_desc="Protocol buffers compiler (meta package)" +maintainer="Andrew J. Hesford " +license="Public Domain" +homepage="https://www.voidlinux.org" + +protobuf-devel_package() { + archs=noarch + build_style=meta + short_desc="Protocol buffers C++ library - development files (meta package)" + depends="protobuf23-devel" +} + +protobuf-lite_package() { + archs=noarch + build_style=meta + short_desc="Protocol buffers C++ library - lite version (meta package)" + depends="libprotobuf23-lite" +} + +libprotoc-devel_package() { + archs=noarch + build_style=meta + short_desc="Protocol buffers compiler library - development files (meta package)" + depends="libprotoc23-devel" +} From f9f8c4f5a103f7dac8de5c4f64ee0ba6ee4caddc Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:24 -0400 Subject: [PATCH 05/27] EternalTerminal: revbump against protobuf 3.12.x --- srcpkgs/EternalTerminal/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template index c1cd574bf51..cf8eef864e1 100644 --- a/srcpkgs/EternalTerminal/template +++ b/srcpkgs/EternalTerminal/template @@ -1,7 +1,7 @@ # Template file for 'EternalTerminal' pkgname=EternalTerminal version=6.0.5 -revision=3 +revision=4 wrksrc="${pkgname}-et-v${version}" build_style=cmake hostmakedepends="protobuf" From 5a31c788a9e513282206e913d500d0b4c87bf423 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:24 -0400 Subject: [PATCH 06/27] astroid: revbump against protobuf 3.12.x --- srcpkgs/astroid/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template index e0c486a4a72..1b16201e5a0 100644 --- a/srcpkgs/astroid/template +++ b/srcpkgs/astroid/template @@ -1,7 +1,7 @@ # Template file for 'astroid' pkgname=astroid version=0.15 -revision=3 +revision=4 build_style=cmake hostmakedepends="pkg-config scdoc protobuf gobject-introspection" makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel From 4f211b4a47d998da1f166dd4cbe9d4ea5fb7e789 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:24 -0400 Subject: [PATCH 07/27] clementine: revbump against protobuf 3.12.x --- srcpkgs/clementine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template index 93c5a221dfc..52a025ea8d7 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -1,7 +1,7 @@ # Template file for 'clementine' pkgname=clementine version=1.3.1 -revision=23 +revision=24 _commit=75f18dab23f0842713a4200a7e362efd51b12e31 wrksrc="Clementine-${_commit}" build_style=cmake From 2cc9cf130b66697f89187fb859c7c35d7073a239 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:24 -0400 Subject: [PATCH 08/27] cura-engine: revbump against protobuf 3.12.x --- srcpkgs/cura-engine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template index 219f497f3cb..232aa6628c3 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.6.1 -revision=1 +revision=2 wrksrc="CuraEngine-${version}" build_style=cmake configure_args="-DCURA_ENGINE_VERSION=${version}" From 9db0bc115c5e9746cfc1c2f3ec19e5cb5b9c4b9e Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:24 -0400 Subject: [PATCH 09/27] grpc: revbump against protobuf 3.12.x --- srcpkgs/grpc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template index aeef3cb0836..3541d1370cf 100644 --- a/srcpkgs/grpc/template +++ b/srcpkgs/grpc/template @@ -1,7 +1,7 @@ # Template file for 'grpc' pkgname=grpc version=1.27.3 -revision=1 +revision=2 _abseilver=37dd2562ec830d547a1524bb306be313ac3f2556 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON From d0d63584b83af14188a5ec22c1d0b720a2db0af9 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:24 -0400 Subject: [PATCH 10/27] hyperion: revbump against protobuf 3.12.x --- srcpkgs/hyperion/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hyperion/template b/srcpkgs/hyperion/template index 09a2110bbac..77ee0545d08 100644 --- a/srcpkgs/hyperion/template +++ b/srcpkgs/hyperion/template @@ -1,7 +1,7 @@ # Template file for 'hyperion' pkgname=hyperion version=1.03.2 -revision=4 +revision=5 build_style=cmake configure_args="-DUSE_SYSTEM_PROTO_LIBS=ON -DENABLE_QT5=ON -DPROTOBUF_PROTOC_EXECUTABLE=/usr/bin/protoc -DENABLE_AMLOGIC=ON From bc4b638edf91c751a23f91c5f14bdf747d399ad1 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:25 -0400 Subject: [PATCH 11/27] kismet: revbump against protobuf 3.12.x --- srcpkgs/kismet/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kismet/template b/srcpkgs/kismet/template index c859b8652aa..b72b3ece0a2 100644 --- a/srcpkgs/kismet/template +++ b/srcpkgs/kismet/template @@ -1,7 +1,7 @@ # Template file for 'kismet' pkgname=kismet version=2020.04.R3 -revision=1 +revision=2 _realver="${version//./-}" wrksrc="${pkgname}-${_realver}" build_style=gnu-configure From 843062e7970bb2185933df4f5807c6875ae61363 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:25 -0400 Subject: [PATCH 12/27] libArcus: revbump against protobuf 3.12.x --- srcpkgs/libArcus/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template index 7677d4cc138..214628d6b00 100644 --- a/srcpkgs/libArcus/template +++ b/srcpkgs/libArcus/template @@ -1,7 +1,7 @@ # Template file for 'libArcus' pkgname=libArcus version=4.6.1 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_EXAMPLES=OFF" hostmakedepends="protobuf python3-sip-devel" From d8e43e095a6007d2b949959b8601b3ef970390ff Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:25 -0400 Subject: [PATCH 13/27] libcompizconfig: revbump against protobuf 3.12.x --- srcpkgs/libcompizconfig/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libcompizconfig/template b/srcpkgs/libcompizconfig/template index 16b1de55edc..3008f197e44 100644 --- a/srcpkgs/libcompizconfig/template +++ b/srcpkgs/libcompizconfig/template @@ -1,7 +1,7 @@ # Template file for 'libcompizconfig' pkgname=libcompizconfig version=0.8.18 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake intltool libtool pkg-config protobuf" From 71dfca60f802f5b69d11deb0b9f44db999676070 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:25 -0400 Subject: [PATCH 14/27] litecoin: revbump against protobuf 3.12.x --- srcpkgs/litecoin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template index 207b0bff782..c1f9eb22977 100644 --- a/srcpkgs/litecoin/template +++ b/srcpkgs/litecoin/template @@ -1,7 +1,7 @@ # Template file for 'litecoin' pkgname=litecoin version=0.17.1 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static --disable-tests --with-libressl" From a11f426762737c24faff53a6b1bd1549c194aae2 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:25 -0400 Subject: [PATCH 15/27] mixxx: revbump against protobuf 3.12.x --- srcpkgs/mixxx/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template index 1b0b06a1a63..9d1e32b4536 100644 --- a/srcpkgs/mixxx/template +++ b/srcpkgs/mixxx/template @@ -1,7 +1,7 @@ # Template file for 'mixxx' pkgname=mixxx version=2.2.3 -revision=2 +revision=3 wrksrc="mixxx-release-${version}" build_style=scons hostmakedepends="pkg-config protobuf" From d6415d4dd8389564e83a6ba4491b5a36342f08c2 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:25 -0400 Subject: [PATCH 16/27] mosh: revbump against protobuf 3.12.x --- srcpkgs/mosh/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template index ad93d97a071..780f0475149 100644 --- a/srcpkgs/mosh/template +++ b/srcpkgs/mosh/template @@ -1,7 +1,7 @@ # Template file for 'mosh' pkgname=mosh version=1.3.2 -revision=15 +revision=16 build_style=gnu-configure hostmakedepends="pkg-config protobuf" makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel" From be29bd5742ec416edb7f18bb314ba8d87280561c Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:25 -0400 Subject: [PATCH 17/27] mozc: revbump against protobuf 3.12.x --- srcpkgs/mozc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template index 69db0175f4b..82d137afca7 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=6 +revision=7 create_wrksrc=yes build_wrksrc=mozc/src hostmakedepends="gettext ninja pkg-config protobuf protobuf-devel python which" From 36a8ac4d516e5d045ae178b5be711da3f284e8b0 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:26 -0400 Subject: [PATCH 18/27] mumble: revbump against protobuf 3.12.x --- srcpkgs/mumble/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index acb8674c9ca..224a2713ebd 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -1,7 +1,7 @@ # Template file for 'mumble' pkgname=mumble version=1.3.0 -revision=4 +revision=5 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 From ec83080e330ec6b31908e2c5e12922f8ba16d4fb Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:26 -0400 Subject: [PATCH 19/27] nsjail: revbump against protobuf 3.12.x --- srcpkgs/nsjail/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template index 37e7ea17517..81025a90a8a 100644 --- a/srcpkgs/nsjail/template +++ b/srcpkgs/nsjail/template @@ -1,7 +1,7 @@ # Template file for 'nsjail' pkgname=nsjail version=2.9 -revision=3 +revision=4 build_style=gnu-makefile hostmakedepends="bison flex pkg-config protobuf which" makedepends="libnl3-devel protobuf-devel" From 0314914a5da9fc5763a8a1dcf52cb855fb53f168 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:26 -0400 Subject: [PATCH 20/27] paraview: revbump against protobuf 3.12.x --- srcpkgs/paraview/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template index 0d84e89aa1c..6a9fb234ab8 100644 --- a/srcpkgs/paraview/template +++ b/srcpkgs/paraview/template @@ -1,7 +1,7 @@ # Template file for 'paraview' pkgname=paraview version=5.6.1 -revision=4 +revision=5 wrksrc=ParaView-v${version} build_style=cmake configure_args="-DPARAVIEW_ENABLE_FFMPEG=ON From 9ab315aca9b995181a85ce8d1dc2ce299aef5ad2 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:26 -0400 Subject: [PATCH 21/27] protobuf-c: revbump against protobuf 3.12.x --- srcpkgs/protobuf-c/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/protobuf-c/template b/srcpkgs/protobuf-c/template index ee1d252ac3c..88cfe98147f 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.3 -revision=2 +revision=3 build_style=gnu-configure configure_args="$(vopt_enable protoc)" hostmakedepends="pkg-config protobuf" From ced55df3bcf31183e3eadda65019c430ed0c0075 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:26 -0400 Subject: [PATCH 22/27] strawberry: revbump against protobuf 3.12.x --- srcpkgs/strawberry/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template index 265063fe2fe..32c68417fb2 100644 --- a/srcpkgs/strawberry/template +++ b/srcpkgs/strawberry/template @@ -1,7 +1,7 @@ # Template file for 'strawberry' pkgname=strawberry version=0.6.10 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-devel protobuf gettext" makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel From b0e6a43177973d727664d4861b8f273acf3abdc1 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:26 -0400 Subject: [PATCH 23/27] sysdig: revbump against protobuf 3.12.x; fix checksum --- srcpkgs/sysdig/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template index c360a8049c8..b7f3c671bff 100644 --- a/srcpkgs/sysdig/template +++ b/srcpkgs/sysdig/template @@ -1,7 +1,7 @@ # Template file for 'sysdig' pkgname=sysdig version=0.26.7 -revision=1 +revision=2 archs="i686 x86_64 ppc64le" build_style=cmake configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF @@ -19,7 +19,7 @@ license="Apache-2.0, MIT, GPL-2.0-only" homepage="http://www.sysdig.org/" changelog="https://github.com/draios/sysdig/releases" distfiles="https://github.com/draios/${pkgname}/archive/${version}.tar.gz" -checksum=db9792847eceda29971c34fe1af4231ce719235382847850528c7f7b13dcdfc0 +checksum=c82aa4201e8ad37e22c780c27c28ac28359a8e677b4dc0ea295eb1452115d6c0 disable_parallel_build=yes dkms_modules="sysdig ${version}" nocross=yes From 347d9b463688e65d77938d22a0c1bb9e6f57d307 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:26 -0400 Subject: [PATCH 24/27] usbguard: revbump against protobuf 3.12.x --- srcpkgs/usbguard/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template index 6c40641ea3b..648100e36f0 100644 --- a/srcpkgs/usbguard/template +++ b/srcpkgs/usbguard/template @@ -1,7 +1,7 @@ # Template file for 'usbguard' pkgname=usbguard version=0.7.6 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-crypto-library=sodium --with-bundled-catch --with-bundled-pegtl" conf_files="/etc/usbguard/*" From 5e226edc4a27aadf47b718c6b7d7fe2a3747bea2 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:27 -0400 Subject: [PATCH 25/27] vlc: revbump against protobuf 3.12.x --- srcpkgs/vlc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index cc3631b09bc..03b262edf0c 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc version=3.0.10 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --enable-live555 --disable-fluidsynth --enable-dvdread From 57c938be09fc3cc5558da388590bbbada0cb4cb3 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:54:27 -0400 Subject: [PATCH 26/27] zbackup: revbump against protobuf 3.12.x --- srcpkgs/zbackup/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template index 9f2b7f8d236..ceea4527ffb 100644 --- a/srcpkgs/zbackup/template +++ b/srcpkgs/zbackup/template @@ -1,7 +1,7 @@ # Template file for 'zbackup' pkgname=zbackup version=1.4.4 -revision=16 +revision=17 build_style=cmake hostmakedepends="protobuf" makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel" From a8670869e9b3de2927af65c72f51cd0becf427aa Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:58:23 -0400 Subject: [PATCH 27/27] bitcoin: revbump against protobuf 3.12.x [ci skip] --- srcpkgs/bitcoin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template index 7f21abcfb15..4b74e47916c 100644 --- a/srcpkgs/bitcoin/template +++ b/srcpkgs/bitcoin/template @@ -1,7 +1,7 @@ # Template file for 'bitcoin' pkgname=bitcoin version=0.19.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-incompatible-bdb --disable-ccache --disable-static --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"