summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-codegen.py-do-not-print-stdout.patch23
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch2
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.66.2.bb1
3 files changed, 1 insertions, 25 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-codegen.py-do-not-print-stdout.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-codegen.py-do-not-print-stdout.patch
deleted file mode 100644
index 01840fb6512..00000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-codegen.py-do-not-print-stdout.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 978a33fefe4d939ff4f8d1e032370af270682055 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Thu, 17 Dec 2020 22:14:28 +0100
-Subject: [PATCH] codegen.py: do not print stdout
-
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- gio/tests/codegen.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gio/tests/codegen.py b/gio/tests/codegen.py
-index 51de0ed..8f93ac6 100644
---- a/gio/tests/codegen.py
-+++ b/gio/tests/codegen.py
-@@ -250,7 +250,7 @@ class TestCodegen(unittest.TestCase):
-
- result = Result(info, out, err, subs)
-
-- print('Output:', result.out)
-+ #print('Output:', result.out)
- return result
-
- def runCodegenWithInterface(self, interface_contents, *args):
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
index 084267794ee..2b8e9305119 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
@@ -1,4 +1,4 @@
-From 233b6b15b21fdd68f41715c027eaeb9a914c4ffd Mon Sep 17 00:00:00 2001
+From 85931fbb981b5aae38f1c1370d5d3c091cb862b8 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Fri, 11 Mar 2016 15:35:55 +0000
Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.66.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.66.2.bb
index cf1f66628d5..1f83660856c 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.66.2.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.66.2.bb
@@ -16,7 +16,6 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
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://0001-codegen.py-do-not-print-stdout.patch \
"
SRC_URI_append_class-native = " file://relocate-modules.patch"