From 4124241db840924e62441dd7c6827b0b67366bee Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 31 May 2023 15:40:14 +0800 Subject: python3-lru-dict: upgrade 1.1.8 -> 1.2.0 0001-lru-Use-PyCFunction-instead-of-PyCFunctionWithKeywor.patch removed since it's included in 1.2.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...Function-instead-of-PyCFunctionWithKeywor.patch | 37 ---------------------- .../python/python3-lru-dict_1.1.8.bb | 11 ------- .../python/python3-lru-dict_1.2.0.bb | 11 +++++++ 3 files changed, 11 insertions(+), 48 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-lru-dict/0001-lru-Use-PyCFunction-instead-of-PyCFunctionWithKeywor.patch delete mode 100644 meta-python/recipes-devtools/python/python3-lru-dict_1.1.8.bb create mode 100644 meta-python/recipes-devtools/python/python3-lru-dict_1.2.0.bb (limited to 'meta-python/recipes-devtools/python') diff --git a/meta-python/recipes-devtools/python/python3-lru-dict/0001-lru-Use-PyCFunction-instead-of-PyCFunctionWithKeywor.patch b/meta-python/recipes-devtools/python/python3-lru-dict/0001-lru-Use-PyCFunction-instead-of-PyCFunctionWithKeywor.patch deleted file mode 100644 index b93d1594da..0000000000 --- a/meta-python/recipes-devtools/python/python3-lru-dict/0001-lru-Use-PyCFunction-instead-of-PyCFunctionWithKeywor.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 5013406c409a0a143a315146df388281bfb2172d Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 1 Mar 2023 19:53:36 -0800 -Subject: [PATCH] lru: Use PyCFunction instead of PyCFunctionWithKeywords - -PyMethodDef uses PyMethodDef and not PyCFunctionWithKeywords and when -callback is specified as PyCFunctionWithKeywords, clang 16+ is able to -detect function signature mismatch in function pointers now. - -Fixes -lru.c:629:17: error: incompatible function pointer types initializing 'PyCFunction' (aka 'struct _object *(*)(struct _object *, struct _object *)') with an expression of type 'PyCFunctionWithKeywords' (aka 'struct _object *(*)(struct _object *, struct _object *, struct _object *)') [-Wincompatible-function-pointer-types] - {"popitem", (PyCFunctionWithKeywords)LRU_popitem, METH_VARARGS | METH_KEYWORDS, - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1 error generated. - -Upstream-Status: Submitted [https://github.com/amitdev/lru-dict/pull/45] -Signed-off-by: Khem Raj ---- - lru.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lru.c b/lru.c -index 8adcb4b..33c18ab 100644 ---- a/lru.c -+++ b/lru.c -@@ -626,7 +626,7 @@ static PyMethodDef LRU_methods[] = { - PyDoc_STR("L.setdefault(key, default=None) -> If L has key return its value, otherwise insert key with a value of default and return default")}, - {"pop", (PyCFunction)LRU_pop, METH_VARARGS, - PyDoc_STR("L.pop(key[, default]) -> If L has key return its value and remove it from L, otherwise return default. If default is not given and key is not in L, a KeyError is raised.")}, -- {"popitem", (PyCFunctionWithKeywords)LRU_popitem, METH_VARARGS | METH_KEYWORDS, -+ {"popitem", (PyCFunction)LRU_popitem, METH_VARARGS | METH_KEYWORDS, - PyDoc_STR("L.popitem([least_recent=True]) -> Returns and removes a (key, value) pair. The pair returned is the least-recently used if least_recent is true, or the most-recently used if false.")}, - {"set_size", (PyCFunction)LRU_set_size, METH_VARARGS, - PyDoc_STR("L.set_size() -> set size of LRU")}, --- -2.39.2 - diff --git a/meta-python/recipes-devtools/python/python3-lru-dict_1.1.8.bb b/meta-python/recipes-devtools/python/python3-lru-dict_1.1.8.bb deleted file mode 100644 index e825e43dfe..0000000000 --- a/meta-python/recipes-devtools/python/python3-lru-dict_1.1.8.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "A fixed size dict like container which evicts Least Recently Used (LRU) items once size limit is exceeded." -HOMEPAGE = "https://github.com/amitdev/lru-dict" -SECTION = "devel/python" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9d10a486ee04034fdef5162fd791f153" - -SRC_URI[sha256sum] = "878bc8ef4073e5cfb953dfc1cf4585db41e8b814c0106abde34d00ee0d0b3115" - -inherit pypi setuptools3 - -SRC_URI += "file://0001-lru-Use-PyCFunction-instead-of-PyCFunctionWithKeywor.patch" diff --git a/meta-python/recipes-devtools/python/python3-lru-dict_1.2.0.bb b/meta-python/recipes-devtools/python/python3-lru-dict_1.2.0.bb new file mode 100644 index 0000000000..7a3a172746 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-lru-dict_1.2.0.bb @@ -0,0 +1,11 @@ +SUMMARY = "A fixed size dict like container which evicts Least Recently Used (LRU) items once size limit is exceeded." +HOMEPAGE = "https://github.com/amitdev/lru-dict" +SECTION = "devel/python" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9d10a486ee04034fdef5162fd791f153" + +SRC_URI[sha256sum] = "13c56782f19d68ddf4d8db0170041192859616514c706b126d0df2ec72a11bd7" + +inherit pypi setuptools3 + +SRC_URI += "${PYPI_SRC_URI}" -- cgit v1.2.3-54-g00ecf