From 3dc7b0225175d341eb4a2f941f5b35c2226ce1ed 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 86ae8ed7c39412..4bd41615ff2891 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2997,7 +2997,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 779a5a300bcd4f..00000000000000 --- 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 779a5a300bcd4f..a7f3e3e0d06313 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 00000000000000..a7f3e3e0d06313 --- /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 779a5a300bcd4f..00000000000000 --- 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 779a5a300bcd4f..a7f3e3e0d06313 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 00000000000000..a7f3e3e0d06313 --- /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 779a5a300bcd4f..00000000000000 --- 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 779a5a300bcd4f..00000000000000 --- 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 00000000000000..a7f3e3e0d06313 --- /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 00000000000000..a7f3e3e0d06313 --- /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 3e542cf7bb398f..5d40bf2dda843c 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" @@ -40,8 +43,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 @@ -56,9 +60,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 @@ -66,11 +71,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 @@ -81,9 +87,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 bd6a021c5ea11bba23fad8f223d440cdbfd37cd7 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.4 --- 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 4bd41615ff2891..dee93987c44d97 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3000,6 +3000,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 00000000000000..779a5a300bcd4f --- /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 00000000000000..779a5a300bcd4f --- /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 00000000000000..779a5a300bcd4f --- /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 00000000000000..779a5a300bcd4f --- /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 00000000000000..779a5a300bcd4f --- /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 00000000000000..779a5a300bcd4f --- /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 00000000000000..581207dfa0567a --- /dev/null +++ b/srcpkgs/protobuf/template @@ -0,0 +1,96 @@ +# Template file for 'protobuf' +pkgname=protobuf +version=3.11.4 +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=a79d19dcdf9139fa4b81206e318e33d245c4c9da1ffed21c87288ed4380426f9 + +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 2d50f541bbbcc645cb58f96945e58928cd4e19a4 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: revbump against protobuf --- srcpkgs/EternalTerminal/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template index e234e5ee8961d3..c1cd574bf516ef 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 4723fd42fb6c6777752ab8c7e2ab04dd2e228017 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: revbump against protobuf --- srcpkgs/astroid/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template index 3d0fad865c5ee5..e0c486a4a72994 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 3d19890286e5d60eb97991e0c6894b677c2c3797 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: revbump against protobuf --- 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 ff6240ea2c2ea8..510a1672b50d44 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 1cb61137deeed73577d4103388d36c7225d11993 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: revbump against protobuf --- srcpkgs/hyperion/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hyperion/template b/srcpkgs/hyperion/template index 7ce415e929ef9b..09a2110bbac5af 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 984a1c9b51c064ef5edb3655d5e7c2187b865ba4 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: revbump against protobuf --- srcpkgs/kismet/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kismet/template b/srcpkgs/kismet/template index bb42be12bd5249..ce34b424963479 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 6407d9c26863db2ce070a39e44af4a8a4fc50606 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: revbump against protobuf --- srcpkgs/libArcus/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template index 97cf6fbb930001..3f4b5c69d81bb9 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 04dc5276b27eecac676459629e49e612e8778c47 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: revbump against protobuf --- srcpkgs/libcompizconfig/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libcompizconfig/template b/srcpkgs/libcompizconfig/template index 3d66d68de48441..6fadb4059f00a8 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 74db10ba5c8fc75beafe7d2a5815bb199b91d406 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: revbump against protobuf --- srcpkgs/litecoin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template index e1a443563d92e9..207b0bff78233c 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 a1d8174a269a82a3edf631858e6555aa59e53774 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: revbump against protobuf --- srcpkgs/mixxx/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template index ffe3f3105fc652..1b0b06a1a63f84 100644 --- a/srcpkgs/mixxx/template +++ b/srcpkgs/mixxx/template @@ -1,7 +1,7 @@ # Template file for 'mixxx' pkgname=mixxx version=2.2.3 -revision=1 +revision=2 wrksrc="mixxx-release-${version}" build_style=scons hostmakedepends="pkg-config protobuf" From d335094a2927f219b109f4dd5aed87feb0099818 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: revbump against protobuf --- srcpkgs/mosh/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template index ac3d8112a799db..ad93d97a071b6f 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 f292a88cc09e340ae9b4921f4862b916386bbef5 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: revbump against protobuf --- srcpkgs/mumble/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index 31305a5601e88b..9b5ef0c76fc9e1 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 434612b8301600321e4d1b7f227c2534ddad828d 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: revbump against protobuf --- srcpkgs/paraview/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template index 615f8d9b0cfcc6..e476e84d5431ae 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 64553b5b54b946959d964327787255f779b18f9f 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: revbump against protobuf --- 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 3b85c698c6d06b..ee1d252ac3cc98 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=1 +revision=2 build_style=gnu-configure configure_args="$(vopt_enable protoc)" hostmakedepends="pkg-config protobuf" From b69f09d242efbb1638cb6ed3b8384107e2ece386 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: revbump against protobuf --- srcpkgs/strawberry/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template index 0614a0b266ce97..6106c89f58c911 100644 --- a/srcpkgs/strawberry/template +++ b/srcpkgs/strawberry/template @@ -1,7 +1,7 @@ # Template file for 'strawberry' pkgname=strawberry version=0.6.8 -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 a175cd01ecd4e60832c235cae000cd774b07f40e 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: revbump against protobuf --- srcpkgs/sysdig/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template index 7be9e2aee17508..a02d4fb168c1a3 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 03dfec033aa5dcb1377654ce53df7ee0912e2144 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: revbump against protobuf --- srcpkgs/usbguard/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template index 8811663093f97a..6c40641ea3bc2e 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 80e87361c5ed8568bbc3d0afb843f60ef5a837a7 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 bcbef4257d419a..93c5a221dfc30e 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 3666898ffc6ace5f53d4119f4798c4d98717796d 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 4dee11f5f3f7df..c2d7f21a8e3a5a 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 499397c6c0e92bb7a92c26560e6669a74053ab12 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 ade9bdabefc90e..69db0175f4b390 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 cdf505a4140fe8667d63b4dfd5b5f68ca8e3ef46 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 3cec6c688f5249..bbe5199416266b 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 289dc253c3e172b56f39883872cdfd222abf8841 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 564c21a9601312..348d131b32d73d 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc version=3.0.8 -revision=8 +revision=9 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --enable-live555 --disable-fluidsynth --enable-dvdread @@ -76,7 +76,7 @@ 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 '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 81b03e298f2e6b7c645f691f35e444c7f83e0198 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 68438296b7b221..9f2b7f8d236dbf 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 4c2ce5ab0de0097334bf5b06bd44fd61b340a029 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 9f800eac92ef88..cb8477bc036efe 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"