wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 22:53:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

protobuf28: rename to protobuf, update to 3.18.1

Browse source 
In a discussion a year ago [1], I proposed dropping versioned libs
subpackages and the consensus was that the versioning should be kept.
Since then, protobuf has been updated several times and we've always
been able to migrate all dependants, so there's no need to keep the
versioned packages around just in case that can't happen some day.

Let's drop the versioned packages to make upgrades easier and avoid
polluting repo indexes with old packages that don't get cleaned. Users
who need old versions of the libs for un-packaged software may need to
build those old versions by hand, but this is just one of the pitfalls
of using a rolling Linux distribution.

[1]: https://github.com/void-linux/void-packages/pull/18691
This commit is contained in:
Andrew J. Hesford 2021-09-16 10:31:28 -04:00
parent eb154d26f8
commit f38a742bec
14 changed files with 30 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/shlibs
View file

@ -3081,9 +3081,9 @@ libm17n-flt.so.0 m17n-lib-1.7.0_1
libm17n-gui.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-core.so.0 m17n-lib-1.7.0_1
libm17n.so.0 m17n-lib-1.7.0_1 libm17n.so.0 m17n-lib-1.7.0_1
libprotobuf-lite.so.28 libprotobuf28-lite-3.17.0_1 libprotobuf-lite.so.29 libprotobuf-lite-3.18.0_1
libprotoc.so.28 libprotoc28-3.17.0_1 libprotoc.so.29 libprotoc-3.18.0_1
libprotobuf.so.28 libprotobuf28-3.17.0_1 libprotobuf.so.29 libprotobuf-3.18.0_1
libsombok.so.3 sombok-2.4.0_1 libsombok.so.3 sombok-2.4.0_1
libdeviceclient.so.0 pragha-1.3.3_1 libdeviceclient.so.0 pragha-1.3.3_1
libguile-srfi-srfi-1-v-3.so.3 guile1.8-1.8.8_1 libguile-srfi-srfi-1-v-3.so.3 guile1.8-1.8.8_1

1
srcpkgs/libprotobuf Symbolic link
View file

@ -0,0 +1 @@
protobuf

1
srcpkgs/libprotobuf-lite Symbolic link
View file

@ -0,0 +1 @@
protobuf

1
srcpkgs/libprotobuf28
View file

@ -1 +0,0 @@
protobuf28

1
srcpkgs/libprotobuf28-lite
View file

@ -1 +0,0 @@
protobuf28

1
srcpkgs/libprotoc Symbolic link
View file

@ -0,0 +1 @@
protobuf

2
srcpkgs/libprotoc-devel
View file

@ -1 +1 @@
protobuf28 protobuf

1
srcpkgs/libprotoc28
View file

@ -1 +0,0 @@
protobuf28

1
srcpkgs/libprotoc28-devel
View file

@ -1 +0,0 @@
protobuf28

1
srcpkgs/protobuf
View file

@ -1 +0,0 @@
protobuf28

2
srcpkgs/protobuf-devel
View file

@ -1 +1 @@
protobuf28 protobuf

1
srcpkgs/protobuf-lite
View file

@ -1 +0,0 @@
protobuf28

65
srcpkgs/protobuf28/template → srcpkgs/protobuf/template
View file

