deleted file mode 100644
@@ -1,57 +0,0 @@
-From 8ce4b50b210d3c0f8de40156d4ba7827bfe16b21 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 16 Aug 2023 17:36:19 -0700
-Subject: [PATCH] message.c: Cast uintptr_t types to upb_MessageDef
-
-This fixes build with clang
-
-python/message.c:1238:49: error: incompatible integer to pointer conversion passing 'uintptr_t' (aka 'unsigned long') to parameter of type 'const upb_MessageDef *' (aka 'const struct upb_MessageDef *') [-Wint-conversion]
- 1238 | upb_MessageDef_MiniTable(other->def),
- | ^~~~~~~~~~
-/mnt/b/yoe/master/build/tmp/work/cortexa72-cortexa53-crypto-yoe-linux/python3-protobuf/4.24.0/protobuf-4.24.0/upb/reflection/message_def.h:138:69: note: passing argument to parameter 'm' here
- 138 | const upb_MiniTable* upb_MessageDef_MiniTable(const upb_MessageDef* m);
- | ^
-python/message.c:1609:69: error: incompatible integer to pointer conversion passing 'uintptr_t' (aka 'unsigned long') to parameter of type 'const upb_MessageDef *' (aka 'const struct upb_MessageDef *') [-Wint-conversion]
- 1609 | upb_Message_DeepClone(self->ptr.msg, upb_MessageDef_MiniTable(self->def),
- | ^~~~~~~~~
-/mnt/b/yoe/master/build/tmp/work/cortexa72-cortexa53-crypto-yoe-linux/python3-protobuf/4.24.0/protobuf-4.24.0/upb/reflection/message_def.h:138:69: note: passing argument to parameter 'm' here
- 138 | const upb_MiniTable* upb_MessageDef_MiniTable(const upb_MessageDef* m);
- | ^
-python/message.c:1611:44: error: incompatible integer to pointer conversion passing 'uintptr_t' (aka 'unsigned long') to parameter of type 'const upb_MessageDef *' (aka 'const struct upb_MessageDef *') [-Wint-conversion]
- 1611 | PyObject* ret = PyUpb_Message_Get(clone, self->def, arena);
- | ^~~~~~~~~
-
-Upstream-Status: Submitted [https://github.com/protocolbuffers/upb/pull/1492]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- python/message.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/python/message.c b/python/message.c
-index a01ce16..c418b84 100644
---- a/python/message.c
-+++ b/python/message.c
-@@ -1235,7 +1235,7 @@ static PyObject* PyUpb_Message_CopyFrom(PyObject* _self, PyObject* arg) {
- Py_DECREF(tmp);
-
- upb_Message_DeepCopy(self->ptr.msg, other->ptr.msg,
-- upb_MessageDef_MiniTable(other->def),
-+ upb_MessageDef_MiniTable((const upb_MessageDef*)other->def),
- PyUpb_Arena_Get(self->arena));
- PyUpb_Message_SyncSubobjs(self);
-
-@@ -1606,9 +1606,9 @@ PyObject* DeepCopy(PyObject* _self, PyObject* arg) {
-
- PyObject* arena = PyUpb_Arena_New();
- upb_Message* clone =
-- upb_Message_DeepClone(self->ptr.msg, upb_MessageDef_MiniTable(self->def),
-+ upb_Message_DeepClone(self->ptr.msg, upb_MessageDef_MiniTable((const upb_MessageDef*)self->def),
- PyUpb_Arena_Get(arena));
-- PyObject* ret = PyUpb_Message_Get(clone, self->def, arena);
-+ PyObject* ret = PyUpb_Message_Get(clone, (const upb_MessageDef*)self->def, arena);
- Py_DECREF(arena);
-
- return ret;
-2.41.0
-
similarity index 85%
rename from meta-python/recipes-devtools/python/python3-protobuf_4.24.4.bb
rename to meta-python/recipes-devtools/python/python3-protobuf_4.25.1.bb
@@ -6,8 +6,7 @@ LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=53dbfa56f61b90215a9f8f0d527c043d"
inherit pypi setuptools3
-SRC_URI += "file://0001-message.c-Cast-uintptr_t-types-to-upb_MessageDef.patch"
-SRC_URI[sha256sum] = "5a70731910cd9104762161719c3d883c960151eea077134458503723b60e3667"
+SRC_URI[sha256sum] = "57d65074b4f5baa4ab5da1605c02be90ac20c8b40fb137d6a8df9f416b0d0ce2"
# http://errors.yoctoproject.org/Errors/Details/184715/
# Can't find required file: ../src/google/protobuf/descriptor.proto
Remove patch 0001-message.c-Cast-uintptr_t-types-to-upb_MessageDef.patch that was incorporated upstream and released in 4.25.1 Signed-off-by: Derek Straka <derek@asterius.io> --- ...st-uintptr_t-types-to-upb_MessageDef.patch | 57 ------------------- ...f_4.24.4.bb => python3-protobuf_4.25.1.bb} | 3 +- 2 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-protobuf/0001-message.c-Cast-uintptr_t-types-to-upb_MessageDef.patch rename meta-python/recipes-devtools/python/{python3-protobuf_4.24.4.bb => python3-protobuf_4.25.1.bb} (85%)