diff options
| -rw-r--r-- | meta-gnome/recipes-support/libuser/libuser/0003-python-Compilation-warnings-update.patch | 84 | ||||
| -rw-r--r-- | meta-gnome/recipes-support/libuser/libuser_0.64.bb (renamed from meta-gnome/recipes-support/libuser/libuser_0.63.bb) | 5 |
2 files changed, 2 insertions, 87 deletions
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 @@ | |||
| 1 | From acd7b051993d501f4b5e3a593e0f18d1336ba2de Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Tomas Halman <thalman@redhat.com> | ||
| 3 | Date: Wed, 21 Jul 2021 15:36:59 +0200 | ||
| 4 | Subject: [PATCH] python: Compilation warnings update | ||
| 5 | |||
| 6 | The compilation produces few warnings about discard const qualifier | ||
| 7 | and pointer to int conversion. This patch fixes the const qualifiers | ||
| 8 | and replaces the tp_print inicialization in PyTypeObject with 0 instead | ||
| 9 | of NULL | ||
| 10 | |||
| 11 | Upstream-Status: Backport [https://pagure.io/libuser/c/3cb7ea54e7b50da6ea313a0e7c7187c8aa5e6ee9?branch=master] | ||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | --- | ||
| 14 | python/admin.c | 2 +- | ||
| 15 | python/ent.c | 8 ++++---- | ||
| 16 | python/misc.c | 2 +- | ||
| 17 | 3 files changed, 6 insertions(+), 6 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/python/admin.c b/python/admin.c | ||
| 20 | index 83595af..e92fca4 100644 | ||
| 21 | --- a/python/admin.c | ||
| 22 | +++ b/python/admin.c | ||
| 23 | @@ -1512,7 +1512,7 @@ PyTypeObject AdminType = { | ||
| 24 | sizeof(struct libuser_admin), /* tp_basicsize */ | ||
| 25 | 0, /* tp_itemsize */ | ||
| 26 | libuser_admin_destroy, /* tp_dealloc */ | ||
| 27 | - NULL, /* tp_print */ | ||
| 28 | + 0, /* tp_print */ | ||
| 29 | NULL, /* tp_getattr */ | ||
| 30 | NULL, /* tp_setattr */ | ||
| 31 | NULL, /* tp_compare */ | ||
| 32 | diff --git a/python/ent.c b/python/ent.c | ||
| 33 | index ee712d2..fc3d654 100644 | ||
| 34 | --- a/python/ent.c | ||
| 35 | +++ b/python/ent.c | ||
| 36 | @@ -255,7 +255,7 @@ libuser_convert_to_value(PyObject *item, GValue *value) | ||
| 37 | static int | ||
| 38 | libuser_entity_setattro(PyObject *self, PyObject *attr_name, PyObject *value) | ||
| 39 | { | ||
| 40 | - char *name; | ||
| 41 | + const char *name; | ||
| 42 | struct libuser_entity *me; | ||
| 43 | PyObject *list; | ||
| 44 | struct lu_ent *copy; | ||
| 45 | @@ -616,7 +616,7 @@ static PyObject * | ||
| 46 | libuser_entity_get_item(PyObject *self, PyObject *item) | ||
| 47 | { | ||
| 48 | struct libuser_entity *me; | ||
| 49 | - char *attr; | ||
| 50 | + const char *attr; | ||
| 51 | |||
| 52 | DEBUG_ENTRY; | ||
| 53 | me = (struct libuser_entity *)self; | ||
| 54 | @@ -664,7 +664,7 @@ static int | ||
| 55 | libuser_entity_set_item(PyObject *self, PyObject *item, PyObject *args) | ||
| 56 | { | ||
| 57 | struct libuser_entity *me; | ||
| 58 | - char *attr = NULL; | ||
| 59 | + const char *attr = NULL; | ||
| 60 | Py_ssize_t i, size; | ||
| 61 | int ret; | ||
| 62 | GValue value; | ||
| 63 | @@ -800,7 +800,7 @@ PyTypeObject EntityType = { | ||
| 64 | sizeof(struct libuser_entity), /* tp_basicsize */ | ||
| 65 | 0, /* tp_itemsize */ | ||
| 66 | libuser_entity_destroy, /* tp_dealloc */ | ||
| 67 | - NULL, /* tp_print */ | ||
| 68 | + 0, /* tp_print */ | ||
| 69 | NULL, /* tp_getattr */ | ||
| 70 | NULL, /* tp_setattr */ | ||
| 71 | NULL, /* tp_compare */ | ||
| 72 | diff --git a/python/misc.c b/python/misc.c | ||
| 73 | index c4ce819..810a846 100644 | ||
| 74 | --- a/python/misc.c | ||
| 75 | +++ b/python/misc.c | ||
| 76 | @@ -488,7 +488,7 @@ PyTypeObject PromptType = { | ||
| 77 | sizeof(struct libuser_prompt), /* tp_basicsize */ | ||
| 78 | 0, /* tp_itemsize */ | ||
| 79 | libuser_prompt_destroy, /* tp_dealloc */ | ||
| 80 | - NULL, /* tp_print */ | ||
| 81 | + 0, /* tp_print */ | ||
| 82 | NULL, /* tp_getattr */ | ||
| 83 | NULL, /* tp_setattr */ | ||
| 84 | NULL, /* tp_compare */ | ||
diff --git a/meta-gnome/recipes-support/libuser/libuser_0.63.bb b/meta-gnome/recipes-support/libuser/libuser_0.64.bb index e191e115a3..d86a577b10 100644 --- a/meta-gnome/recipes-support/libuser/libuser_0.63.bb +++ b/meta-gnome/recipes-support/libuser/libuser_0.64.bb | |||
| @@ -11,13 +11,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ | |||
| 11 | 11 | ||
| 12 | SECTION = "base" | 12 | SECTION = "base" |
| 13 | 13 | ||
| 14 | SRC_URI = "https://releases.pagure.org/libuser/libuser-${PV}.tar.xz \ | 14 | SRC_URI = "https://releases.pagure.org/libuser/libuser-${PV}.tar.gz \ |
| 15 | file://0001-docs-Disable-building.patch \ | 15 | file://0001-docs-Disable-building.patch \ |
| 16 | file://0002-remove-unused-execinfo.h.patch \ | 16 | file://0002-remove-unused-execinfo.h.patch \ |
| 17 | file://0003-python-Compilation-warnings-update.patch \ | ||
| 18 | " | 17 | " |
| 19 | 18 | ||
| 20 | SRC_URI[sha256sum] = "8dc377255452a68e82c4837ba22c3ee4ae3658971bf0f2ef67ed0b77fc497f91" | 19 | SRC_URI[sha256sum] = "ea6094c72cb9e60a42fb53509dc98d124a340f1c9222783b503208adc16a0a8f" |
| 21 | 20 | ||
| 22 | DEPENDS = "bison-native popt libpam glib-2.0 python3" | 21 | DEPENDS = "bison-native popt libpam glib-2.0 python3" |
| 23 | 22 | ||
