summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Volk <f_l_k@t-online.de>2024-09-20 11:58:13 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-09-20 15:56:27 +0100
commitde2d07df6efb6c4d01f31d3f6d902b630f747400 (patch)
tree8a186ef32be2faaa693861a27d0b67b31dd30630
parentd8fc811bc7f93361ec5e43b213b29ab2f0276f23 (diff)
downloadopenembedded-core-de2d07df6efb6c4d01f31d3f6d902b630f747400.tar.gz
glib-2.0: update 2.80.4 -> 2.82.1
- adjust 0010-Do-not-hardcode-python-path-into-various-tools.patch Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch6
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0-initial_2.82.1.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0-initial_2.80.4.bb)0
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.82.1.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.80.4.bb)0
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc4
4 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch b/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch
index 30a6bd4c3a..4609f1fb2b 100644
--- a/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch
+++ b/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch
@@ -16,7 +16,7 @@ index 67d3675..4e92a7a 100755
--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
@@ -1,4 +1,4 @@
--#!/usr/bin/env @PYTHON@
+-#!@PYTHON@
+#!/usr/bin/env python3
# GDBus - GLib D-Bus Library
@@ -26,7 +26,7 @@ index aa5af43..56e8e2e 100755
--- a/gobject/glib-genmarshal.in
+++ b/gobject/glib-genmarshal.in
@@ -1,4 +1,4 @@
--#!/usr/bin/env @PYTHON@
+-#!@PYTHON@
+#!/usr/bin/env python3
# pylint: disable=too-many-lines, missing-docstring, invalid-name
@@ -36,7 +36,7 @@ index e10b910..4b619f8 100755
--- a/gobject/glib-mkenums.in
+++ b/gobject/glib-mkenums.in
@@ -1,4 +1,4 @@
--#!/usr/bin/env @PYTHON@
+-#!@PYTHON@
+#!/usr/bin/env python3
# If the code below looks horrible and unpythonic, do not panic.
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-initial_2.80.4.bb b/meta/recipes-core/glib-2.0/glib-2.0-initial_2.82.1.bb
index acec7e9676..acec7e9676 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0-initial_2.80.4.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0-initial_2.82.1.bb
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.80.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.82.1.bb
index ef80cc47cf..ef80cc47cf 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.80.4.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.82.1.bb
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 9e742c4d3b..0855e6eb00 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -221,17 +221,17 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \
file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
- file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
file://0001-Do-not-write-bindir-into-pkg-config-files.patch \
file://0001-meson-Run-atomics-test-on-clang-as-well.patch \
file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \
+ file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
file://skip-timeout.patch \
"
SRC_URI:append:class-native = " file://relocate-modules.patch \
file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \
"
-SRC_URI[sha256sum] = "24e029c5dfc9b44e4573697adf33078a9827c48938555004b3b9096fa4ea034f"
+SRC_URI[sha256sum] = "478634440bf52ee4ec4428d558787398c0be6b043c521beb308334b3db4489a6"
# Find any meson cross files in FILESPATH that are relevant for the current
# build (using siteinfo) and add them to EXTRA_OEMESON.