diff mbox series

[meta-oe] satyr: upgrade 0.39 -> 0.40

Message ID 1667809891-30889-3-git-send-email-wangmy@fujitsu.com
State Under Review
Headers show
Series [meta-oe] satyr: upgrade 0.39 -> 0.40 | expand

Commit Message

Mingyu Wang (Fujitsu) Nov. 7, 2022, 8:31 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

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>
---
 ...-py_base_stacktrace.c-include-glib.h.patch | 29 -------------------
 .../satyr/{satyr_0.39.bb => satyr_0.40.bb}    |  5 ++--
 2 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 meta-oe/recipes-support/satyr/files/0001-py_base_stacktrace.c-include-glib.h.patch
 rename meta-oe/recipes-support/satyr/{satyr_0.39.bb => satyr_0.40.bb} (88%)
diff mbox series

Patch

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 fe3b1c12d..000000000
--- 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 <raj.khem@gmail.com>
-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 <raj.khem@gmail.com>
----
- 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 <glib.h>
- #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.40.bb
similarity index 88%
rename from meta-oe/recipes-support/satyr/satyr_0.39.bb
rename to meta-oe/recipes-support/satyr/satyr_0.40.bb
index be1ef3f79..5b44618b7 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
 
 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"
+           "
+SRCREV = "61addf12d15ef9d0bff5e3cc26e08d08a4f88094"
 S = "${WORKDIR}/git"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"