From 2c6a1cd707994d321c785c497467baa647d1aed3 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Fri, 13 Oct 2023 16:58:56 +0800 Subject: libcomps: upgrade 0.1.19 -> 0.1.20 0001-libcomps-Use-Py_hash_t-instead-of-long-in-PyCOMPS_ha.patch removed since it's included in 0.1.20 (From OE-Core rev: 12316f4746352495c89e2f9808a2180d582ba29e) Signed-off-by: Wang Mingyu Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- ...e-Py_hash_t-instead-of-long-in-PyCOMPS_ha.patch | 66 ---------------------- meta/recipes-devtools/libcomps/libcomps_0.1.19.bb | 26 --------- meta/recipes-devtools/libcomps/libcomps_0.1.20.bb | 25 ++++++++ 3 files changed, 25 insertions(+), 92 deletions(-) delete mode 100644 meta/recipes-devtools/libcomps/libcomps/0001-libcomps-Use-Py_hash_t-instead-of-long-in-PyCOMPS_ha.patch delete mode 100644 meta/recipes-devtools/libcomps/libcomps_0.1.19.bb create mode 100644 meta/recipes-devtools/libcomps/libcomps_0.1.20.bb diff --git a/meta/recipes-devtools/libcomps/libcomps/0001-libcomps-Use-Py_hash_t-instead-of-long-in-PyCOMPS_ha.patch b/meta/recipes-devtools/libcomps/libcomps/0001-libcomps-Use-Py_hash_t-instead-of-long-in-PyCOMPS_ha.patch deleted file mode 100644 index dd9ebc8af4..0000000000 --- a/meta/recipes-devtools/libcomps/libcomps/0001-libcomps-Use-Py_hash_t-instead-of-long-in-PyCOMPS_ha.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 26a9647c832de15248ee649e5b77075521f3d4f0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 3 Mar 2023 08:37:35 -0800 -Subject: [PATCH] libcomps: Use Py_hash_t instead of long in PyCOMPS_hash() - -This function is used as a hashfunc callback in -_typeobject defined python3.11/cpython/object.h -compilers detect the protype mismatch for function pointers -with clang16+ - -Fixes -libcomps/src/python/src/pycomps_sequence.c:667:5: error: incompatible function pointer types initializing 'hashfunc' (aka 'int (*)(struct _object *)') with an expression of type 'long (*)(PyObject *)' (aka 'long (*)(struct _object *)') [-Wincompatible-function-pointer-types] - &PyCOMPS_hash, /*tp_hash */ - -Upstream-Status: Submitted [https://github.com/rpm-software-management/libcomps/pull/101] -Signed-off-by: Khem Raj ---- - libcomps/src/python/src/pycomps_hash.c | 4 ++-- - libcomps/src/python/src/pycomps_hash.h | 2 +- - libcomps/src/python/src/pycomps_utils.h | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libcomps/src/python/src/pycomps_hash.c b/libcomps/src/python/src/pycomps_hash.c -index 474afd5..4577769 100644 ---- a/libcomps/src/python/src/pycomps_hash.c -+++ b/libcomps/src/python/src/pycomps_hash.c -@@ -20,9 +20,9 @@ - #include "pycomps_hash.h" - #include "pycomps_utils.h" - --long PyCOMPS_hash(PyObject *self) { -+Py_hash_t PyCOMPS_hash(PyObject *self) { - char *cstr = NULL; -- long crc; -+ Py_hash_t crc; - - cstr = comps_object_tostr(((PyCompsObject*)self)->c_obj); - crc = crc32(0, cstr, strlen(cstr)); -diff --git a/libcomps/src/python/src/pycomps_hash.h b/libcomps/src/python/src/pycomps_hash.h -index b664cae..54e08d9 100644 ---- a/libcomps/src/python/src/pycomps_hash.h -+++ b/libcomps/src/python/src/pycomps_hash.h -@@ -26,6 +26,6 @@ - #include "pycomps_utils.h" - - --long PyCOMPS_hash(PyObject *self); -+Py_hash_t PyCOMPS_hash(PyObject *self); - - #endif -diff --git a/libcomps/src/python/src/pycomps_utils.h b/libcomps/src/python/src/pycomps_utils.h -index ba9bc2f..b34e4dc 100644 ---- a/libcomps/src/python/src/pycomps_utils.h -+++ b/libcomps/src/python/src/pycomps_utils.h -@@ -137,7 +137,7 @@ COMPS_Object* __pycomps_bytes_in(PyObject *pobj); - PyObject* __pycomps_str_out(COMPS_Object *obj); - PyObject *str_to_unicode(void* str); - --long PyCOMPS_hash(PyObject *self); -+Py_hash_t PyCOMPS_hash(PyObject *self); - - PyObject* PyCOMPSSeq_extra_get(PyObject *self, PyObject *key); - --- -2.39.2 - diff --git a/meta/recipes-devtools/libcomps/libcomps_0.1.19.bb b/meta/recipes-devtools/libcomps/libcomps_0.1.19.bb deleted file mode 100644 index e362e8e108..0000000000 --- a/meta/recipes-devtools/libcomps/libcomps_0.1.19.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Libcomps is alternative for yum.comps library (which is for managing rpm package groups)." -HOMEPAGE = "https://github.com/rpm-software-management/libcomps" -DESCRIPTION = "Libcomps is alternative for yum.comps library. It's written in pure C as library and there's bindings for python2 and python3." -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "git://github.com/rpm-software-management/libcomps.git;branch=master;protocol=https \ - file://0001-libcomps-Use-Py_hash_t-instead-of-long-in-PyCOMPS_ha.patch \ - file://0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ - " - -SRCREV = "9322bdcf06630cc094f094f944d7d0e2cb798b73" - -S = "${WORKDIR}/git" - -inherit cmake setuptools3-base - -DEPENDS = "expat libxml2 zlib" - -EXTRA_OECMAKE = "-DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} \ - -DENABLE_DOCS=OFF \ - -DENABLE_TESTS=OFF" - -OECMAKE_SOURCEPATH = "${S}/libcomps" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/libcomps/libcomps_0.1.20.bb b/meta/recipes-devtools/libcomps/libcomps_0.1.20.bb new file mode 100644 index 0000000000..1f59c5ea1e --- /dev/null +++ b/meta/recipes-devtools/libcomps/libcomps_0.1.20.bb @@ -0,0 +1,25 @@ +SUMMARY = "Libcomps is alternative for yum.comps library (which is for managing rpm package groups)." +HOMEPAGE = "https://github.com/rpm-software-management/libcomps" +DESCRIPTION = "Libcomps is alternative for yum.comps library. It's written in pure C as library and there's bindings for python2 and python3." +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/rpm-software-management/libcomps.git;branch=master;protocol=https \ + file://0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ + " + +SRCREV = "854fbb9fe733b774981e1ffcf825b2d2ce0f8072" + +S = "${WORKDIR}/git" + +inherit cmake setuptools3-base + +DEPENDS = "expat libxml2 zlib" + +EXTRA_OECMAKE = "-DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} \ + -DENABLE_DOCS=OFF \ + -DENABLE_TESTS=OFF" + +OECMAKE_SOURCEPATH = "${S}/libcomps" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf