diff --git a/common/shlibs b/common/shlibs index 7d8cd9e0245..4d3dfa3c7fe 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3131,9 +3131,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.23 libprotobuf23-lite-3.12.1_1 -libprotoc.so.23 libprotoc23-3.12.1_1 -libprotobuf.so.23 libprotobuf23-3.12.1_1 +libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0_1 +libprotoc.so.24 libprotoc24-3.13.0_1 +libprotobuf.so.24 libprotobuf24-3.13.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/libprotobuf23 b/srcpkgs/libprotobuf23 deleted file mode 120000 index 519d8fd3126..00000000000 --- a/srcpkgs/libprotobuf23 +++ /dev/null @@ -1 +0,0 @@ -protobuf23 \ No newline at end of file diff --git a/srcpkgs/libprotobuf23-lite b/srcpkgs/libprotobuf23-lite deleted file mode 120000 index 519d8fd3126..00000000000 --- a/srcpkgs/libprotobuf23-lite +++ /dev/null @@ -1 +0,0 @@ -protobuf23 \ No newline at end of file diff --git a/srcpkgs/libprotobuf24 b/srcpkgs/libprotobuf24 new file mode 120000 index 00000000000..bd89e498875 --- /dev/null +++ b/srcpkgs/libprotobuf24 @@ -0,0 +1 @@ +protobuf24 \ No newline at end of file diff --git a/srcpkgs/libprotobuf24-lite b/srcpkgs/libprotobuf24-lite new file mode 120000 index 00000000000..bd89e498875 --- /dev/null +++ b/srcpkgs/libprotobuf24-lite @@ -0,0 +1 @@ +protobuf24 \ No newline at end of file diff --git a/srcpkgs/libprotoc23 b/srcpkgs/libprotoc23 deleted file mode 120000 index 519d8fd3126..00000000000 --- a/srcpkgs/libprotoc23 +++ /dev/null @@ -1 +0,0 @@ -protobuf23 \ No newline at end of file diff --git a/srcpkgs/libprotoc23-devel b/srcpkgs/libprotoc23-devel deleted file mode 120000 index 519d8fd3126..00000000000 --- a/srcpkgs/libprotoc23-devel +++ /dev/null @@ -1 +0,0 @@ -protobuf23 \ No newline at end of file diff --git a/srcpkgs/libprotoc24 b/srcpkgs/libprotoc24 new file mode 120000 index 00000000000..bd89e498875 --- /dev/null +++ b/srcpkgs/libprotoc24 @@ -0,0 +1 @@ +protobuf24 \ No newline at end of file diff --git a/srcpkgs/libprotoc24-devel b/srcpkgs/libprotoc24-devel new file mode 120000 index 00000000000..bd89e498875 --- /dev/null +++ b/srcpkgs/libprotoc24-devel @@ -0,0 +1 @@ +protobuf24 \ No newline at end of file diff --git a/srcpkgs/protobuf b/srcpkgs/protobuf new file mode 120000 index 00000000000..0fc8d6431db --- /dev/null +++ b/srcpkgs/protobuf @@ -0,0 +1 @@ +protobuf24/ \ No newline at end of file diff --git a/srcpkgs/protobuf-devel b/srcpkgs/protobuf-devel index 779a5a300bc..0fc8d6431db 120000 --- a/srcpkgs/protobuf-devel +++ b/srcpkgs/protobuf-devel @@ -1 +1 @@ -protobuf \ No newline at end of file +protobuf24/ \ No newline at end of file diff --git a/srcpkgs/protobuf-lite b/srcpkgs/protobuf-lite index 779a5a300bc..0fc8d6431db 120000 --- a/srcpkgs/protobuf-lite +++ b/srcpkgs/protobuf-lite @@ -1 +1 @@ -protobuf \ No newline at end of file +protobuf24/ \ No newline at end of file diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template deleted file mode 100644 index bb8890f1299..00000000000 --- a/srcpkgs/protobuf/template +++ /dev/null @@ -1,32 +0,0 @@ -# Template file for 'protobuf' -pkgname=protobuf -version=3.12.4 -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" -} diff --git a/srcpkgs/protobuf23-devel b/srcpkgs/protobuf23-devel deleted file mode 120000 index 519d8fd3126..00000000000 --- a/srcpkgs/protobuf23-devel +++ /dev/null @@ -1 +0,0 @@ -protobuf23 \ No newline at end of file diff --git a/srcpkgs/protobuf24-devel b/srcpkgs/protobuf24-devel new file mode 120000 index 00000000000..bd89e498875 --- /dev/null +++ b/srcpkgs/protobuf24-devel @@ -0,0 +1 @@ +protobuf24 \ No newline at end of file diff --git a/srcpkgs/protobuf23/template b/srcpkgs/protobuf24/template similarity index 67% rename from srcpkgs/protobuf23/template rename to srcpkgs/protobuf24/template index 3f0a67dba90..db77f230c08 100644 --- a/srcpkgs/protobuf23/template +++ b/srcpkgs/protobuf24/template @@ -1,6 +1,6 @@ -# Template file for 'protobuf23' -pkgname=protobuf23 -version=3.12.4 +# Template file for 'protobuf24' +pkgname=protobuf24 +version=3.13.0 revision=1 wrksrc="protobuf-${version}" build_style=gnu-configure @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://developers.google.com/protocol-buffers/" changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt" distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz" -checksum=512e5a674bf31f8b7928a64d8adf73ee67b8fe88339ad29adaa3b84dbaa570d8 +checksum=9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a # Switch to versioned package replaces="protobuf<=3.11.4_1" @@ -42,7 +42,7 @@ post_install() { vlicense LICENSE } -libprotobuf23_package() { +libprotobuf24_package() { short_desc="Protocol buffers C++ library" pkg_install() { vmove "usr/lib/libprotobuf.so.*" @@ -50,7 +50,7 @@ libprotobuf23_package() { } } -libprotobuf23-lite_package() { +libprotobuf24-lite_package() { short_desc="Protocol buffers C++ library (lite version)" pkg_install() { vmove "usr/lib/libprotobuf-lite.so.*" @@ -58,7 +58,7 @@ libprotobuf23-lite_package() { } } -libprotoc23_package() { +libprotoc24_package() { short_desc="Protocol buffers compiler library" pkg_install() { vmove "usr/lib/libprotoc*.so.*" @@ -66,8 +66,8 @@ libprotoc23_package() { } } -libprotoc23-devel_package() { - depends="libprotoc23-${version}_${revision}" +libprotoc24-devel_package() { + depends="libprotoc24-${version}_${revision}" short_desc="Protocol buffers compiler library - development files" # Switch to versioned package replaces="libprotoc-devel<=3.11.4_1" @@ -79,10 +79,10 @@ libprotoc23-devel_package() { } } -protobuf23-devel_package() { +protobuf24-devel_package() { depends="zlib-devel - libprotobuf23-${version}_${revision} - libprotobuf23-lite-${version}_${revision}" + libprotobuf24-${version}_${revision} + libprotobuf24-lite-${version}_${revision}" short_desc="Protocol buffers C++ library - development files" # Switch to versioned package replaces="protobuf-devel<=3.11.4_1" @@ -96,3 +96,27 @@ protobuf23-devel_package() { vmove usr/lib/pkgconfig } } + +protobuf_package() { + build_style=meta + short_desc="Protocol buffers compiler (meta package)" + depends="protobuf24" +} + +protobuf-devel_package() { + build_style=meta + short_desc="Protocol buffers C++ library - development files (meta package)" + depends="protobuf24-devel" +} + +protobuf-lite_package() { + build_style=meta + short_desc="Protocol buffers C++ library - lite version (meta package)" + depends="libprotobuf24-lite" +} + +libprotoc-devel_package() { + build_style=meta + short_desc="Protocol buffers compiler library - development files (meta package)" + depends="libprotoc24-devel" +}