From 452f503b8d3f81eeb16df30e014d792ae79d6f13 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 24 May 2021 09:51:57 -0400 Subject: [PATCH] protobuf26: rename to protobuf28, update to 3.17.0 --- common/shlibs | 6 ++-- srcpkgs/libprotobuf26 | 1 - srcpkgs/libprotobuf26-lite | 1 - srcpkgs/libprotobuf28 | 1 + srcpkgs/libprotobuf28-lite | 1 + srcpkgs/libprotoc-devel | 2 +- srcpkgs/libprotoc26 | 1 - srcpkgs/libprotoc26-devel | 1 - srcpkgs/libprotoc28 | 1 + srcpkgs/libprotoc28-devel | 1 + srcpkgs/protobuf | 2 +- srcpkgs/protobuf-devel | 2 +- srcpkgs/protobuf-lite | 2 +- srcpkgs/protobuf26-devel | 1 - srcpkgs/protobuf28-devel | 1 + srcpkgs/{protobuf26 => protobuf28}/template | 38 ++++++++++----------- 16 files changed, 31 insertions(+), 31 deletions(-) delete mode 120000 srcpkgs/libprotobuf26 delete mode 120000 srcpkgs/libprotobuf26-lite create mode 120000 srcpkgs/libprotobuf28 create mode 120000 srcpkgs/libprotobuf28-lite delete mode 120000 srcpkgs/libprotoc26 delete mode 120000 srcpkgs/libprotoc26-devel create mode 120000 srcpkgs/libprotoc28 create mode 120000 srcpkgs/libprotoc28-devel delete mode 120000 srcpkgs/protobuf26-devel create mode 120000 srcpkgs/protobuf28-devel rename srcpkgs/{protobuf26 => protobuf28}/template (80%) diff --git a/common/shlibs b/common/shlibs index 4e992b40b7..c8a42bc322 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3061,9 +3061,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.26 libprotobuf26-lite-3.15.0_1 -libprotoc.so.26 libprotoc26-3.15.0_1 -libprotobuf.so.26 libprotobuf26-3.15.0_1 +libprotobuf-lite.so.28 libprotobuf28-lite-3.17.0_1 +libprotoc.so.28 libprotoc28-3.17.0_1 +libprotobuf.so.28 libprotobuf28-3.17.0_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/libprotobuf26 b/srcpkgs/libprotobuf26 deleted file mode 120000 index 33f1f67804..0000000000 --- a/srcpkgs/libprotobuf26 +++ /dev/null @@ -1 +0,0 @@ -protobuf26 \ No newline at end of file diff --git a/srcpkgs/libprotobuf26-lite b/srcpkgs/libprotobuf26-lite deleted file mode 120000 index 33f1f67804..0000000000 --- a/srcpkgs/libprotobuf26-lite +++ /dev/null @@ -1 +0,0 @@ -protobuf26 \ No newline at end of file diff --git a/srcpkgs/libprotobuf28 b/srcpkgs/libprotobuf28 new file mode 120000 index 0000000000..695e4991b4 --- /dev/null +++ b/srcpkgs/libprotobuf28 @@ -0,0 +1 @@ +protobuf28 \ No newline at end of file diff --git a/srcpkgs/libprotobuf28-lite b/srcpkgs/libprotobuf28-lite new file mode 120000 index 0000000000..695e4991b4 --- /dev/null +++ b/srcpkgs/libprotobuf28-lite @@ -0,0 +1 @@ +protobuf28 \ No newline at end of file diff --git a/srcpkgs/libprotoc-devel b/srcpkgs/libprotoc-devel index 33f1f67804..695e4991b4 120000 --- a/srcpkgs/libprotoc-devel +++ b/srcpkgs/libprotoc-devel @@ -1 +1 @@ -protobuf26 \ No newline at end of file +protobuf28 \ No newline at end of file diff --git a/srcpkgs/libprotoc26 b/srcpkgs/libprotoc26 deleted file mode 120000 index 33f1f67804..0000000000 --- a/srcpkgs/libprotoc26 +++ /dev/null @@ -1 +0,0 @@ -protobuf26 \ No newline at end of file diff --git a/srcpkgs/libprotoc26-devel b/srcpkgs/libprotoc26-devel deleted file mode 120000 index 33f1f67804..0000000000 --- a/srcpkgs/libprotoc26-devel +++ /dev/null @@ -1 +0,0 @@ -protobuf26 \ No newline at end of file diff --git a/srcpkgs/libprotoc28 b/srcpkgs/libprotoc28 new file mode 120000 index 0000000000..695e4991b4 --- /dev/null +++ b/srcpkgs/libprotoc28 @@ -0,0 +1 @@ +protobuf28 \ No newline at end of file diff --git a/srcpkgs/libprotoc28-devel b/srcpkgs/libprotoc28-devel new file mode 120000 index 0000000000..695e4991b4 --- /dev/null +++ b/srcpkgs/libprotoc28-devel @@ -0,0 +1 @@ +protobuf28 \ No newline at end of file diff --git a/srcpkgs/protobuf b/srcpkgs/protobuf index 33f1f67804..695e4991b4 120000 --- a/srcpkgs/protobuf +++ b/srcpkgs/protobuf @@ -1 +1 @@ -protobuf26 \ No newline at end of file +protobuf28 \ No newline at end of file diff --git a/srcpkgs/protobuf-devel b/srcpkgs/protobuf-devel index 33f1f67804..695e4991b4 120000 --- a/srcpkgs/protobuf-devel +++ b/srcpkgs/protobuf-devel @@ -1 +1 @@ -protobuf26 \ No newline at end of file +protobuf28 \ No newline at end of file diff --git a/srcpkgs/protobuf-lite b/srcpkgs/protobuf-lite index 33f1f67804..695e4991b4 120000 --- a/srcpkgs/protobuf-lite +++ b/srcpkgs/protobuf-lite @@ -1 +1 @@ -protobuf26 \ No newline at end of file +protobuf28 \ No newline at end of file diff --git a/srcpkgs/protobuf26-devel b/srcpkgs/protobuf26-devel deleted file mode 120000 index 33f1f67804..0000000000 --- a/srcpkgs/protobuf26-devel +++ /dev/null @@ -1 +0,0 @@ -protobuf26 \ No newline at end of file diff --git a/srcpkgs/protobuf28-devel b/srcpkgs/protobuf28-devel new file mode 120000 index 0000000000..695e4991b4 --- /dev/null +++ b/srcpkgs/protobuf28-devel @@ -0,0 +1 @@ +protobuf28 \ No newline at end of file diff --git a/srcpkgs/protobuf26/template b/srcpkgs/protobuf28/template similarity index 80% rename from srcpkgs/protobuf26/template rename to srcpkgs/protobuf28/template index 8eac118767..482bb0d6d3 100644 --- a/srcpkgs/protobuf26/template +++ b/srcpkgs/protobuf28/template @@ -1,6 +1,6 @@ -# Template file for 'protobuf26' -pkgname=protobuf26 -version=3.15.8 +# Template file for 'protobuf28' +pkgname=protobuf28 +version=3.17.0 revision=1 wrksrc="protobuf-${version}" build_style=gnu-configure @@ -12,10 +12,10 @@ 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=0cbdc9adda01f6d2facc65a22a2be5cecefbefe5a09e5382ee8879b522c04441 +checksum=eaba1dd133ac5167e8b08bc3268b2d33c6e9f2dcb14ec0f97f3d3eed9b395863 # Switch to versioned package -conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0 protobuf25>=0" +conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0 protobuf25>=0 protobuf26>=0" replaces="protobuf<=3.11.4_1 ${conflicts}" if [ "$CROSS_BUILD" ]; then @@ -42,7 +42,7 @@ post_install() { vlicense LICENSE } -libprotobuf26_package() { +libprotobuf28_package() { short_desc="Protocol buffers C++ library" pkg_install() { vmove "usr/lib/libprotobuf.so.*" @@ -50,7 +50,7 @@ libprotobuf26_package() { } } -libprotobuf26-lite_package() { +libprotobuf28-lite_package() { short_desc="Protocol buffers C++ library (lite version)" pkg_install() { vmove "usr/lib/libprotobuf-lite.so.*" @@ -58,7 +58,7 @@ libprotobuf26-lite_package() { } } -libprotoc26_package() { +libprotoc28_package() { short_desc="Protocol buffers compiler library" pkg_install() { vmove "usr/lib/libprotoc.so.*" @@ -66,12 +66,12 @@ libprotoc26_package() { } } -libprotoc26-devel_package() { - depends="libprotoc26-${version}_${revision}" +libprotoc28-devel_package() { + depends="libprotoc28-${version}_${revision}" short_desc="Protocol buffers compiler library - development files" # Switch to versioned package conflicts="libprotoc18-devel>=0 libprotoc23-devel>=0 - libprotoc24-devel>=0 libprotoc25-devel>=0" + libprotoc24-devel>=0 libprotoc25-devel>=0 libprotoc26-devel>=0" replaces="libprotoc-devel<=3.11.4_1 ${conflicts}" pkg_install() { vmove usr/lib/libprotoc.a @@ -80,14 +80,14 @@ libprotoc26-devel_package() { } } -protobuf26-devel_package() { +protobuf28-devel_package() { depends="zlib-devel - libprotobuf26-${version}_${revision} - libprotobuf26-lite-${version}_${revision}" + libprotobuf28-${version}_${revision} + libprotobuf28-lite-${version}_${revision}" short_desc="Protocol buffers C++ library - development files" # Switch to versioned package conflicts="protobuf18-devel>=0 protobuf23-devel>=0 - protobuf24-devel>=0 protobuf25-devel>=0" + protobuf24-devel>=0 protobuf25-devel>=0 protobuf26-devel>=0" replaces="protobuf-devel<=3.11.4_1 ${conflicts}" pkg_install() { vmove usr/include @@ -102,23 +102,23 @@ protobuf26-devel_package() { protobuf_package() { build_style=meta short_desc="Protocol buffers compiler (meta package)" - depends="protobuf26" + depends="protobuf28" } protobuf-devel_package() { build_style=meta short_desc="Protocol buffers C++ library - development files (meta package)" - depends="protobuf26-devel" + depends="protobuf28-devel" } protobuf-lite_package() { build_style=meta short_desc="Protocol buffers C++ library - lite version (meta package)" - depends="libprotobuf26-lite" + depends="libprotobuf28-lite" } libprotoc-devel_package() { build_style=meta short_desc="Protocol buffers compiler library - development files (meta package)" - depends="libprotoc26-devel" + depends="libprotoc28-devel" }