From b385c705bf90d31efb7e1c83235b4b4d36d250e437247ea687492dc6e65ee82b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Thu, 6 Jun 2024 13:46:51 +0000 Subject: [PATCH] Accepting request 1178996 from home:glaubitz:branches:devel:languages:python - Update to 5.6.4 * Fixed compilation of C extension failing on GCC 14 * Fixed compiler warnings when building C extension - Drop patches for issues fixed upstream * https://github.com/agronholm/cbor2/pull/238.patch OBS-URL: https://build.opensuse.org/request/show/1178996 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cbor2?expand=0&rev=25 --- 238.patch | 23 ----------------------- cbor2-5.6.3.tar.gz | 3 --- cbor2-5.6.4.tar.gz | 3 +++ python-cbor2.changes | 9 +++++++++ python-cbor2.spec | 4 +--- 5 files changed, 13 insertions(+), 29 deletions(-) delete mode 100644 238.patch delete mode 100644 cbor2-5.6.3.tar.gz create mode 100644 cbor2-5.6.4.tar.gz diff --git a/238.patch b/238.patch deleted file mode 100644 index bafbfd6..0000000 --- a/238.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d59066471c54258a24654a4319f723eab663fabe Mon Sep 17 00:00:00 2001 -From: John Paul Adrian Glaubitz -Date: Wed, 5 Jun 2024 17:09:59 +0200 -Subject: [PATCH] Fix incorrect return type of raise_from() - -Fixes #236. ---- - source/decoder.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/source/decoder.c b/source/decoder.c -index 6fd74ce..bd7fa47 100644 ---- a/source/decoder.c -+++ b/source/decoder.c -@@ -348,7 +348,7 @@ _CBORDecoder_get_immutable(CBORDecoderObject *self, void *closure) - - // Utility functions ///////////////////////////////////////////////////////// - --static int -+static void - raise_from(PyObject *new_exc_type, const char *message) { - // This requires the error indicator to be set - PyObject *cause; diff --git a/cbor2-5.6.3.tar.gz b/cbor2-5.6.3.tar.gz deleted file mode 100644 index 7f2d4c6..0000000 --- a/cbor2-5.6.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6f0ae2751c2d333a960e0807c0611494eb1245631a167965acbc100509455d3 -size 100224 diff --git a/cbor2-5.6.4.tar.gz b/cbor2-5.6.4.tar.gz new file mode 100644 index 0000000..3ab5165 --- /dev/null +++ b/cbor2-5.6.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c533c50dde86bef1c6950602054a0ffa3c376e8b0e20c7b8f5b108793f6983e +size 100865 diff --git a/python-cbor2.changes b/python-cbor2.changes index e67fc3d..a083caa 100644 --- a/python-cbor2.changes +++ b/python-cbor2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jun 6 10:36:17 UTC 2024 - John Paul Adrian Glaubitz + +- Update to 5.6.4 + * Fixed compilation of C extension failing on GCC 14 + * Fixed compiler warnings when building C extension +- Drop patches for issues fixed upstream + * https://github.com/agronholm/cbor2/pull/238.patch + ------------------------------------------------------------------- Wed Jun 5 15:47:30 UTC 2024 - John Paul Adrian Glaubitz diff --git a/python-cbor2.spec b/python-cbor2.spec index c1ebbb2..e0e906a 100644 --- a/python-cbor2.spec +++ b/python-cbor2.spec @@ -18,14 +18,12 @@ %{?sle15_python_module_pythons} Name: python-cbor2 -Version: 5.6.3 +Version: 5.6.4 Release: 0 Summary: Pure Python CBOR (de)serializer with extensive tag support License: MIT URL: https://github.com/agronholm/cbor2 Source: https://files.pythonhosted.org/packages/source/c/cbor2/cbor2-%{version}.tar.gz -# PATCH-FIX-UPSTREAM - Fix incorrect return type of raise_from() -Patch: https://github.com/agronholm/cbor2/pull/238.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module hypothesis} BuildRequires: %{python_module pip}