From 469a732d364ba9305daaa62f1b6dfe7105be5dfd Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 7 Nov 2022 16:31:29 +0800 Subject: satyr: upgrade 0.39 -> 0.40 0001-py_base_stacktrace.c-include-glib.h.patch removed since it's included in 0.40 Changelog: ========= py_base_stacktrace.c: include glib.h Add support for fine-grained error location lines in Python tracebacks Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../0001-py_base_stacktrace.c-include-glib.h.patch | 29 ----------------- meta-oe/recipes-support/satyr/satyr_0.39.bb | 36 ---------------------- meta-oe/recipes-support/satyr/satyr_0.40.bb | 35 +++++++++++++++++++++ 3 files changed, 35 insertions(+), 65 deletions(-) delete mode 100644 meta-oe/recipes-support/satyr/files/0001-py_base_stacktrace.c-include-glib.h.patch delete mode 100644 meta-oe/recipes-support/satyr/satyr_0.39.bb create mode 100644 meta-oe/recipes-support/satyr/satyr_0.40.bb diff --git a/meta-oe/recipes-support/satyr/files/0001-py_base_stacktrace.c-include-glib.h.patch b/meta-oe/recipes-support/satyr/files/0001-py_base_stacktrace.c-include-glib.h.patch deleted file mode 100644 index fe3b1c12d2..0000000000 --- a/meta-oe/recipes-support/satyr/files/0001-py_base_stacktrace.c-include-glib.h.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3b84fe4375292d00ebb605a5917e66129fe5f0cb Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 24 Aug 2022 23:26:46 -0700 -Subject: [PATCH] py_base_stacktrace.c: include glib.h - -This file has references to g_free from glib-2.0 which needs this header - -Upstream-Status: Submitted [https://github.com/abrt/satyr/pull/333] -Signed-off-by: Khem Raj ---- - python/py_base_stacktrace.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/python/py_base_stacktrace.c b/python/py_base_stacktrace.c -index b9bd16c..301db84 100644 ---- a/python/py_base_stacktrace.c -+++ b/python/py_base_stacktrace.c -@@ -17,7 +17,7 @@ - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ -- -+#include - #include "py_common.h" - #include "py_base_thread.h" - #include "py_base_stacktrace.h" --- -2.37.2 - diff --git a/meta-oe/recipes-support/satyr/satyr_0.39.bb b/meta-oe/recipes-support/satyr/satyr_0.39.bb deleted file mode 100644 index be1ef3f790..0000000000 --- a/meta-oe/recipes-support/satyr/satyr_0.39.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "Satyr is a collection of low-level algorithms for program \ -failure processing, analysis, and reporting supporting kernel space, user \ -space, Python, and Java programs" - -HOMEPAGE = "https://github.com/abrt/satyr" -LICENSE = "GPL-2.0-only" - -inherit autotools-brokensep python3native pkgconfig - -SRC_URI = "git://github.com/abrt/satyr.git;branch=master;protocol=https \ - file://0002-fix-compile-failure-against-musl-C-library.patch \ - file://0001-py_base_stacktrace.c-include-glib.h.patch \ -" -SRCREV = "f8a0dbfe7fcc6e44f03d66ca5c81363aea318380" -S = "${WORKDIR}/git" - -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -DEPENDS += " \ - gdb \ - gperf-native \ - json-c \ - nettle \ - glib-2.0 \ -" - -PACKAGES += "python3-${BPN}" -FILES:python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/${BPN}" - -PACKAGECONFIG ??= "python3 rpm" -PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" -PACKAGECONFIG[rpm] = "--with-rpm, --without-rpm, rpm" - -do_configure:prepend() { - ${S}/gen-version -} diff --git a/meta-oe/recipes-support/satyr/satyr_0.40.bb b/meta-oe/recipes-support/satyr/satyr_0.40.bb new file mode 100644 index 0000000000..5b44618b72 --- /dev/null +++ b/meta-oe/recipes-support/satyr/satyr_0.40.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Satyr is a collection of low-level algorithms for program \ +failure processing, analysis, and reporting supporting kernel space, user \ +space, Python, and Java programs" + +HOMEPAGE = "https://github.com/abrt/satyr" +LICENSE = "GPL-2.0-only" + +inherit autotools-brokensep python3native pkgconfig + +SRC_URI = "git://github.com/abrt/satyr.git;branch=master;protocol=https \ + file://0002-fix-compile-failure-against-musl-C-library.patch \ + " +SRCREV = "61addf12d15ef9d0bff5e3cc26e08d08a4f88094" +S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS += " \ + gdb \ + gperf-native \ + json-c \ + nettle \ + glib-2.0 \ +" + +PACKAGES += "python3-${BPN}" +FILES:python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/${BPN}" + +PACKAGECONFIG ??= "python3 rpm" +PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" +PACKAGECONFIG[rpm] = "--with-rpm, --without-rpm, rpm" + +do_configure:prepend() { + ${S}/gen-version +} -- cgit v1.2.3-54-g00ecf