summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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
16--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in 16--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
17+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in 17+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
18@@ -1,4 +1,4 @@ 18@@ -1,4 +1,4 @@
19-#!/usr/bin/env @PYTHON@ 19-#!@PYTHON@
20+#!/usr/bin/env python3 20+#!/usr/bin/env python3
21 21
22 # GDBus - GLib D-Bus Library 22 # GDBus - GLib D-Bus Library
@@ -26,7 +26,7 @@ index aa5af43..56e8e2e 100755
26--- a/gobject/glib-genmarshal.in 26--- a/gobject/glib-genmarshal.in
27+++ b/gobject/glib-genmarshal.in 27+++ b/gobject/glib-genmarshal.in
28@@ -1,4 +1,4 @@ 28@@ -1,4 +1,4 @@
29-#!/usr/bin/env @PYTHON@ 29-#!@PYTHON@
30+#!/usr/bin/env python3 30+#!/usr/bin/env python3
31 31
32 # pylint: disable=too-many-lines, missing-docstring, invalid-name 32 # pylint: disable=too-many-lines, missing-docstring, invalid-name
@@ -36,7 +36,7 @@ index e10b910..4b619f8 100755
36--- a/gobject/glib-mkenums.in 36--- a/gobject/glib-mkenums.in
37+++ b/gobject/glib-mkenums.in 37+++ b/gobject/glib-mkenums.in
38@@ -1,4 +1,4 @@ 38@@ -1,4 +1,4 @@
39-#!/usr/bin/env @PYTHON@ 39-#!@PYTHON@
40+#!/usr/bin/env python3 40+#!/usr/bin/env python3
41 41
42 # If the code below looks horrible and unpythonic, do not panic. 42 # 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 \
221 file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \ 221 file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \
222 file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ 222 file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
223 file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ 223 file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
224 file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
225 file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ 224 file://0001-Do-not-write-bindir-into-pkg-config-files.patch \
226 file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ 225 file://0001-meson-Run-atomics-test-on-clang-as-well.patch \
227 file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ 226 file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \
227 file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
228 file://skip-timeout.patch \ 228 file://skip-timeout.patch \
229 " 229 "
230SRC_URI:append:class-native = " file://relocate-modules.patch \ 230SRC_URI:append:class-native = " file://relocate-modules.patch \
231 file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ 231 file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \
232 " 232 "
233 233
234SRC_URI[sha256sum] = "24e029c5dfc9b44e4573697adf33078a9827c48938555004b3b9096fa4ea034f" 234SRC_URI[sha256sum] = "478634440bf52ee4ec4428d558787398c0be6b043c521beb308334b3db4489a6"
235 235
236# Find any meson cross files in FILESPATH that are relevant for the current 236# Find any meson cross files in FILESPATH that are relevant for the current
237# build (using siteinfo) and add them to EXTRA_OEMESON. 237# build (using siteinfo) and add them to EXTRA_OEMESON.