diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2023-12-18 22:47:19 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-20 07:47:00 +0000 |
commit | 6a47da632e451e9a4272877759e68b282386c4f4 (patch) | |
tree | b3914cfe0d979e702f6168fdeb48eb48af3f78f4 | |
parent | 0656a5d89df70562900be7030e3b97885875020f (diff) | |
download | poky-6a47da632e451e9a4272877759e68b282386c4f4.tar.gz |
glib-2.0: upgrade 2.78.1 -> 2.78.3
(From OE-Core rev: 419503d3d3402b683979696f248cd42f05c282b7)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
11 files changed, 31 insertions, 34 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch index 0d44ddf299..0e5f371cb5 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9ec4eedeb3f67db0bff09f5d859318d05ff47964 Mon Sep 17 00:00:00 2001 | 1 | From cf7df91cc8c3b4811235ef8aec144c5f0cf90bdb Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 15 Feb 2019 11:17:27 +0100 | 3 | Date: Fri, 15 Feb 2019 11:17:27 +0100 |
4 | Subject: [PATCH] Do not write $bindir into pkg-config files | 4 | Subject: [PATCH] Do not write $bindir into pkg-config files |
@@ -16,7 +16,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
16 | 2 files changed, 11 insertions(+), 11 deletions(-) | 16 | 2 files changed, 11 insertions(+), 11 deletions(-) |
17 | 17 | ||
18 | diff --git a/gio/meson.build b/gio/meson.build | 18 | diff --git a/gio/meson.build b/gio/meson.build |
19 | index a320c0f..86ce7c4 100644 | 19 | index 5f91586..1a95f4f 100644 |
20 | --- a/gio/meson.build | 20 | --- a/gio/meson.build |
21 | +++ b/gio/meson.build | 21 | +++ b/gio/meson.build |
22 | @@ -884,14 +884,14 @@ pkg.generate(libgio, | 22 | @@ -884,14 +884,14 @@ pkg.generate(libgio, |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch index 16f2d31496..1254466063 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c94e669de98a3892c699bd8d0d2b5164b2de747e Mon Sep 17 00:00:00 2001 | 1 | From b907a6681c4c24e5d3745538d9fcd471cf1c4c4a Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 15 Mar 2014 22:42:29 -0700 | 3 | Date: Sat, 15 Mar 2014 22:42:29 -0700 |
4 | Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux | 4 | Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux |
@@ -9,7 +9,6 @@ based systems therefore lets set DATADIRNAME to "share". | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
10 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
11 | 11 | ||
12 | |||
13 | --- | 12 | --- |
14 | m4macros/glib-gettext.m4 | 4 ++++ | 13 | m4macros/glib-gettext.m4 | 4 ++++ |
15 | 1 file changed, 4 insertions(+) | 14 | 1 file changed, 4 insertions(+) |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch index 597864d9ac..50d369c24e 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0015db45cd1bfefc04959dffab5dabeead93136f Mon Sep 17 00:00:00 2001 | 1 | From 6e2ddcb5465d10618345b12e0b4471ead0f14304 Mon Sep 17 00:00:00 2001 |
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
3 | Date: Tue, 22 Mar 2016 15:14:58 +0200 | 3 | Date: Tue, 22 Mar 2016 15:14:58 +0200 |
4 | Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM | 4 | Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM |
@@ -14,10 +14,10 @@ Upstream-Status: Inappropriate [OE specific] | |||
14 | 1 file changed, 1 insertion(+) | 14 | 1 file changed, 1 insertion(+) |
15 | 15 | ||
16 | diff --git a/gio/meson.build b/gio/meson.build | 16 | diff --git a/gio/meson.build b/gio/meson.build |
17 | index 2ef60ed..532b086 100644 | 17 | index f9fdf6e..5f91586 100644 |
18 | --- a/gio/meson.build | 18 | --- a/gio/meson.build |
19 | +++ b/gio/meson.build | 19 | +++ b/gio/meson.build |
20 | @@ -936,6 +936,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu | 20 | @@ -1005,6 +1005,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu |
21 | c_args : gio_c_args, | 21 | c_args : gio_c_args, |
22 | # intl.lib is not compatible with SAFESEH | 22 | # intl.lib is not compatible with SAFESEH |
23 | link_args : noseh_link_args, | 23 | link_args : noseh_link_args, |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch index 6fd93526ce..f810574d97 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4f47b8a8d650d185aa61aec2f56a283522a723c4 Mon Sep 17 00:00:00 2001 | 1 | From c8c223045821cac97f798cfa63f19853621a8a2a Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 12 Jun 2015 17:08:46 +0300 | 3 | Date: Fri, 12 Jun 2015 17:08:46 +0300 |
4 | Subject: [PATCH] Remove the warning about deprecated paths in schemas | 4 | Subject: [PATCH] Remove the warning about deprecated paths in schemas |
@@ -15,7 +15,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
15 | 1 file changed, 13 deletions(-) | 15 | 1 file changed, 13 deletions(-) |
16 | 16 | ||
17 | diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c | 17 | diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c |
18 | index 7888120..7acbd5b 100644 | 18 | index 04ef404..e791ce2 100644 |
19 | --- a/gio/glib-compile-schemas.c | 19 | --- a/gio/glib-compile-schemas.c |
20 | +++ b/gio/glib-compile-schemas.c | 20 | +++ b/gio/glib-compile-schemas.c |
21 | @@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state, | 21 | @@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state, |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch index 2e1e2313e8..e1d2fb0e54 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ba1728bc27c88597164957d000b70ec4be6edf28 Mon Sep 17 00:00:00 2001 | 1 | From bafde4eedc0a22b45e73ee6183b9a11393a1e400 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 13 Feb 2019 15:32:05 +0100 | 3 | Date: Wed, 13 Feb 2019 15:32:05 +0100 |
4 | Subject: [PATCH] Set host_machine correctly when building with mingw32 | 4 | Subject: [PATCH] Set host_machine correctly when building with mingw32 |
@@ -13,7 +13,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
13 | 3 files changed, 8 insertions(+), 5 deletions(-) | 13 | 3 files changed, 8 insertions(+), 5 deletions(-) |
14 | 14 | ||
15 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build | 15 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build |
16 | index f644aa2..64a8684 100644 | 16 | index 4ef3343..e498e7e 100644 |
17 | --- a/gio/tests/meson.build | 17 | --- a/gio/tests/meson.build |
18 | +++ b/gio/tests/meson.build | 18 | +++ b/gio/tests/meson.build |
19 | @@ -29,7 +29,7 @@ endif | 19 | @@ -29,7 +29,7 @@ endif |
@@ -25,7 +25,7 @@ index f644aa2..64a8684 100644 | |||
25 | common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] | 25 | common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] |
26 | endif | 26 | endif |
27 | 27 | ||
28 | @@ -210,7 +210,7 @@ if have_dbus_daemon | 28 | @@ -230,7 +230,7 @@ if have_dbus_daemon |
29 | endif | 29 | endif |
30 | 30 | ||
31 | # Test programs buildable on UNIX only | 31 | # Test programs buildable on UNIX only |
@@ -34,7 +34,7 @@ index f644aa2..64a8684 100644 | |||
34 | gio_tests += { | 34 | gio_tests += { |
35 | 'file' : {}, | 35 | 'file' : {}, |
36 | 'gdbus-peer-object-manager' : {}, | 36 | 'gdbus-peer-object-manager' : {}, |
37 | @@ -462,7 +462,7 @@ if host_machine.system() != 'windows' | 37 | @@ -562,7 +562,7 @@ if host_machine.system() != 'windows' |
38 | endif # unix | 38 | endif # unix |
39 | 39 | ||
40 | # Test programs buildable on Windows only | 40 | # Test programs buildable on Windows only |
@@ -43,7 +43,7 @@ index f644aa2..64a8684 100644 | |||
43 | gio_tests += {'win32-streams' : {}} | 43 | gio_tests += {'win32-streams' : {}} |
44 | endif | 44 | endif |
45 | 45 | ||
46 | @@ -532,7 +532,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' | 46 | @@ -632,7 +632,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' |
47 | } | 47 | } |
48 | endif | 48 | endif |
49 | 49 | ||
@@ -53,10 +53,10 @@ index f644aa2..64a8684 100644 | |||
53 | 'gdbus-example-unix-fd-client' : { | 53 | 'gdbus-example-unix-fd-client' : { |
54 | 'install' : false, | 54 | 'install' : false, |
55 | diff --git a/glib/tests/meson.build b/glib/tests/meson.build | 55 | diff --git a/glib/tests/meson.build b/glib/tests/meson.build |
56 | index db01b54..6950817 100644 | 56 | index d80c86e..5329cda 100644 |
57 | --- a/glib/tests/meson.build | 57 | --- a/glib/tests/meson.build |
58 | +++ b/glib/tests/meson.build | 58 | +++ b/glib/tests/meson.build |
59 | @@ -188,7 +188,7 @@ if glib_conf.has('HAVE_EVENTFD') | 59 | @@ -216,7 +216,7 @@ if glib_conf.has('HAVE_EVENTFD') |
60 | } | 60 | } |
61 | endif | 61 | endif |
62 | 62 | ||
@@ -66,10 +66,10 @@ index db01b54..6950817 100644 | |||
66 | glib_tests += { | 66 | glib_tests += { |
67 | 'gpoll' : { | 67 | 'gpoll' : { |
68 | diff --git a/meson.build b/meson.build | 68 | diff --git a/meson.build b/meson.build |
69 | index 43bb468..5f9b59c 100644 | 69 | index f7e936e..122f8b5 100644 |
70 | --- a/meson.build | 70 | --- a/meson.build |
71 | +++ b/meson.build | 71 | +++ b/meson.build |
72 | @@ -43,6 +43,9 @@ else | 72 | @@ -54,6 +54,9 @@ else |
73 | endif | 73 | endif |
74 | 74 | ||
75 | host_system = host_machine.system() | 75 | host_system = host_machine.system() |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch index d33fdd4d8b..e4c2f77459 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 92de6c7eb30b961b24a2dce812d5276487b7d23d Mon Sep 17 00:00:00 2001 | 1 | From 3f05b9418c88bbb83c08b57cc5529b006f26fff4 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 8 Jan 2020 18:22:46 +0100 | 3 | Date: Wed, 8 Jan 2020 18:22:46 +0100 |
4 | Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test | 4 | Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test |
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/gio/tests/resources.c b/gio/tests/resources.c | 16 | diff --git a/gio/tests/resources.c b/gio/tests/resources.c |
17 | index c44d214..e289a01 100644 | 17 | index f567914..b21b616 100644 |
18 | --- a/gio/tests/resources.c | 18 | --- a/gio/tests/resources.c |
19 | +++ b/gio/tests/resources.c | 19 | +++ b/gio/tests/resources.c |
20 | @@ -993,7 +993,7 @@ main (int argc, | 20 | @@ -1068,7 +1068,7 @@ main (int argc, |
21 | g_test_add_func ("/resource/automatic", test_resource_automatic); | 21 | g_test_add_func ("/resource/automatic", test_resource_automatic); |
22 | /* This only uses automatic resources too, so it tests the constructors and destructors */ | 22 | /* This only uses automatic resources too, so it tests the constructors and destructors */ |
23 | g_test_add_func ("/resource/module", test_resource_module); | 23 | g_test_add_func ("/resource/module", test_resource_module); |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch index 44482dd2b7..071e4a7c4d 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4b97f457b7b44117e27d2a218c4b68e7fe3fe4ce Mon Sep 17 00:00:00 2001 | 1 | From 17d718640ae6f953e5eea714c1bd64eeb6e4799f Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 12 Oct 2019 17:46:26 -0700 | 3 | Date: Sat, 12 Oct 2019 17:46:26 -0700 |
4 | Subject: [PATCH] meson: Run atomics test on clang as well | 4 | Subject: [PATCH] meson: Run atomics test on clang as well |
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/meson.build b/meson.build | 17 | diff --git a/meson.build b/meson.build |
18 | index afb6eaa..6aa70f5 100644 | 18 | index 122f8b5..f055079 100644 |
19 | --- a/meson.build | 19 | --- a/meson.build |
20 | +++ b/meson.build | 20 | +++ b/meson.build |
21 | @@ -1692,7 +1692,7 @@ atomicdefine = ''' | 21 | @@ -1938,7 +1938,7 @@ atomicdefine = ''' |
22 | # We know that we can always use real ("lock free") atomic operations with MSVC | 22 | # We know that we can always use real ("lock free") atomic operations with MSVC |
23 | if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops') | 23 | if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops') |
24 | have_atomic_lock_free = true | 24 | have_atomic_lock_free = true |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch index 788f420d11..e03f9a3c84 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9aa9574861fad39d0679025e35fe1e188345f685 Mon Sep 17 00:00:00 2001 | 1 | From 7865d698b5d392aac3a3d32e9ebd5fea45017d15 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Sat, 16 Sep 2023 22:28:27 +0200 | 3 | Date: Sat, 16 Sep 2023 22:28:27 +0200 |
4 | Subject: [PATCH] meson.build: do not enable pidfd features on native glib | 4 | Subject: [PATCH] meson.build: do not enable pidfd features on native glib |
@@ -9,12 +9,13 @@ where these features are not implemented. | |||
9 | 9 | ||
10 | Upstream-Status: Inappropriate [oe-core specific] | 10 | Upstream-Status: Inappropriate [oe-core specific] |
11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
12 | |||
12 | --- | 13 | --- |
13 | meson.build | 3 ++- | 14 | meson.build | 3 ++- |
14 | 1 file changed, 2 insertions(+), 1 deletion(-) | 15 | 1 file changed, 2 insertions(+), 1 deletion(-) |
15 | 16 | ||
16 | diff --git a/meson.build b/meson.build | 17 | diff --git a/meson.build b/meson.build |
17 | index 1c36993..bbf97fc 100644 | 18 | index f055079..77d78aa 100644 |
18 | --- a/meson.build | 19 | --- a/meson.build |
19 | +++ b/meson.build | 20 | +++ b/meson.build |
20 | @@ -981,7 +981,8 @@ if cc.links('''#include <sys/syscall.h> | 21 | @@ -981,7 +981,8 @@ if cc.links('''#include <sys/syscall.h> |
@@ -27,6 +28,3 @@ index 1c36993..bbf97fc 100644 | |||
27 | endif | 28 | endif |
28 | 29 | ||
29 | # Check for __uint128_t (gcc) by checking for 128-bit division | 30 | # Check for __uint128_t (gcc) by checking for 128-bit division |
30 | -- | ||
31 | 2.30.2 | ||
32 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch b/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch index 1c645f3a9a..4b75167da6 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 79ce7e545dd3a93f77d2146d50b6fa061fbceed9 Mon Sep 17 00:00:00 2001 | 1 | From 53bcd4b6cd3fe3fe4246914462e6724761eecf51 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Tue, 3 Oct 2017 10:45:55 +0300 | 3 | Date: Tue, 3 Oct 2017 10:45:55 +0300 |
4 | Subject: [PATCH] Do not hardcode python path into various tools | 4 | Subject: [PATCH] Do not hardcode python path into various tools |
@@ -23,7 +23,7 @@ index 67d3675..4e92a7a 100755 | |||
23 | # GDBus - GLib D-Bus Library | 23 | # GDBus - GLib D-Bus Library |
24 | # | 24 | # |
25 | diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in | 25 | diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in |
26 | index 7380f24..c8abeaa 100755 | 26 | index aa5af43..56e8e2e 100755 |
27 | --- a/gobject/glib-genmarshal.in | 27 | --- a/gobject/glib-genmarshal.in |
28 | +++ b/gobject/glib-genmarshal.in | 28 | +++ b/gobject/glib-genmarshal.in |
29 | @@ -1,4 +1,4 @@ | 29 | @@ -1,4 +1,4 @@ |
@@ -33,7 +33,7 @@ index 7380f24..c8abeaa 100755 | |||
33 | # pylint: disable=too-many-lines, missing-docstring, invalid-name | 33 | # pylint: disable=too-many-lines, missing-docstring, invalid-name |
34 | 34 | ||
35 | diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in | 35 | diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in |
36 | index 91ad779..3ebef62 100755 | 36 | index 353e53a..8ed6c39 100755 |
37 | --- a/gobject/glib-mkenums.in | 37 | --- a/gobject/glib-mkenums.in |
38 | +++ b/gobject/glib-mkenums.in | 38 | +++ b/gobject/glib-mkenums.in |
39 | @@ -1,4 +1,4 @@ | 39 | @@ -1,4 +1,4 @@ |
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 841fedef8a..95a73298d8 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 @@ | |||
1 | From b90d13900dd2777c2ab90c5b0be1a872c10a17da Mon Sep 17 00:00:00 2001 | 1 | From 03a069cb8066d3e8ef72a43f7b1db5c9625e9cc2 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Fri, 11 Mar 2016 15:35:55 +0000 | 3 | Date: Fri, 11 Mar 2016 15:35:55 +0000 |
4 | Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds | 4 | 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.78.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.78.3.bb index a490262112..13d4b38e22 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.78.1.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.78.3.bb | |||
@@ -19,7 +19,7 @@ SRC_URI:append:class-native = " file://relocate-modules.patch \ | |||
19 | file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ | 19 | file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ |
20 | " | 20 | " |
21 | 21 | ||
22 | SRC_URI[sha256sum] = "915bc3d0f8507d650ead3832e2f8fb670fce59aac4d7754a7dab6f1e6fed78b2" | 22 | SRC_URI[sha256sum] = "609801dd373796e515972bf95fc0b2daa44545481ee2f465c4f204d224b2bc21" |
23 | 23 | ||
24 | # Find any meson cross files in FILESPATH that are relevant for the current | 24 | # Find any meson cross files in FILESPATH that are relevant for the current |
25 | # build (using siteinfo) and add them to EXTRA_OEMESON. | 25 | # build (using siteinfo) and add them to EXTRA_OEMESON. |