diff --git a/common/shlibs b/common/shlibs index be04108f650..ce0e74cc74e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3002,9 +3002,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.25 libprotobuf25-lite-3.14.0_1 -libprotoc.so.25 libprotoc25-3.14.0_1 -libprotobuf.so.25 libprotobuf25-3.14.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 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/libprotobuf25 b/srcpkgs/libprotobuf25 deleted file mode 120000 index fc93dda4495..00000000000 --- a/srcpkgs/libprotobuf25 +++ /dev/null @@ -1 +0,0 @@ -protobuf25 \ No newline at end of file diff --git a/srcpkgs/libprotobuf25-lite b/srcpkgs/libprotobuf25-lite deleted file mode 120000 index fc93dda4495..00000000000 --- a/srcpkgs/libprotobuf25-lite +++ /dev/null @@ -1 +0,0 @@ -protobuf25 \ No newline at end of file diff --git a/srcpkgs/libprotobuf26 b/srcpkgs/libprotobuf26 new file mode 120000 index 00000000000..33f1f678044 --- /dev/null +++ b/srcpkgs/libprotobuf26 @@ -0,0 +1 @@ +protobuf26 \ No newline at end of file diff --git a/srcpkgs/libprotobuf26-lite b/srcpkgs/libprotobuf26-lite new file mode 120000 index 00000000000..33f1f678044 --- /dev/null +++ b/srcpkgs/libprotobuf26-lite @@ -0,0 +1 @@ +protobuf26 \ No newline at end of file diff --git a/srcpkgs/libprotoc-devel b/srcpkgs/libprotoc-devel index fc93dda4495..33f1f678044 120000 --- a/srcpkgs/libprotoc-devel +++ b/srcpkgs/libprotoc-devel @@ -1 +1 @@ -protobuf25 \ No newline at end of file +protobuf26 \ No newline at end of file diff --git a/srcpkgs/libprotoc25 b/srcpkgs/libprotoc25 deleted file mode 120000 index fc93dda4495..00000000000 --- a/srcpkgs/libprotoc25 +++ /dev/null @@ -1 +0,0 @@ -protobuf25 \ No newline at end of file diff --git a/srcpkgs/libprotoc25-devel b/srcpkgs/libprotoc25-devel deleted file mode 120000 index fc93dda4495..00000000000 --- a/srcpkgs/libprotoc25-devel +++ /dev/null @@ -1 +0,0 @@ -protobuf25 \ No newline at end of file diff --git a/srcpkgs/libprotoc26 b/srcpkgs/libprotoc26 new file mode 120000 index 00000000000..33f1f678044 --- /dev/null +++ b/srcpkgs/libprotoc26 @@ -0,0 +1 @@ +protobuf26 \ No newline at end of file diff --git a/srcpkgs/libprotoc26-devel b/srcpkgs/libprotoc26-devel new file mode 120000 index 00000000000..33f1f678044 --- /dev/null +++ b/srcpkgs/libprotoc26-devel @@ -0,0 +1 @@ +protobuf26 \ No newline at end of file diff --git a/srcpkgs/protobuf b/srcpkgs/protobuf index fc93dda4495..33f1f678044 120000 --- a/srcpkgs/protobuf +++ b/srcpkgs/protobuf @@ -1 +1 @@ -protobuf25 \ No newline at end of file +protobuf26 \ No newline at end of file diff --git a/srcpkgs/protobuf-devel b/srcpkgs/protobuf-devel index fc93dda4495..33f1f678044 120000 --- a/srcpkgs/protobuf-devel +++ b/srcpkgs/protobuf-devel @@ -1 +1 @@ -protobuf25 \ No newline at end of file +protobuf26 \ No newline at end of file diff --git a/srcpkgs/protobuf-lite b/srcpkgs/protobuf-lite index fc93dda4495..33f1f678044 120000 --- a/srcpkgs/protobuf-lite +++ b/srcpkgs/protobuf-lite @@ -1 +1 @@ -protobuf25 \ No newline at end of file +protobuf26 \ No newline at end of file diff --git a/srcpkgs/protobuf25-devel b/srcpkgs/protobuf25-devel deleted file mode 120000 index fc93dda4495..00000000000 --- a/srcpkgs/protobuf25-devel +++ /dev/null @@ -1 +0,0 @@ -protobuf25 \ No newline at end of file diff --git a/srcpkgs/protobuf26-devel b/srcpkgs/protobuf26-devel new file mode 120000 index 00000000000..33f1f678044 --- /dev/null +++ b/srcpkgs/protobuf26-devel @@ -0,0 +1 @@ +protobuf26 \ No newline at end of file diff --git a/srcpkgs/protobuf25/template b/srcpkgs/protobuf26/template similarity index 76% rename from srcpkgs/protobuf25/template rename to srcpkgs/protobuf26/template index 00afe18a549..3f9689a50e0 100644 --- a/srcpkgs/protobuf25/template +++ b/srcpkgs/protobuf26/template @@ -1,6 +1,6 @@ -# Template file for 'protobuf25' -pkgname=protobuf25 -version=3.14.0 +# Template file for 'protobuf26' +pkgname=protobuf26 +version=3.15.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=d0f5f605d0d656007ce6c8b5a82df3037e1d8fe8b121ed42e536f569dec16113 +checksum=6aff9834fd7c540875e1836967c8d14c6897e3785a2efac629f69860fb7834ff # Switch to versioned package -conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0" +conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0 protobuf25>=0" replaces="protobuf<=3.11.4_1 ${conflicts}" if [ "$CROSS_BUILD" ]; then @@ -42,7 +42,7 @@ post_install() { vlicense LICENSE } -libprotobuf25_package() { +libprotobuf26_package() { short_desc="Protocol buffers C++ library" pkg_install() { vmove "usr/lib/libprotobuf.so.*" @@ -50,7 +50,7 @@ libprotobuf25_package() { } } -libprotobuf25-lite_package() { +libprotobuf26-lite_package() { short_desc="Protocol buffers C++ library (lite version)" pkg_install() { vmove "usr/lib/libprotobuf-lite.so.*" @@ -58,7 +58,7 @@ libprotobuf25-lite_package() { } } -libprotoc25_package() { +libprotoc26_package() { short_desc="Protocol buffers compiler library" pkg_install() { vmove "usr/lib/libprotoc.so.*" @@ -66,11 +66,12 @@ libprotoc25_package() { } } -libprotoc25-devel_package() { - depends="libprotoc25-${version}_${revision}" +libprotoc26-devel_package() { + depends="libprotoc26-${version}_${revision}" short_desc="Protocol buffers compiler library - development files" # Switch to versioned package - conflicts="libprotoc18-devel>=0 libprotoc23-devel>=0 libprotoc24-devel>=0" + conflicts="libprotoc18-devel>=0 libprotoc23-devel>=0 + libprotoc24-devel>=0 libprotoc25-devel>=0" replaces="libprotoc-devel<=3.11.4_1 ${conflicts}" pkg_install() { vmove usr/lib/libprotoc.a @@ -79,13 +80,14 @@ libprotoc25-devel_package() { } } -protobuf25-devel_package() { +protobuf26-devel_package() { depends="zlib-devel - libprotobuf25-${version}_${revision} - libprotobuf25-lite-${version}_${revision}" + libprotobuf26-${version}_${revision} + libprotobuf26-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" + conflicts="protobuf18-devel>=0 protobuf23-devel>=0 + protobuf24-devel>=0 protobuf25-devel>=0" replaces="protobuf-devel<=3.11.4_1 ${conflicts}" pkg_install() { vmove usr/include @@ -100,23 +102,23 @@ protobuf25-devel_package() { protobuf_package() { build_style=meta short_desc="Protocol buffers compiler (meta package)" - depends="protobuf25" + depends="protobuf26" } protobuf-devel_package() { build_style=meta short_desc="Protocol buffers C++ library - development files (meta package)" - depends="protobuf25-devel" + depends="protobuf26-devel" } protobuf-lite_package() { build_style=meta short_desc="Protocol buffers C++ library - lite version (meta package)" - depends="libprotobuf25-lite" + depends="libprotobuf26-lite" } libprotoc-devel_package() { build_style=meta short_desc="Protocol buffers compiler library - development files (meta package)" - depends="libprotoc25-devel" + depends="libprotoc26-devel" }