summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2022-11-07 16:31:29 +0800
committerKhem Raj <raj.khem@gmail.com>2022-11-09 10:17:15 -0800
commit469a732d364ba9305daaa62f1b6dfe7105be5dfd (patch)
tree02e22aa50eb3c23045500d2a436aa3aaee5e371c
parent2653feac2c6ea3f1c1ae12ffdb723c143d1a4b0c (diff)
downloadmeta-openembedded-469a732d364ba9305daaa62f1b6dfe7105be5dfd.tar.gz
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 <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/satyr/files/0001-py_base_stacktrace.c-include-glib.h.patch29
-rw-r--r--meta-oe/recipes-support/satyr/satyr_0.40.bb (renamed from meta-oe/recipes-support/satyr/satyr_0.39.bb)5
2 files changed, 2 insertions, 32 deletions
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 @@
1From 3b84fe4375292d00ebb605a5917e66129fe5f0cb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 24 Aug 2022 23:26:46 -0700
4Subject: [PATCH] py_base_stacktrace.c: include glib.h
5
6This file has references to g_free from glib-2.0 which needs this header
7
8Upstream-Status: Submitted [https://github.com/abrt/satyr/pull/333]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 python/py_base_stacktrace.c | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/python/py_base_stacktrace.c b/python/py_base_stacktrace.c
15index b9bd16c..301db84 100644
16--- a/python/py_base_stacktrace.c
17+++ b/python/py_base_stacktrace.c
18@@ -17,7 +17,7 @@
19 with this program; if not, write to the Free Software Foundation, Inc.,
20 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
21 */
22-
23+#include <glib.h>
24 #include "py_common.h"
25 #include "py_base_thread.h"
26 #include "py_base_stacktrace.h"
27--
282.37.2
29
diff --git a/meta-oe/recipes-support/satyr/satyr_0.39.bb b/meta-oe/recipes-support/satyr/satyr_0.40.bb
index be1ef3f790..5b44618b72 100644
--- a/meta-oe/recipes-support/satyr/satyr_0.39.bb
+++ b/meta-oe/recipes-support/satyr/satyr_0.40.bb
@@ -9,9 +9,8 @@ inherit autotools-brokensep python3native pkgconfig
9 9
10SRC_URI = "git://github.com/abrt/satyr.git;branch=master;protocol=https \ 10SRC_URI = "git://github.com/abrt/satyr.git;branch=master;protocol=https \
11 file://0002-fix-compile-failure-against-musl-C-library.patch \ 11 file://0002-fix-compile-failure-against-musl-C-library.patch \
12 file://0001-py_base_stacktrace.c-include-glib.h.patch \ 12 "
13" 13SRCREV = "61addf12d15ef9d0bff5e3cc26e08d08a4f88094"
14SRCREV = "f8a0dbfe7fcc6e44f03d66ca5c81363aea318380"
15S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
16 15
17LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 16LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"