From 3447ceb45753322411fd2989daa3f7ddcedffbf4 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 08:15:05 -0500 Subject: [PATCH 01/25] protobuf: rename all packages with major version 18 --- common/shlibs | 2 +- srcpkgs/libprotobuf-lite18 | 1 - srcpkgs/libprotobuf18 | 2 +- srcpkgs/libprotobuf18-lite | 1 + srcpkgs/libprotoc-devel | 1 - srcpkgs/libprotoc18 | 2 +- srcpkgs/libprotoc18-devel | 1 + srcpkgs/protobuf-devel | 1 - srcpkgs/protobuf-lite | 1 - srcpkgs/protobuf18-devel | 1 + srcpkgs/protobuf18-lite | 1 + .../patches/musl-fix.patch | 0 srcpkgs/{protobuf => protobuf18}/template | 24 ++++++++++++------- 13 files changed, 22 insertions(+), 16 deletions(-) delete mode 120000 srcpkgs/libprotobuf-lite18 create mode 120000 srcpkgs/libprotobuf18-lite delete mode 120000 srcpkgs/libprotoc-devel create mode 120000 srcpkgs/libprotoc18-devel delete mode 120000 srcpkgs/protobuf-devel delete mode 120000 srcpkgs/protobuf-lite create mode 120000 srcpkgs/protobuf18-devel create mode 120000 srcpkgs/protobuf18-lite rename srcpkgs/{protobuf => protobuf18}/patches/musl-fix.patch (100%) rename srcpkgs/{protobuf => protobuf18}/template (81%) diff --git a/common/shlibs b/common/shlibs index b512768c75b..17b018d4537 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3020,7 +3020,7 @@ 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 +libprotobuf-lite.so.18 libprotobuf18-lite-3.7.1_3 libprotoc.so.18 libprotoc18-3.7.0_1 libprotobuf.so.18 libprotobuf18-3.7.0_1 libsombok.so.3 sombok-2.4.0_1 diff --git a/srcpkgs/libprotobuf-lite18 b/srcpkgs/libprotobuf-lite18 deleted file mode 120000 index 779a5a300bc..00000000000 --- a/srcpkgs/libprotobuf-lite18 +++ /dev/null @@ -1 +0,0 @@ -protobuf \ No newline at end of file diff --git a/srcpkgs/libprotobuf18 b/srcpkgs/libprotobuf18 index 779a5a300bc..a7f3e3e0d06 120000 --- a/srcpkgs/libprotobuf18 +++ b/srcpkgs/libprotobuf18 @@ -1 +1 @@ -protobuf \ No newline at end of file +protobuf18 \ No newline at end of file diff --git a/srcpkgs/libprotobuf18-lite b/srcpkgs/libprotobuf18-lite new file mode 120000 index 00000000000..a7f3e3e0d06 --- /dev/null +++ b/srcpkgs/libprotobuf18-lite @@ -0,0 +1 @@ +protobuf18 \ 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/libprotoc18 b/srcpkgs/libprotoc18 index 779a5a300bc..a7f3e3e0d06 120000 --- a/srcpkgs/libprotoc18 +++ b/srcpkgs/libprotoc18 @@ -1 +1 @@ -protobuf \ No newline at end of file +protobuf18 \ No newline at end of file diff --git a/srcpkgs/libprotoc18-devel b/srcpkgs/libprotoc18-devel new file mode 120000 index 00000000000..a7f3e3e0d06 --- /dev/null +++ b/srcpkgs/libprotoc18-devel @@ -0,0 +1 @@ +protobuf18 \ 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/protobuf18-devel b/srcpkgs/protobuf18-devel new file mode 120000 index 00000000000..a7f3e3e0d06 --- /dev/null +++ b/srcpkgs/protobuf18-devel @@ -0,0 +1 @@ +protobuf18 \ No newline at end of file diff --git a/srcpkgs/protobuf18-lite b/srcpkgs/protobuf18-lite new file mode 120000 index 00000000000..a7f3e3e0d06 --- /dev/null +++ b/srcpkgs/protobuf18-lite @@ -0,0 +1 @@ +protobuf18 \ No newline at end of file diff --git a/srcpkgs/protobuf/patches/musl-fix.patch b/srcpkgs/protobuf18/patches/musl-fix.patch similarity index 100% rename from srcpkgs/protobuf/patches/musl-fix.patch rename to srcpkgs/protobuf18/patches/musl-fix.patch diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf18/template similarity index 81% rename from srcpkgs/protobuf/template rename to srcpkgs/protobuf18/template index 9200764343b..ab7fb8f9b6a 100644 --- a/srcpkgs/protobuf/template +++ b/srcpkgs/protobuf18/template @@ -1,7 +1,8 @@ -# Template file for 'protobuf' -pkgname=protobuf +# Template file for 'protobuf18' +pkgname=protobuf18 version=3.7.1 -revision=2 +revision=3 +wrksrc="protobuf-${version}" build_style=gnu-configure hostmakedepends="pkg-config automake libtool" makedepends="zlib-devel" @@ -13,6 +14,8 @@ 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" @@ -42,8 +45,9 @@ libprotobuf18_package() { } } -libprotobuf-lite18_package() { +libprotobuf18-lite_package() { short_desc="Protocol buffers C++ library (lite version)" + replaces="libprotobuf-lite18>=0" pkg_install() { vmove "usr/lib/libprotobuf-lite.so.*" vlicense LICENSE @@ -58,9 +62,10 @@ libprotoc18_package() { } } -libprotoc-devel_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 @@ -68,11 +73,12 @@ libprotoc-devel_package() { } } -protobuf-devel_package() { +protobuf18-devel_package() { depends="zlib-devel libprotobuf18-${version}_${revision} - libprotobuf-lite18-${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 @@ -83,9 +89,9 @@ protobuf-devel_package() { } } -protobuf-lite_package() { +protobuf18-lite_package() { build_style=meta short_desc="Protocol buffers C++ library (lite version)" - depends="libprotobuf-lite18-${version}_${revision}" + depends="libprotobuf18-lite-${version}_${revision}" archs=noarch } From e50ca06b0cbeab823834fc2a15fdb7446807d963 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 08:29:34 -0500 Subject: [PATCH 02/25] protobuf: upgrade to 3.11.2 --- common/shlibs | 3 ++ srcpkgs/libprotobuf22 | 1 + srcpkgs/libprotobuf22-lite | 1 + srcpkgs/libprotoc-devel | 1 + srcpkgs/libprotoc22 | 1 + srcpkgs/protobuf-devel | 1 + srcpkgs/protobuf-lite | 1 + srcpkgs/protobuf/template | 96 ++++++++++++++++++++++++++++++++++++++ 8 files changed, 105 insertions(+) create mode 120000 srcpkgs/libprotobuf22 create mode 120000 srcpkgs/libprotobuf22-lite create mode 120000 srcpkgs/libprotoc-devel create mode 120000 srcpkgs/libprotoc22 create mode 120000 srcpkgs/protobuf-devel create mode 120000 srcpkgs/protobuf-lite create mode 100644 srcpkgs/protobuf/template diff --git a/common/shlibs b/common/shlibs index 17b018d4537..2a7f41e60c7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3023,6 +3023,9 @@ libm17n.so.0 m17n-lib-1.7.0_1 libprotobuf-lite.so.18 libprotobuf18-lite-3.7.1_3 libprotoc.so.18 libprotoc18-3.7.0_1 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 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/libprotobuf22 b/srcpkgs/libprotobuf22 new file mode 120000 index 00000000000..779a5a300bc --- /dev/null +++ b/srcpkgs/libprotobuf22 @@ -0,0 +1 @@ +protobuf \ No newline at end of file diff --git a/srcpkgs/libprotobuf22-lite b/srcpkgs/libprotobuf22-lite new file mode 120000 index 00000000000..779a5a300bc --- /dev/null +++ b/srcpkgs/libprotobuf22-lite @@ -0,0 +1 @@ +protobuf \ No newline at end of file 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/libprotoc22 b/srcpkgs/libprotoc22 new file mode 120000 index 00000000000..779a5a300bc --- /dev/null +++ b/srcpkgs/libprotoc22 @@ -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..fb0e8cfbfac --- /dev/null +++ b/srcpkgs/protobuf/template @@ -0,0 +1,96 @@ +# Template file for 'protobuf' +pkgname=protobuf +version=3.11.2 +revision=1 +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=e8c7601439dbd4489fe5069c33d374804990a56c2f710e00227ee5d8fd650e67 + +if [ "$CROSS_BUILD" ]; then + # needs host protoc + hostmakedepends+=" protobuf" + configure_args+=" --with-protoc=/usr/bin/protoc" +fi + +case "$XBPS_TARGET_MACHINE" in + armv[56]*|mips*|ppc|ppc-musl) + makedepends+=" libatomic-devel" + LDFLAGS+=" -latomic" + ;; +esac + +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 +} + +libprotobuf22_package() { + short_desc="Protocol buffers C++ library" + pkg_install() { + vmove "usr/lib/libprotobuf.so.*" + vlicense LICENSE + } +} + +libprotobuf22-lite_package() { + short_desc="Protocol buffers C++ library (lite version)" + pkg_install() { + vmove "usr/lib/libprotobuf-lite.so.*" + vlicense LICENSE + } +} + +libprotoc22_package() { + short_desc="Protocol buffers compiler library" + pkg_install() { + vmove "usr/lib/libprotoc*.so.*" + vlicense LICENSE + } +} + +libprotoc-devel_package() { + depends="libprotoc22-${version}_${revision}" + short_desc="Protocol buffers compiler library - development files" + pkg_install() { + vmove usr/lib/libprotoc.a + vmove usr/lib/libprotoc.so + vmove usr/include/google/protobuf/compiler + } +} + +protobuf-devel_package() { + depends="zlib-devel + libprotobuf22-${version}_${revision} + libprotobuf22-lite-${version}_${revision}" + short_desc="Protocol buffers C++ library - development files" + 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 + } +} + +protobuf-lite_package() { + build_style=meta + short_desc="Protocol buffers C++ library (lite version)" + depends="libprotobuf22-lite-${version}_${revision}" + archs=noarch +} From c120d9381fa424b5d4e2ef9cd2ec6c8c7beca9a8 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 08:46:27 -0500 Subject: [PATCH 03/25] EternalTerminal: update to protobuf 3.11.2 --- srcpkgs/EternalTerminal/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From d0c44cfacc3f7136ea9813574d3e717c9cfdf73d Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 08:46:27 -0500 Subject: [PATCH 04/25] astroid: update to protobuf 3.11.2 --- srcpkgs/astroid/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 6b2914b5204d2daba28f7f8e15d5648578c92fe0 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 08:46:27 -0500 Subject: [PATCH 05/25] cura-engine: update to protobuf 3.11.2 --- 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 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}" From 17962b9273bd186a616b6c0dfdf95f056b81ac26 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 08:46:27 -0500 Subject: [PATCH 06/25] hyperion: update to protobuf 3.11.2 --- srcpkgs/hyperion/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From c6dcfdd49387baa6cd36dd08a470fa69c1c5ca4e Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 08:46:27 -0500 Subject: [PATCH 07/25] kismet: update to protobuf 3.11.2 --- srcpkgs/kismet/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 8407cc511b256ffc69297e1da2d8a5fcd4c49abd Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 08:46:27 -0500 Subject: [PATCH 08/25] libArcus: update to protobuf 3.11.2 --- srcpkgs/libArcus/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From af7acaee7b7bdeef0cb7b8e288b82e27fd776a43 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 08:46:27 -0500 Subject: [PATCH 09/25] libcompizconfig: update to protobuf 3.11.2 --- srcpkgs/libcompizconfig/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From 188810821879d22302ca2a3428c975d532d7c61c Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 08:46:28 -0500 Subject: [PATCH 10/25] litecoin: update to protobuf 3.11.2 --- srcpkgs/litecoin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From d4581a386f13f98db6cf1406572ab2dbb11d1b9e Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 08:46:28 -0500 Subject: [PATCH 11/25] mixxx: update to protobuf 3.11.2 --- srcpkgs/mixxx/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From edbb2f46f35091b091dcad2091a9fa396ff3cbab Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 08:46:28 -0500 Subject: [PATCH 12/25] mosh: update to protobuf 3.11.2 --- srcpkgs/mosh/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From 685ce326f4fd9a2276a7505185fd2a6ad5bb6513 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 08:46:28 -0500 Subject: [PATCH 13/25] mumble: update to protobuf 3.11.2 --- srcpkgs/mumble/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 187d4b1fdaa93d15bd1e2be7ba24d38523f0cea0 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 08:46:28 -0500 Subject: [PATCH 14/25] paraview: update to protobuf 3.11.2 --- srcpkgs/paraview/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From c931416af087d1e9f614c3bea23762669c4a62ae Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 08:46:28 -0500 Subject: [PATCH 15/25] protobuf-c: update to protobuf 3.11.2 --- 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 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" From 551da33f415f929769e5ea4dec79042987041fc0 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 08:46:28 -0500 Subject: [PATCH 16/25] strawberry: update to protobuf 3.11.2 --- srcpkgs/strawberry/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From da220776a39a2822fd6e3f9893ba77bb09505d20 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 08:46:28 -0500 Subject: [PATCH 17/25] sysdig: update to protobuf 3.11.2 --- srcpkgs/sysdig/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 7eebc22a437319decd7b24f5b419074dd0beebcc Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 08:46:29 -0500 Subject: [PATCH 18/25] usbguard: update to protobuf 3.11.2 --- srcpkgs/usbguard/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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/*" From 1befdd541bda1cb56197506f87a835ddffaa9ebb Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 09:08:23 -0500 Subject: [PATCH 19/25] clementine: revbump against protobuf --- srcpkgs/clementine/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template index bcbef4257d4..93c5a221dfc 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -1,12 +1,12 @@ # Template file for 'clementine' pkgname=clementine version=1.3.1 -revision=22 +revision=23 _commit=75f18dab23f0842713a4200a7e362efd51b12e31 wrksrc="Clementine-${_commit}" build_style=cmake configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF" -hostmakedepends="sparsehash pkg-config qt5-qmake qt5-host-tools protobuf" +hostmakedepends="gettext sparsehash pkg-config qt5-qmake qt5-host-tools protobuf" makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel liblastfm-devel qt5-devel glew-devel sqlite-devel protobuf-devel libplist-devel libusbmuxd-devel libmtp-devel libcdio-devel pulseaudio-devel glu-devel From 1802ca1ea3591c29226e6bf4ab06ca481dbd7bb9 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 09:09:23 -0500 Subject: [PATCH 20/25] grpc: revbump against protobuf, cleanup --- srcpkgs/grpc/template | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template index 4dee11f5f3f..c2d7f21a8e3 100644 --- a/srcpkgs/grpc/template +++ b/srcpkgs/grpc/template @@ -1,11 +1,11 @@ # 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" -hostmakedepends="protobuf" +hostmakedepends="which protobuf" makedepends="zlib-devel c-ares-devel libressl-devel libprotoc-devel protobuf-devel gperftools-devel" short_desc="High performance, open source, general RPC framework" @@ -19,9 +19,6 @@ nocross=yes post_extract() { sed -r 's/-Werror//g;/ldconfig/d;s/ strip-(static|shared)_c(xx)? / /' -i Makefile } -post_install() { - vlicense NOTICE.txt -} grpc-devel_package() { short_desc+=" - development files" From 66f45e523a237cfdc4ed2fa975cc0e2f87282fb7 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 09:10:54 -0500 Subject: [PATCH 21/25] mozc: revbump against protobuf, cleanup --- srcpkgs/mozc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template index ade9bdabefc..69db0175f4b 100644 --- a/srcpkgs/mozc/template +++ b/srcpkgs/mozc/template @@ -1,10 +1,10 @@ # 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" +hostmakedepends="gettext ninja pkg-config protobuf protobuf-devel python which" makedepends="gtk+-devel ibus-devel libzinnia-devel protobuf-devel qt5-devel fcitx-devel" depends="tegaki-zinnia-japanese>=0.3" From 78d283b56c358740f0acbbaaf11ff9a0eba738f4 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 09:11:55 -0500 Subject: [PATCH 22/25] nsjail: revbump against protobuf, cleanup --- srcpkgs/nsjail/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template index 3cec6c688f5..bbe51994162 100644 --- a/srcpkgs/nsjail/template +++ b/srcpkgs/nsjail/template @@ -1,9 +1,9 @@ # Template file for 'nsjail' pkgname=nsjail version=2.9 -revision=2 +revision=3 build_style=gnu-makefile -hostmakedepends="bison flex pkg-config protobuf" +hostmakedepends="bison flex pkg-config protobuf which" makedepends="libnl3-devel protobuf-devel" short_desc="Light-weight process isolation tool" maintainer="Andrea Brancaleoni " @@ -22,7 +22,7 @@ post_extract() { } pre_build() { - sed -i -e 's/\b\(\(C\(XX\)\?\|LD\)FLAGS\s*+=\)/override \1/g' Makefile kafel/build/Makefile.mk kafel/src/Makefile + sed -i -e 's/-Werror\b//g' -e 's/\b\(\(C\(XX\)\?\|LD\)FLAGS\s*+=\)/override \1/g' Makefile kafel/build/Makefile.mk kafel/src/Makefile } do_install() { From bbd3c803b9f6ace0b659376a43d6e44a9144fce4 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 09:13:07 -0500 Subject: [PATCH 23/25] vlc: revbump against protobuf, cleanup --- srcpkgs/vlc/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index e5a37aecedc..94f1299a836 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 @@ -76,7 +76,8 @@ fi pre_configure() { NOCONFIGURE=1 ./bootstrap - sed -i share/Makefile.am -e 's;tar cvvzf;tar cvzf;' + sed -i -e 's;tar cvvzf;tar cvzf;' share/Makefile.am share/Makefile.in + sed -i -e 's;--owner=root --group=root;;' share/Makefile.am share/Makefile.in sed 's|pl_shader_alloc(tc->pl_ctx, NULL, 0, 0);|pl_shader_alloc(tc->pl_ctx, NULL, 0);|' -i modules/video_output/opengl/vout_helper.c } From 668ce26ea1aef5744df4cab21fca72745b00b982 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 09:14:16 -0500 Subject: [PATCH 24/25] zbackup: revbump against protobuf, cleanup --- srcpkgs/zbackup/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template index 68438296b7b..9f2b7f8d236 100644 --- a/srcpkgs/zbackup/template +++ b/srcpkgs/zbackup/template @@ -1,13 +1,13 @@ # 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" -short_desc="A versatile deduplicating backup tool" +short_desc="Versatile deduplicating backup tool" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://zbackup.org/" distfiles="https://github.com/zbackup/zbackup/archive/${version}.tar.gz" checksum=efccccd2a045da91576c591968374379da1dc4ca2e3dec4d3f8f12628fa29a85 From 2362a98054d40710b1ba49c6e1229dcc2dbdd98a Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 09:28:43 -0500 Subject: [PATCH 25/25] bitcoin: revbump against libprotoc-devel [ci skip] --- srcpkgs/bitcoin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template index 9f800eac92e..cb8477bc036 100644 --- a/srcpkgs/bitcoin/template +++ b/srcpkgs/bitcoin/template @@ -1,7 +1,7 @@ # Template file for 'bitcoin' pkgname=bitcoin version=0.19.0.1 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-incompatible-bdb --disable-ccache --disable-static --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"