diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-03-06 07:42:08 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-07 17:25:02 +0000 |
commit | c8127fe26b709ddf36adcbd475bb0f116b2f0cf1 (patch) | |
tree | b328c41529d03779bdc4a8919df2847a19b9afd7 | |
parent | 2f12d80948877a520a579aa66d7f2da392524a80 (diff) | |
download | poky-c8127fe26b709ddf36adcbd475bb0f116b2f0cf1.tar.gz |
glib-2.0: upgrade 2.78.3 -> 2.78.4
(From OE-Core rev: 53118dd8f096c5467223182ada0e0b07fd6471f6)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
14 files changed, 20 insertions, 55 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 0e5f371cb5..8e6598fbef 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 cf7df91cc8c3b4811235ef8aec144c5f0cf90bdb Mon Sep 17 00:00:00 2001 | 1 | From e7077aa23bfcd31a8e72e39dc93ce4f854678376 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 |
@@ -9,7 +9,6 @@ rather than use target paths). | |||
9 | 9 | ||
10 | Upstream-Status: Inappropriate [upstream wants the paths in .pc files] | 10 | Upstream-Status: Inappropriate [upstream wants the paths in .pc files] |
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
12 | |||
13 | --- | 12 | --- |
14 | gio/meson.build | 16 ++++++++-------- | 13 | gio/meson.build | 16 ++++++++-------- |
15 | glib/meson.build | 6 +++--- | 14 | glib/meson.build | 6 +++--- |
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 1254466063..eb9dfdbcf9 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 b907a6681c4c24e5d3745538d9fcd471cf1c4c4a Mon Sep 17 00:00:00 2001 | 1 | From 9a5d4bf65b658d744d610ee27ecd2ae65b14b158 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 |
@@ -8,7 +8,6 @@ based systems therefore lets set DATADIRNAME to "share". | |||
8 | 8 | ||
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 | |||
12 | --- | 11 | --- |
13 | m4macros/glib-gettext.m4 | 4 ++++ | 12 | m4macros/glib-gettext.m4 | 4 ++++ |
14 | 1 file changed, 4 insertions(+) | 13 | 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 50d369c24e..ad69f7ec65 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 6e2ddcb5465d10618345b12e0b4471ead0f14304 Mon Sep 17 00:00:00 2001 | 1 | From 4933aef791857a5aac650b60af800778658b875b 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 |
@@ -8,7 +8,6 @@ renamer does not cope with library packages with files in ${bindir} | |||
8 | 8 | ||
9 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | 9 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
10 | Upstream-Status: Inappropriate [OE specific] | 10 | Upstream-Status: Inappropriate [OE specific] |
11 | |||
12 | --- | 11 | --- |
13 | gio/meson.build | 1 + | 12 | gio/meson.build | 1 + |
14 | 1 file changed, 1 insertion(+) | 13 | 1 file changed, 1 insertion(+) |
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 f810574d97..0e3a62af6a 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 c8c223045821cac97f798cfa63f19853621a8a2a Mon Sep 17 00:00:00 2001 | 1 | From 8ae2e9c2a04e089306693a021149dc6b7d1bd679 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 |
@@ -9,7 +9,6 @@ messages, and meta/lib/oe/rootfs.py complaints about them. | |||
9 | 9 | ||
10 | Upstream-Status: Inappropriate | 10 | Upstream-Status: Inappropriate |
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
12 | |||
13 | --- | 12 | --- |
14 | gio/glib-compile-schemas.c | 13 ------------- | 13 | gio/glib-compile-schemas.c | 13 ------------- |
15 | 1 file changed, 13 deletions(-) | 14 | 1 file changed, 13 deletions(-) |
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 e1d2fb0e54..32b4cea409 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,11 +1,10 @@ | |||
1 | From bafde4eedc0a22b45e73ee6183b9a11393a1e400 Mon Sep 17 00:00:00 2001 | 1 | From c0733f7a91dfe13152abc60c5a3064456b3e9d63 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 |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe-core specific] | 6 | Upstream-Status: Inappropriate [oe-core specific] |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | |||
9 | --- | 8 | --- |
10 | gio/tests/meson.build | 8 ++++---- | 9 | gio/tests/meson.build | 8 ++++---- |
11 | glib/tests/meson.build | 2 +- | 10 | glib/tests/meson.build | 2 +- |
@@ -66,7 +65,7 @@ index d80c86e..5329cda 100644 | |||
66 | glib_tests += { | 65 | glib_tests += { |
67 | 'gpoll' : { | 66 | 'gpoll' : { |
68 | diff --git a/meson.build b/meson.build | 67 | diff --git a/meson.build b/meson.build |
69 | index f7e936e..122f8b5 100644 | 68 | index 813c9b7..6ee775e 100644 |
70 | --- a/meson.build | 69 | --- a/meson.build |
71 | +++ b/meson.build | 70 | +++ b/meson.build |
72 | @@ -54,6 +54,9 @@ else | 71 | @@ -54,6 +54,9 @@ else |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch index 50368ed22c..b11c283e6d 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 05f0674c93d94fe6b29c1b707980aac469ddcd72 Mon Sep 17 00:00:00 2001 | 1 | From a8eb944a10353403241608a084787f6efcbb2eb7 Mon Sep 17 00:00:00 2001 |
2 | From: Jordan Williams <jordan@jwillikers.com> | 2 | From: Jordan Williams <jordan@jwillikers.com> |
3 | Date: Fri, 1 Dec 2023 09:53:50 -0600 | 3 | Date: Fri, 1 Dec 2023 09:53:50 -0600 |
4 | Subject: [PATCH] Switch from the deprecated distutils module to the packaging | 4 | Subject: [PATCH] Switch from the deprecated distutils module to the packaging |
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 e4c2f77459..aee2986033 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 3f05b9418c88bbb83c08b57cc5529b006f26fff4 Mon Sep 17 00:00:00 2001 | 1 | From 878e51f82100c698236fda0e069e14ea9249350c 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 |
@@ -8,7 +8,6 @@ not cross-compatible (hardcodes ld and objcopy). | |||
8 | 8 | ||
9 | Upstream-Status: Inappropriate [oe-core specific] | 9 | Upstream-Status: Inappropriate [oe-core specific] |
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
11 | |||
12 | --- | 11 | --- |
13 | gio/tests/resources.c | 2 +- | 12 | gio/tests/resources.c | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
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 071e4a7c4d..0b10269114 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 17d718640ae6f953e5eea714c1bd64eeb6e4799f Mon Sep 17 00:00:00 2001 | 1 | From b4b523160ef550a53705fcc45ac6e10d086ce491 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 |
@@ -9,13 +9,12 @@ Fixes | |||
9 | 9 | ||
10 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | |||
13 | --- | 12 | --- |
14 | meson.build | 2 +- | 13 | meson.build | 2 +- |
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 15 | ||
17 | diff --git a/meson.build b/meson.build | 16 | diff --git a/meson.build b/meson.build |
18 | index 122f8b5..f055079 100644 | 17 | index 6ee775e..8bc5fa7 100644 |
19 | --- a/meson.build | 18 | --- a/meson.build |
20 | +++ b/meson.build | 19 | +++ b/meson.build |
21 | @@ -1938,7 +1938,7 @@ atomicdefine = ''' | 20 | @@ -1938,7 +1938,7 @@ atomicdefine = ''' |
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 e03f9a3c84..14dcb278e0 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 7865d698b5d392aac3a3d32e9ebd5fea45017d15 Mon Sep 17 00:00:00 2001 | 1 | From 294f3e6e9a0a9f4733e85ed6810d1b743055370b 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,13 +9,12 @@ 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 | |||
13 | --- | 12 | --- |
14 | meson.build | 3 ++- | 13 | meson.build | 3 ++- |
15 | 1 file changed, 2 insertions(+), 1 deletion(-) | 14 | 1 file changed, 2 insertions(+), 1 deletion(-) |
16 | 15 | ||
17 | diff --git a/meson.build b/meson.build | 16 | diff --git a/meson.build b/meson.build |
18 | index f055079..77d78aa 100644 | 17 | index 8bc5fa7..df1fa60 100644 |
19 | --- a/meson.build | 18 | --- a/meson.build |
20 | +++ b/meson.build | 19 | +++ b/meson.build |
21 | @@ -981,7 +981,8 @@ if cc.links('''#include <sys/syscall.h> | 20 | @@ -981,7 +981,8 @@ if cc.links('''#include <sys/syscall.h> |
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 4b75167da6..6dff5179c7 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,11 +1,10 @@ | |||
1 | From 53bcd4b6cd3fe3fe4246914462e6724761eecf51 Mon Sep 17 00:00:00 2001 | 1 | From 50636758c73e5e61212a8f801c6c602b8aab5ba7 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 |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe-core specific] | 6 | Upstream-Status: Inappropriate [oe-core specific] |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | |||
9 | --- | 8 | --- |
10 | gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +- | 9 | gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +- |
11 | gobject/glib-genmarshal.in | 2 +- | 10 | gobject/glib-genmarshal.in | 2 +- |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/memory-monitor.patch b/meta/recipes-core/glib-2.0/glib-2.0/memory-monitor.patch index f9dfc5bb05..4f38509da6 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/memory-monitor.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/memory-monitor.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From df7506918efc8748dac8b8398021e1b79d694ba4 Mon Sep 17 00:00:00 2001 | 1 | From ce840b6b111e1e109e511f6833d6aa419e2b723a Mon Sep 17 00:00:00 2001 |
2 | From: Philip Withnall <philip@tecnocode.co.uk> | 2 | From: Philip Withnall <philip@tecnocode.co.uk> |
3 | Date: Tue, 23 Jan 2024 11:16:52 +0000 | 3 | Date: Tue, 23 Jan 2024 11:16:52 +0000 |
4 | Subject: [PATCH] Merge branch '2887-memory-monitor-tests' into 'main' | 4 | Subject: [PATCH] Merge branch '2887-memory-monitor-tests' into 'main' |
@@ -22,7 +22,7 @@ Signed-off-by: Ross Burton <ross.burton@arm.com> | |||
22 | 4 files changed, 113 insertions(+), 74 deletions(-) | 22 | 4 files changed, 113 insertions(+), 74 deletions(-) |
23 | 23 | ||
24 | diff --git a/gio/tests/memory-monitor-dbus.py.in b/gio/tests/memory-monitor-dbus.py.in | 24 | diff --git a/gio/tests/memory-monitor-dbus.py.in b/gio/tests/memory-monitor-dbus.py.in |
25 | index bf3291847..7aae01e70 100755 | 25 | index bf32918..7aae01e 100755 |
26 | --- a/gio/tests/memory-monitor-dbus.py.in | 26 | --- a/gio/tests/memory-monitor-dbus.py.in |
27 | +++ b/gio/tests/memory-monitor-dbus.py.in | 27 | +++ b/gio/tests/memory-monitor-dbus.py.in |
28 | @@ -16,7 +16,6 @@ import sys | 28 | @@ -16,7 +16,6 @@ import sys |
@@ -130,7 +130,7 @@ index bf3291847..7aae01e70 100755 | |||
130 | except ImportError as e: | 130 | except ImportError as e: |
131 | @unittest.skip("Cannot import %s" % e.name) | 131 | @unittest.skip("Cannot import %s" % e.name) |
132 | diff --git a/gio/tests/memory-monitor-portal.py.in b/gio/tests/memory-monitor-portal.py.in | 132 | diff --git a/gio/tests/memory-monitor-portal.py.in b/gio/tests/memory-monitor-portal.py.in |
133 | index 748cee850..f570508f9 100755 | 133 | index 748cee8..f570508 100755 |
134 | --- a/gio/tests/memory-monitor-portal.py.in | 134 | --- a/gio/tests/memory-monitor-portal.py.in |
135 | +++ b/gio/tests/memory-monitor-portal.py.in | 135 | +++ b/gio/tests/memory-monitor-portal.py.in |
136 | @@ -16,7 +16,6 @@ import sys | 136 | @@ -16,7 +16,6 @@ import sys |
@@ -222,7 +222,7 @@ index 748cee850..f570508f9 100755 | |||
222 | except ImportError as e: | 222 | except ImportError as e: |
223 | @unittest.skip("Cannot import %s" % e.name) | 223 | @unittest.skip("Cannot import %s" % e.name) |
224 | diff --git a/gio/tests/power-profile-monitor-dbus.py.in b/gio/tests/power-profile-monitor-dbus.py.in | 224 | diff --git a/gio/tests/power-profile-monitor-dbus.py.in b/gio/tests/power-profile-monitor-dbus.py.in |
225 | index 06e594f4a..f955afc80 100755 | 225 | index 06e594f..f955afc 100755 |
226 | --- a/gio/tests/power-profile-monitor-dbus.py.in | 226 | --- a/gio/tests/power-profile-monitor-dbus.py.in |
227 | +++ b/gio/tests/power-profile-monitor-dbus.py.in | 227 | +++ b/gio/tests/power-profile-monitor-dbus.py.in |
228 | @@ -16,7 +16,6 @@ import sys | 228 | @@ -16,7 +16,6 @@ import sys |
@@ -295,7 +295,7 @@ index 06e594f4a..f955afc80 100755 | |||
295 | except ImportError as e: | 295 | except ImportError as e: |
296 | @unittest.skip("Cannot import %s" % e.name) | 296 | @unittest.skip("Cannot import %s" % e.name) |
297 | diff --git a/gio/tests/power-profile-monitor-portal.py.in b/gio/tests/power-profile-monitor-portal.py.in | 297 | diff --git a/gio/tests/power-profile-monitor-portal.py.in b/gio/tests/power-profile-monitor-portal.py.in |
298 | index 09e9a450d..ad2abf621 100755 | 298 | index 09e9a45..ad2abf6 100755 |
299 | --- a/gio/tests/power-profile-monitor-portal.py.in | 299 | --- a/gio/tests/power-profile-monitor-portal.py.in |
300 | +++ b/gio/tests/power-profile-monitor-portal.py.in | 300 | +++ b/gio/tests/power-profile-monitor-portal.py.in |
301 | @@ -16,7 +16,6 @@ import sys | 301 | @@ -16,7 +16,6 @@ import sys |
@@ -359,6 +359,3 @@ index 09e9a450d..ad2abf621 100755 | |||
359 | 359 | ||
360 | def test_power_profile_power_saver_enabled_portal_default(self): | 360 | def test_power_profile_power_saver_enabled_portal_default(self): |
361 | '''power-saver-enabled property default value''' | 361 | '''power-saver-enabled property default value''' |
362 | -- | ||
363 | 2.34.1 | ||
364 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/native-gtkdoc.patch b/meta/recipes-core/glib-2.0/glib-2.0/native-gtkdoc.patch deleted file mode 100644 index f56c2b8564..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/native-gtkdoc.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | docs/reference: depend on a native gtk-doc | ||
2 | |||
3 | In a cross-compiled environment we don't need a target gtk-doc, but a | ||
4 | native gtk-doc. | ||
5 | |||
6 | Upstream-Status: Backport [f3ff370d1b24f8afb51cd4e865593d5b678188a9] | ||
7 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
8 | |||
9 | diff --git a/docs/reference/meson.build b/docs/reference/meson.build | ||
10 | index c417ffecb..67c1dda56 100644 | ||
11 | --- a/docs/reference/meson.build | ||
12 | +++ b/docs/reference/meson.build | ||
13 | @@ -42,7 +42,7 @@ ignore_decorators = '|'.join(ignore_decorators) | ||
14 | if get_option('gtk_doc') | ||
15 | # Check we have the minimum gtk-doc version required. Older versions won't | ||
16 | # generate correct documentation. | ||
17 | - dependency('gtk-doc', version : '>=1.32.1', | ||
18 | + dependency('gtk-doc', version : '>=1.32.1', native: true, | ||
19 | fallback : ['gtk-doc', 'dummy_dep'], | ||
20 | default_options : ['tests=false']) | ||
21 | |||
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 95a73298d8..3e79bbf679 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 03a069cb8066d3e8ef72a43f7b1db5c9625e9cc2 Mon Sep 17 00:00:00 2001 | 1 | From f40e89b3852df37959606ee13b1a14ade81fa886 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 |
@@ -13,7 +13,6 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> | |||
13 | 13 | ||
14 | Port patch to 2.48 | 14 | Port patch to 2.48 |
15 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | 15 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
16 | |||
17 | --- | 16 | --- |
18 | gio/giomodule.c | 7 ------- | 17 | gio/giomodule.c | 7 ------- |
19 | 1 file changed, 7 deletions(-) | 18 | 1 file changed, 7 deletions(-) |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.78.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.78.4.bb index 6c3e99c641..58df7bef8f 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.78.3.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.78.4.bb | |||
@@ -16,13 +16,12 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ | |||
16 | file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ | 16 | file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ |
17 | file://0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch \ | 17 | file://0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch \ |
18 | file://memory-monitor.patch \ | 18 | file://memory-monitor.patch \ |
19 | file://native-gtkdoc.patch \ | ||
20 | " | 19 | " |
21 | SRC_URI:append:class-native = " file://relocate-modules.patch \ | 20 | SRC_URI:append:class-native = " file://relocate-modules.patch \ |
22 | file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ | 21 | file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ |
23 | " | 22 | " |
24 | 23 | ||
25 | SRC_URI[sha256sum] = "609801dd373796e515972bf95fc0b2daa44545481ee2f465c4f204d224b2bc21" | 24 | SRC_URI[sha256sum] = "24b8e0672dca120cc32d394bccb85844e732e04fe75d18bb0573b2dbc7548f63" |
26 | 25 | ||
27 | # Find any meson cross files in FILESPATH that are relevant for the current | 26 | # Find any meson cross files in FILESPATH that are relevant for the current |
28 | # build (using siteinfo) and add them to EXTRA_OEMESON. | 27 | # build (using siteinfo) and add them to EXTRA_OEMESON. |