@ -1,7 +1,7 @@
# Template file for 'protobuf28' # Template file for 'protobuf'
pkgname=protobuf28 pkgname=protobuf
version=3.17.3 version=3.18.1
revision=2 revision=1
wrksrc="protobuf-${version}" wrksrc="protobuf-${version}"
build_style=gnu-configure build_style=gnu-configure
hostmakedepends="pkg-config automake libtool" hostmakedepends="pkg-config automake libtool"
@ -12,13 +12,14 @@ license="BSD-3-Clause"
homepage="https://developers.google.com/protocol-buffers/" homepage="https://developers.google.com/protocol-buffers/"
changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt" changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz" distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
checksum=c6003e1d2e7fefa78a3039f19f383b4f3a61e81be8c19356f85b6461998ad3db checksum=9111bf0b542b631165fadbd80aa60e7fb25b25311c532139ed2089d76ddf6dd7
# Checks rely on googletest # Checks rely on googletest
make_check=no make_check=no
# Switch to versioned package # Switch to versioned package
conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0 protobuf25>=0 protobuf26>=0" conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0
replaces="protobuf<=3.11.4_1 ${conflicts}" protobuf25>=0 protobuf26>=0 protobuf28>=0"
replaces="${conflicts}"
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
# needs host protoc # needs host protoc
@ -44,7 +45,7 @@ post_install() {
vlicense LICENSE vlicense LICENSE
} }
libprotobuf28_package() { libprotobuf_package() {
short_desc="Protocol buffers C++ library" short_desc="Protocol buffers C++ library"
pkg_install() { pkg_install() {
vmove "usr/lib/libprotobuf.so.*" vmove "usr/lib/libprotobuf.so.*"
@ -52,7 +53,7 @@ libprotobuf28_package() {
} }
} }
libprotobuf28-lite_package() { libprotobuf-lite_package() {
short_desc="Protocol buffers C++ library (lite version)" short_desc="Protocol buffers C++ library (lite version)"
pkg_install() { pkg_install() {
vmove "usr/lib/libprotobuf-lite.so.*" vmove "usr/lib/libprotobuf-lite.so.*"
@ -60,7 +61,7 @@ libprotobuf28-lite_package() {
} }
} }
libprotoc28_package() { libprotoc_package() {
short_desc="Protocol buffers compiler library" short_desc="Protocol buffers compiler library"
pkg_install() { pkg_install() {
vmove "usr/lib/libprotoc.so.*" vmove "usr/lib/libprotoc.so.*"
@ -68,13 +69,14 @@ libprotoc28_package() {
} }
} }
libprotoc28-devel_package() { libprotoc-devel_package() {
depends="libprotoc28-${version}_${revision}" depends="libprotoc-${version}_${revision}"
short_desc="Protocol buffers compiler library - development files" short_desc="Protocol buffers compiler library - development files"
# Switch to versioned package # Switch to versioned package
conflicts="libprotoc18-devel>=0 libprotoc23-devel>=0 conflicts="libprotoc18-devel>=0 libprotoc23-devel>=0
libprotoc24-devel>=0 libprotoc25-devel>=0 libprotoc26-devel>=0" libprotoc24-devel>=0 libprotoc25-devel>=0
replaces="libprotoc-devel<=3.11.4_1 ${conflicts}" libprotoc26-devel>=0 libprotoc28-devel>=0"
replaces="${conflicts}"
pkg_install() { pkg_install() {
vmove usr/lib/libprotoc.a vmove usr/lib/libprotoc.a
vmove usr/lib/libprotoc.so vmove usr/lib/libprotoc.so
@ -82,15 +84,16 @@ libprotoc28-devel_package() {
} }
} }
protobuf28-devel_package() { protobuf-devel_package() {
depends="zlib-devel depends="zlib-devel
libprotobuf28-${version}_${revision} libprotobuf-${version}_${revision}
libprotobuf28-lite-${version}_${revision}" libprotobuf-lite-${version}_${revision}"
short_desc="Protocol buffers C++ library - development files" short_desc="Protocol buffers C++ library - development files"
# Switch to versioned package # Switch to versioned package
conflicts="protobuf18-devel>=0 protobuf23-devel>=0 conflicts="protobuf18-devel>=0 protobuf23-devel>=0
protobuf24-devel>=0 protobuf25-devel>=0 protobuf26-devel>=0" protobuf24-devel>=0 protobuf25-devel>=0
replaces="protobuf-devel<=3.11.4_1 ${conflicts}" protobuf26-devel>=0 protobuf28-devel>=0"
replaces="${conflicts}"
pkg_install() { pkg_install() {
vmove usr/include vmove usr/include
vmove usr/lib/libprotobuf.a vmove usr/lib/libprotobuf.a
@ -100,27 +103,3 @@ protobuf28-devel_package() {
vmove usr/lib/pkgconfig vmove usr/lib/pkgconfig
} }
} }
protobuf_package() {
build_style=meta
short_desc="Protocol buffers compiler (meta package)"
depends="protobuf28"
}
protobuf-devel_package() {
build_style=meta
short_desc="Protocol buffers C++ library - development files (meta package)"
depends="protobuf28-devel"
}
protobuf-lite_package() {
build_style=meta
short_desc="Protocol buffers C++ library - lite version (meta package)"
depends="libprotobuf28-lite"
}
libprotoc-devel_package() {
build_style=meta
short_desc="Protocol buffers compiler library - development files (meta package)"
depends="libprotoc28-devel"
}

1
srcpkgs/protobuf28-devel
View file

@ -1 +0,0 @@
protobuf28