From 652fde714b40e16d1d3a819b4f2a449e23e20164 Mon Sep 17 00:00:00 2001 From: Sakib Sajal Date: Wed, 15 Mar 2023 12:16:54 -0400 Subject: libuser: upgrade v0.63 -> v0.64 Removed patch which is contained in new version: 0003-python-Compilation-warnings-update.patch Signed-off-by: Sakib Sajal Signed-off-by: Khem Raj --- .../0003-python-Compilation-warnings-update.patch | 84 ---------------------- meta-gnome/recipes-support/libuser/libuser_0.63.bb | 46 ------------ meta-gnome/recipes-support/libuser/libuser_0.64.bb | 45 ++++++++++++ 3 files changed, 45 insertions(+), 130 deletions(-) delete mode 100644 meta-gnome/recipes-support/libuser/libuser/0003-python-Compilation-warnings-update.patch delete mode 100644 meta-gnome/recipes-support/libuser/libuser_0.63.bb create mode 100644 meta-gnome/recipes-support/libuser/libuser_0.64.bb (limited to 'meta-gnome') diff --git a/meta-gnome/recipes-support/libuser/libuser/0003-python-Compilation-warnings-update.patch b/meta-gnome/recipes-support/libuser/libuser/0003-python-Compilation-warnings-update.patch deleted file mode 100644 index 45d6952150..0000000000 --- a/meta-gnome/recipes-support/libuser/libuser/0003-python-Compilation-warnings-update.patch +++ /dev/null @@ -1,84 +0,0 @@ -From acd7b051993d501f4b5e3a593e0f18d1336ba2de Mon Sep 17 00:00:00 2001 -From: Tomas Halman -Date: Wed, 21 Jul 2021 15:36:59 +0200 -Subject: [PATCH] python: Compilation warnings update - -The compilation produces few warnings about discard const qualifier -and pointer to int conversion. This patch fixes the const qualifiers -and replaces the tp_print inicialization in PyTypeObject with 0 instead -of NULL - -Upstream-Status: Backport [https://pagure.io/libuser/c/3cb7ea54e7b50da6ea313a0e7c7187c8aa5e6ee9?branch=master] -Signed-off-by: Khem Raj ---- - python/admin.c | 2 +- - python/ent.c | 8 ++++---- - python/misc.c | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/python/admin.c b/python/admin.c -index 83595af..e92fca4 100644 ---- a/python/admin.c -+++ b/python/admin.c -@@ -1512,7 +1512,7 @@ PyTypeObject AdminType = { - sizeof(struct libuser_admin), /* tp_basicsize */ - 0, /* tp_itemsize */ - libuser_admin_destroy, /* tp_dealloc */ -- NULL, /* tp_print */ -+ 0, /* tp_print */ - NULL, /* tp_getattr */ - NULL, /* tp_setattr */ - NULL, /* tp_compare */ -diff --git a/python/ent.c b/python/ent.c -index ee712d2..fc3d654 100644 ---- a/python/ent.c -+++ b/python/ent.c -@@ -255,7 +255,7 @@ libuser_convert_to_value(PyObject *item, GValue *value) - static int - libuser_entity_setattro(PyObject *self, PyObject *attr_name, PyObject *value) - { -- char *name; -+ const char *name; - struct libuser_entity *me; - PyObject *list; - struct lu_ent *copy; -@@ -616,7 +616,7 @@ static PyObject * - libuser_entity_get_item(PyObject *self, PyObject *item) - { - struct libuser_entity *me; -- char *attr; -+ const char *attr; - - DEBUG_ENTRY; - me = (struct libuser_entity *)self; -@@ -664,7 +664,7 @@ static int - libuser_entity_set_item(PyObject *self, PyObject *item, PyObject *args) - { - struct libuser_entity *me; -- char *attr = NULL; -+ const char *attr = NULL; - Py_ssize_t i, size; - int ret; - GValue value; -@@ -800,7 +800,7 @@ PyTypeObject EntityType = { - sizeof(struct libuser_entity), /* tp_basicsize */ - 0, /* tp_itemsize */ - libuser_entity_destroy, /* tp_dealloc */ -- NULL, /* tp_print */ -+ 0, /* tp_print */ - NULL, /* tp_getattr */ - NULL, /* tp_setattr */ - NULL, /* tp_compare */ -diff --git a/python/misc.c b/python/misc.c -index c4ce819..810a846 100644 ---- a/python/misc.c -+++ b/python/misc.c -@@ -488,7 +488,7 @@ PyTypeObject PromptType = { - sizeof(struct libuser_prompt), /* tp_basicsize */ - 0, /* tp_itemsize */ - libuser_prompt_destroy, /* tp_dealloc */ -- NULL, /* tp_print */ -+ 0, /* tp_print */ - NULL, /* tp_getattr */ - NULL, /* tp_setattr */ - NULL, /* tp_compare */ diff --git a/meta-gnome/recipes-support/libuser/libuser_0.63.bb b/meta-gnome/recipes-support/libuser/libuser_0.63.bb deleted file mode 100644 index e191e115a3..0000000000 --- a/meta-gnome/recipes-support/libuser/libuser_0.63.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "user and group account administration library" -DESCRIPTION = "The libuser library implements a standardized interface for manipulating and administering user \ -and group accounts" -HOMEPAGE = "https://pagure.io/libuser" -BUGTRACKER = "https://pagure.io/libuser/issues" - -LICENSE = "LGPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ - file://lib/user.h;endline=19;md5=76b301f63c39fa992062395efbdc9558 \ - file://samples/testuser.c;endline=19;md5=3b87fa660fa3f4a6bb31d624afe30ba1" - -SECTION = "base" - -SRC_URI = "https://releases.pagure.org/libuser/libuser-${PV}.tar.xz \ - file://0001-docs-Disable-building.patch \ - file://0002-remove-unused-execinfo.h.patch \ - file://0003-python-Compilation-warnings-update.patch \ - " - -SRC_URI[sha256sum] = "8dc377255452a68e82c4837ba22c3ee4ae3658971bf0f2ef67ed0b77fc497f91" - -DEPENDS = "bison-native popt libpam glib-2.0 python3" - -inherit autotools features_check gettext python3native python3-dir pkgconfig gtk-doc - -REQUIRED_DISTRO_FEATURES = "pam" - -EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" - -GTKDOC_DOCDIR = "${S}/docs/reference" - -# run autopoint since it needs ABOUT-NLS and admin/config.rpath from gettext -#EXTRA_AUTORECONF:remove = "--exclude=autopoint" - -do_configure:prepend() { - install -d ${S}/admin -d ${S}/m4 - touch ${S}/ABOUT-NLS ${S}/admin/config.rpath - cd ${S} - bison lib/getdate.y -o lib/getdate.c - cd - -} - -PACKAGES += "${PN}-python " - -FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" - diff --git a/meta-gnome/recipes-support/libuser/libuser_0.64.bb b/meta-gnome/recipes-support/libuser/libuser_0.64.bb new file mode 100644 index 0000000000..d86a577b10 --- /dev/null +++ b/meta-gnome/recipes-support/libuser/libuser_0.64.bb @@ -0,0 +1,45 @@ +SUMMARY = "user and group account administration library" +DESCRIPTION = "The libuser library implements a standardized interface for manipulating and administering user \ +and group accounts" +HOMEPAGE = "https://pagure.io/libuser" +BUGTRACKER = "https://pagure.io/libuser/issues" + +LICENSE = "LGPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ + file://lib/user.h;endline=19;md5=76b301f63c39fa992062395efbdc9558 \ + file://samples/testuser.c;endline=19;md5=3b87fa660fa3f4a6bb31d624afe30ba1" + +SECTION = "base" + +SRC_URI = "https://releases.pagure.org/libuser/libuser-${PV}.tar.gz \ + file://0001-docs-Disable-building.patch \ + file://0002-remove-unused-execinfo.h.patch \ + " + +SRC_URI[sha256sum] = "ea6094c72cb9e60a42fb53509dc98d124a340f1c9222783b503208adc16a0a8f" + +DEPENDS = "bison-native popt libpam glib-2.0 python3" + +inherit autotools features_check gettext python3native python3-dir pkgconfig gtk-doc + +REQUIRED_DISTRO_FEATURES = "pam" + +EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" + +GTKDOC_DOCDIR = "${S}/docs/reference" + +# run autopoint since it needs ABOUT-NLS and admin/config.rpath from gettext +#EXTRA_AUTORECONF:remove = "--exclude=autopoint" + +do_configure:prepend() { + install -d ${S}/admin -d ${S}/m4 + touch ${S}/ABOUT-NLS ${S}/admin/config.rpath + cd ${S} + bison lib/getdate.y -o lib/getdate.c + cd - +} + +PACKAGES += "${PN}-python " + +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" + -- cgit v1.2.3-54-g00ecf