diff --git a/common/shlibs b/common/shlibs
index 2d2c3407b1..0408f145be 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3124,9 +3124,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.24 libprotobuf24-lite-3.13.0_1
-libprotoc.so.24 libprotoc24-3.13.0_1
-libprotobuf.so.24 libprotobuf24-3.13.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
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/libprotobuf24 b/srcpkgs/libprotobuf24
deleted file mode 120000
index bd89e49887..0000000000
--- a/srcpkgs/libprotobuf24
+++ /dev/null
@@ -1 +0,0 @@
-protobuf24
\ No newline at end of file
diff --git a/srcpkgs/libprotobuf24-lite b/srcpkgs/libprotobuf24-lite
deleted file mode 120000
index bd89e49887..0000000000
--- a/srcpkgs/libprotobuf24-lite
+++ /dev/null
@@ -1 +0,0 @@
-protobuf24
\ No newline at end of file
diff --git a/srcpkgs/libprotobuf25 b/srcpkgs/libprotobuf25
new file mode 120000
index 0000000000..fc93dda449
--- /dev/null
+++ b/srcpkgs/libprotobuf25
@@ -0,0 +1 @@
+protobuf25
\ No newline at end of file
diff --git a/srcpkgs/libprotobuf25-lite b/srcpkgs/libprotobuf25-lite
new file mode 120000
index 0000000000..fc93dda449
--- /dev/null
+++ b/srcpkgs/libprotobuf25-lite
@@ -0,0 +1 @@
+protobuf25
\ No newline at end of file
diff --git a/srcpkgs/libprotoc-devel b/srcpkgs/libprotoc-devel
index 779a5a300b..fc93dda449 120000
--- a/srcpkgs/libprotoc-devel
+++ b/srcpkgs/libprotoc-devel
@@ -1 +1 @@
-protobuf
\ No newline at end of file
+protobuf25
\ No newline at end of file
diff --git a/srcpkgs/libprotoc24 b/srcpkgs/libprotoc24
deleted file mode 120000
index bd89e49887..0000000000
--- a/srcpkgs/libprotoc24
+++ /dev/null
@@ -1 +0,0 @@
-protobuf24
\ No newline at end of file
diff --git a/srcpkgs/libprotoc24-devel b/srcpkgs/libprotoc24-devel
deleted file mode 120000
index bd89e49887..0000000000
--- a/srcpkgs/libprotoc24-devel
+++ /dev/null
@@ -1 +0,0 @@
-protobuf24
\ No newline at end of file
diff --git a/srcpkgs/libprotoc25 b/srcpkgs/libprotoc25
new file mode 120000
index 0000000000..fc93dda449
--- /dev/null
+++ b/srcpkgs/libprotoc25
@@ -0,0 +1 @@
+protobuf25
\ No newline at end of file
diff --git a/srcpkgs/libprotoc25-devel b/srcpkgs/libprotoc25-devel
new file mode 120000
index 0000000000..fc93dda449
--- /dev/null
+++ b/srcpkgs/libprotoc25-devel
@@ -0,0 +1 @@
+protobuf25
\ No newline at end of file
diff --git a/srcpkgs/protobuf b/srcpkgs/protobuf
index 0fc8d6431d..fc93dda449 120000
--- a/srcpkgs/protobuf
+++ b/srcpkgs/protobuf
@@ -1 +1 @@
-protobuf24/
\ No newline at end of file
+protobuf25
\ No newline at end of file
diff --git a/srcpkgs/protobuf-devel b/srcpkgs/protobuf-devel
index 0fc8d6431d..fc93dda449 120000
--- a/srcpkgs/protobuf-devel
+++ b/srcpkgs/protobuf-devel
@@ -1 +1 @@
-protobuf24/
\ No newline at end of file
+protobuf25
\ No newline at end of file
diff --git a/srcpkgs/protobuf-lite b/srcpkgs/protobuf-lite
index 0fc8d6431d..fc93dda449 120000
--- a/srcpkgs/protobuf-lite
+++ b/srcpkgs/protobuf-lite
@@ -1 +1 @@
-protobuf24/
\ No newline at end of file
+protobuf25
\ No newline at end of file
diff --git a/srcpkgs/protobuf24-devel b/srcpkgs/protobuf24-devel
deleted file mode 120000
index bd89e49887..0000000000
--- a/srcpkgs/protobuf24-devel
+++ /dev/null
@@ -1 +0,0 @@
-protobuf24
\ No newline at end of file
diff --git a/srcpkgs/protobuf25-devel b/srcpkgs/protobuf25-devel
new file mode 120000
index 0000000000..fc93dda449
--- /dev/null
+++ b/srcpkgs/protobuf25-devel
@@ -0,0 +1 @@
+protobuf25
\ No newline at end of file
diff --git a/srcpkgs/protobuf24/template b/srcpkgs/protobuf25/template
similarity index 76%
rename from srcpkgs/protobuf24/template
rename to srcpkgs/protobuf25/template
index 220137e104..00afe18a54 100644
--- a/srcpkgs/protobuf24/template
+++ b/srcpkgs/protobuf25/template
@@ -1,6 +1,6 @@
-# Template file for 'protobuf24'
-pkgname=protobuf24
-version=3.13.0.1
+# Template file for 'protobuf25'
+pkgname=protobuf25
+version=3.14.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=7d663c8dc81d282dc92e884b38e9c179671e31ccacce311154420e65f7d142c6
+checksum=d0f5f605d0d656007ce6c8b5a82df3037e1d8fe8b121ed42e536f569dec16113
# Switch to versioned package
-conflicts="protobuf18>=0 protobuf23>=0"
+conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0"
replaces="protobuf<=3.11.4_1 ${conflicts}"
if [ "$CROSS_BUILD" ]; then
@@ -42,7 +42,7 @@ post_install() {
vlicense LICENSE
}
-libprotobuf24_package() {
+libprotobuf25_package() {
short_desc="Protocol buffers C++ library"
pkg_install() {
vmove "usr/lib/libprotobuf.so.*"
@@ -50,7 +50,7 @@ libprotobuf24_package() {
}
}
-libprotobuf24-lite_package() {
+libprotobuf25-lite_package() {
short_desc="Protocol buffers C++ library (lite version)"
pkg_install() {
vmove "usr/lib/libprotobuf-lite.so.*"
@@ -58,19 +58,19 @@ libprotobuf24-lite_package() {
}
}
-libprotoc24_package() {
+libprotoc25_package() {
short_desc="Protocol buffers compiler library"
pkg_install() {
- vmove "usr/lib/libprotoc*.so.*"
+ vmove "usr/lib/libprotoc.so.*"
vlicense LICENSE
}
}
-libprotoc24-devel_package() {
- depends="libprotoc24-${version}_${revision}"
+libprotoc25-devel_package() {
+ depends="libprotoc25-${version}_${revision}"
short_desc="Protocol buffers compiler library - development files"
# Switch to versioned package
- conflicts="libprotoc18-devel>=0 libprotoc23-devel>=0"
+ conflicts="libprotoc18-devel>=0 libprotoc23-devel>=0 libprotoc24-devel>=0"
replaces="libprotoc-devel<=3.11.4_1 ${conflicts}"
pkg_install() {
vmove usr/lib/libprotoc.a
@@ -79,13 +79,13 @@ libprotoc24-devel_package() {
}
}
-protobuf24-devel_package() {
+protobuf25-devel_package() {
depends="zlib-devel
- libprotobuf24-${version}_${revision}
- libprotobuf24-lite-${version}_${revision}"
+ libprotobuf25-${version}_${revision}
+ libprotobuf25-lite-${version}_${revision}"
short_desc="Protocol buffers C++ library - development files"
# Switch to versioned package
- conflicts="protobuf18-devel>=0 protobuf23-devel>=0"
+ conflicts="protobuf18-devel>=0 protobuf23-devel>=0 protobuf24-devel>=0"
replaces="protobuf-devel<=3.11.4_1 ${conflicts}"
pkg_install() {
vmove usr/include
@@ -100,23 +100,23 @@ protobuf24-devel_package() {
protobuf_package() {
build_style=meta
short_desc="Protocol buffers compiler (meta package)"
- depends="protobuf24"
+ depends="protobuf25"
}
protobuf-devel_package() {
build_style=meta
short_desc="Protocol buffers C++ library - development files (meta package)"
- depends="protobuf24-devel"
+ depends="protobuf25-devel"
}
protobuf-lite_package() {
build_style=meta
short_desc="Protocol buffers C++ library - lite version (meta package)"
- depends="libprotobuf24-lite"
+ depends="libprotobuf25-lite"
}
libprotoc-devel_package() {
build_style=meta
short_desc="Protocol buffers compiler library - development files (meta package)"
- depends="libprotoc24-devel"
+ depends="libprotoc25-devel"
}