From 88e95a36cd210c19bd9f26794c157cb845d65275 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Wed, 27 Jul 2022 09:25:00 +0200 Subject: [PATCH] package/{python-}protobuf: bump to version 21.4 protobuf changed it versioning scheme [1]. The Release version is now only the Minor.Patch version of the language specific version. C++ stays on Major version 3, but python got bumped to 4. So the handling in the .mk files changed to reflect that. python-protobuf changed it version to 4 because of some breaking changes, see[1]. [1] https://developers.google.com/protocol-buffers/docs/news/2022-05-06 Signed-off-by: Michael Nosthoff Tested-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/protobuf/protobuf.hash | 2 +- package/protobuf/protobuf.mk | 4 ++-- package/python-protobuf/python-protobuf.hash | 2 +- package/python-protobuf/python-protobuf.mk | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash index f37b2dee40..9dc0f9ff07 100644 --- a/package/protobuf/protobuf.hash +++ b/package/protobuf/protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE -sha256 dddd73664306d7d895a95e1cf18925b31b52785e468727e4635b45edae5166f9 protobuf-cpp-3.20.1.tar.gz +sha256 a9fd8043fef746e8d8cca9f023fb7ba6d3d102eab6dd35a04ce7157d1928726b protobuf-cpp-3.21.4.tar.gz diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk index c4c33ba7da..ffbc39347f 100644 --- a/package/protobuf/protobuf.mk +++ b/package/protobuf/protobuf.mk @@ -7,8 +7,8 @@ # When bumping this package, make sure to also verify if the # python-protobuf package still works and to update its hash, # as they share the same version/site variables. -PROTOBUF_VERSION = 3.20.1 -PROTOBUF_SOURCE = protobuf-cpp-$(PROTOBUF_VERSION).tar.gz +PROTOBUF_VERSION = 21.4 +PROTOBUF_SOURCE = protobuf-cpp-3.$(PROTOBUF_VERSION).tar.gz PROTOBUF_SITE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION) PROTOBUF_LICENSE = BSD-3-Clause PROTOBUF_LICENSE_FILES = LICENSE diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash index ddfa48b491..ae2e07d637 100644 --- a/package/python-protobuf/python-protobuf.hash +++ b/package/python-protobuf/python-protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d3449b4df32ca155f8cd71051db916b2bf74cc925760e269c0acf09b48ec1cb8 protobuf-python-3.20.1.tar.gz +sha256 32d8a37271f42aaa0f40659f77040484d6048b187e4a98dac09eb9ed592a91dc protobuf-python-4.21.4.tar.gz sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE diff --git a/package/python-protobuf/python-protobuf.mk b/package/python-protobuf/python-protobuf.mk index b91ba49339..df90254670 100644 --- a/package/python-protobuf/python-protobuf.mk +++ b/package/python-protobuf/python-protobuf.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION) -PYTHON_PROTOBUF_SOURCE = protobuf-python-$(PYTHON_PROTOBUF_VERSION).tar.gz +PYTHON_PROTOBUF_SOURCE = protobuf-python-4.$(PYTHON_PROTOBUF_VERSION).tar.gz PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE) PYTHON_PROTOBUF_LICENSE = BSD-3-Clause PYTHON_PROTOBUF_LICENSE_FILES = LICENSE