jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

protobuf23: update to 3.13.0, rename to protobuf24, include unversioned metas

Browse source 
Unversioned metas are all updated at the same time as the versioned
packages anyway, so there is no reason to keep the templates separate.
This commit is contained in:
Andrew J. Hesford 2020-08-15 08:57:49 -04:00
parent f85b5cc1c8
commit b4282fa7b1
16 changed files with 47 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/shlibs
View file

@ -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

1
srcpkgs/libprotobuf23
View file

@ -1 +0,0 @@
protobuf23

1
srcpkgs/libprotobuf23-lite
View file

@ -1 +0,0 @@
protobuf23

1
srcpkgs/libprotobuf24 Symbolic link
View file

@ -0,0 +1 @@
protobuf24

1
srcpkgs/libprotobuf24-lite Symbolic link
View file

@ -0,0 +1 @@
protobuf24

1
srcpkgs/libprotoc23
View file

@ -1 +0,0 @@
protobuf23

1
srcpkgs/libprotoc23-devel
View file

@ -1 +0,0 @@
protobuf23

1
srcpkgs/libprotoc24 Symbolic link
View file

@ -0,0 +1 @@
protobuf24

1
srcpkgs/libprotoc24-devel Symbolic link
View file

@ -0,0 +1 @@
protobuf24

1
srcpkgs/protobuf Symbolic link
View file

@ -0,0 +1 @@
protobuf24/

2
srcpkgs/protobuf-devel
View file

@ -1 +1 @@
protobuf
protobuf24/

2
srcpkgs/protobuf-lite
View file

@ -1 +1 @@
protobuf
protobuf24/

32
srcpkgs/protobuf/template
View file

@ -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 <ajh@sideband.org>"
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"
}

1
srcpkgs/protobuf23-devel
View file

@ -1 +0,0 @@
protobuf23

1
srcpkgs/protobuf24-devel Symbolic link
View file

@ -0,0 +1 @@
protobuf24

48
srcpkgs/protobuf23/template → srcpkgs/protobuf24/template
View file

@ -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"
}