diff options
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0')
20 files changed, 599 insertions, 340 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch deleted file mode 100644 index f3a0069633..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From 658c034d92027dc8af5f784cae852123fac79b19 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 16 Apr 2016 13:28:59 -0700 | ||
4 | Subject: [PATCH] Do not ignore return value of write() | ||
5 | |||
6 | gcc warns about ignoring return value when compiling | ||
7 | with fortify turned on. | ||
8 | |||
9 | assert when write() fails | ||
10 | |||
11 | Upstream-Status: Submitted | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | |||
14 | --- | ||
15 | glib/tests/unix.c | 5 +++-- | ||
16 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/glib/tests/unix.c b/glib/tests/unix.c | ||
19 | index 7639d06..f941141 100644 | ||
20 | --- a/glib/tests/unix.c | ||
21 | +++ b/glib/tests/unix.c | ||
22 | @@ -33,14 +33,15 @@ test_pipe (void) | ||
23 | GError *error = NULL; | ||
24 | int pipefd[2]; | ||
25 | char buf[1024]; | ||
26 | - gssize bytes_read; | ||
27 | + gssize bytes_read, bytes_written; | ||
28 | gboolean res; | ||
29 | |||
30 | res = g_unix_open_pipe (pipefd, FD_CLOEXEC, &error); | ||
31 | g_assert (res); | ||
32 | g_assert_no_error (error); | ||
33 | |||
34 | - write (pipefd[1], "hello", sizeof ("hello")); | ||
35 | + bytes_written = write (pipefd[1], "hello", sizeof ("hello")); | ||
36 | + g_assert (bytes_written != -1 && "write() failed"); | ||
37 | memset (buf, 0, sizeof (buf)); | ||
38 | bytes_read = read (pipefd[0], buf, sizeof(buf) - 1); | ||
39 | g_assert_cmpint (bytes_read, >, 0); | ||
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 5fe3aa898e..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 0797a40627a4cb5439a24b872edc65356dceaaf0 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,53 +9,52 @@ 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 +++--- |
16 | 2 files changed, 11 insertions(+), 11 deletions(-) | 15 | 2 files changed, 11 insertions(+), 11 deletions(-) |
17 | 16 | ||
18 | diff --git a/gio/meson.build b/gio/meson.build | 17 | diff --git a/gio/meson.build b/gio/meson.build |
19 | index 532b086..98468a3 100644 | 18 | index 5f91586..1a95f4f 100644 |
20 | --- a/gio/meson.build | 19 | --- a/gio/meson.build |
21 | +++ b/gio/meson.build | 20 | +++ b/gio/meson.build |
22 | @@ -820,14 +820,14 @@ pkg.generate(libgio, | 21 | @@ -884,14 +884,14 @@ pkg.generate(libgio, |
23 | 'schemasdir=' + join_paths('${datadir}', schemas_subdir), | 22 | 'dtdsdir=' + '${datadir}' / dtds_subdir, |
24 | 'bindir=' + join_paths('${prefix}', get_option('bindir')), | 23 | 'bindir=' + '${prefix}' / get_option('bindir'), |
25 | 'giomoduledir=' + pkgconfig_giomodulesdir, | 24 | 'giomoduledir=' + pkgconfig_giomodulesdir, |
26 | - 'gio=' + join_paths('${bindir}', 'gio'), | 25 | - 'gio=' + '${bindir}' / 'gio', |
27 | - 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'), | 26 | - 'gio_querymodules=' + pkgconfig_multiarch_bindir / 'gio-querymodules', |
28 | - 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), | 27 | - 'glib_compile_schemas=' + pkgconfig_multiarch_bindir / 'glib-compile-schemas', |
29 | - 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), | 28 | - 'glib_compile_resources=' + '${bindir}' / 'glib-compile-resources', |
30 | - 'gdbus=' + join_paths('${bindir}', 'gdbus'), | 29 | - 'gdbus=' + '${bindir}' /'gdbus', |
31 | - 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'), | 30 | - 'gdbus_codegen=' + '${bindir}' / 'gdbus-codegen', |
32 | - 'gresource=' + join_paths('${bindir}', 'gresource'), | 31 | - 'gresource=' + '${bindir}' / 'gresource', |
33 | - 'gsettings=' + join_paths('${bindir}', 'gsettings')], | 32 | - 'gsettings=' + '${bindir}' / 'gsettings', |
34 | + 'gio=gio', | 33 | + 'gio=gio', |
35 | + 'gio_querymodules=gio-querymodules', | 34 | + 'gio_querymodules=gio-querymodules', |
36 | + 'glib_compile_schemas=glib-compile-schemas', | 35 | + 'glib_compile_schemas=glib-compile-schemas', |
37 | + 'glib_compile_resources=glib-compile-resources', | 36 | + 'glib_compile_resources=glib-compile-resources', |
38 | + 'gdbus=gdbus', | 37 | + 'gdbus=gdbus', |
39 | + 'gdbus_codegen=gdbus-codegen', | 38 | + 'gdbus_codegen=gdbus-codegen', |
40 | + 'gresource=gresource', | 39 | + 'gresource=gresource', |
41 | + 'gsettings=gsettings'], | 40 | + 'gsettings=gsettings', |
41 | ], | ||
42 | version : glib_version, | 42 | version : glib_version, |
43 | install_dir : glib_pkgconfigreldir, | 43 | install_dir : glib_pkgconfigreldir, |
44 | filebase : 'gio-2.0', | ||
45 | diff --git a/glib/meson.build b/glib/meson.build | 44 | diff --git a/glib/meson.build b/glib/meson.build |
46 | index aaf5f00..1e0992b 100644 | 45 | index c26a35e..1d8ca6b 100644 |
47 | --- a/glib/meson.build | 46 | --- a/glib/meson.build |
48 | +++ b/glib/meson.build | 47 | +++ b/glib/meson.build |
49 | @@ -375,9 +375,9 @@ pkg.generate(libglib, | 48 | @@ -447,9 +447,9 @@ pkg.generate(libglib, |
50 | subdirs : ['glib-2.0'], | 49 | variables : [ |
51 | extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, | 50 | 'bindir=' + '${prefix}' / get_option('bindir'), |
52 | variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), | 51 | 'datadir=' + '${prefix}' / get_option('datadir'), |
53 | - 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'), | 52 | - 'glib_genmarshal=' + '${bindir}' / 'glib-genmarshal', |
54 | - 'gobject_query=' + join_paths('${bindir}', 'gobject-query'), | 53 | - 'gobject_query=' + '${bindir}' / 'gobject-query', |
55 | - 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')], | 54 | - 'glib_mkenums=' + '${bindir}' / 'glib-mkenums', |
56 | + 'glib_genmarshal=glib-genmarshal', | 55 | + 'glib_genmarshal=glib-genmarshal', |
57 | + 'gobject_query=gobject-query', | 56 | + 'gobject_query=gobject-query', |
58 | + 'glib_mkenums=glib-mkenums'], | 57 | + 'glib_mkenums=glib-mkenums', |
59 | version : glib_version, | 58 | 'glib_valgrind_suppressions=' + '${datadir}' / |
60 | install_dir : glib_pkgconfigreldir, | 59 | valgrind_suppression_file_install_subdir / |
61 | filebase : 'glib-2.0', | 60 | fs.name(valgrind_suppression_file), |
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..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 c94e669de98a3892c699bd8d0d2b5164b2de747e 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,8 +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 | |||
13 | --- | 11 | --- |
14 | m4macros/glib-gettext.m4 | 4 ++++ | 12 | m4macros/glib-gettext.m4 | 4 ++++ |
15 | 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 597864d9ac..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 0015db45cd1bfefc04959dffab5dabeead93136f 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,16 +8,15 @@ 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(+) |
15 | 14 | ||
16 | diff --git a/gio/meson.build b/gio/meson.build | 15 | diff --git a/gio/meson.build b/gio/meson.build |
17 | index 2ef60ed..532b086 100644 | 16 | index f9fdf6e..5f91586 100644 |
18 | --- a/gio/meson.build | 17 | --- a/gio/meson.build |
19 | +++ b/gio/meson.build | 18 | +++ b/gio/meson.build |
20 | @@ -936,6 +936,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu | 19 | @@ -1005,6 +1005,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu |
21 | c_args : gio_c_args, | 20 | c_args : gio_c_args, |
22 | # intl.lib is not compatible with SAFESEH | 21 | # intl.lib is not compatible with SAFESEH |
23 | link_args : noseh_link_args, | 22 | 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..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 4f47b8a8d650d185aa61aec2f56a283522a723c4 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,13 +9,12 @@ 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(-) |
16 | 15 | ||
17 | diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c | 16 | diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c |
18 | index 7888120..7acbd5b 100644 | 17 | index 04ef404..e791ce2 100644 |
19 | --- a/gio/glib-compile-schemas.c | 18 | --- a/gio/glib-compile-schemas.c |
20 | +++ b/gio/glib-compile-schemas.c | 19 | +++ b/gio/glib-compile-schemas.c |
21 | @@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state, | 20 | @@ -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 d6765b163b..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,32 +1,30 @@ | |||
1 | From 333809ded70ad4e3470b7134e3fac1a42ff48e61 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 +- |
12 | meson.build | 3 +++ | 11 | meson.build | 3 +++ |
13 | tests/meson.build | 2 +- | 12 | 3 files changed, 8 insertions(+), 5 deletions(-) |
14 | 4 files changed, 9 insertions(+), 6 deletions(-) | ||
15 | 13 | ||
16 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build | 14 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build |
17 | index 3a19c82..b762835 100644 | 15 | index 4ef3343..e498e7e 100644 |
18 | --- a/gio/tests/meson.build | 16 | --- a/gio/tests/meson.build |
19 | +++ b/gio/tests/meson.build | 17 | +++ b/gio/tests/meson.build |
20 | @@ -12,7 +12,7 @@ test_c_args = [ | 18 | @@ -29,7 +29,7 @@ endif |
21 | '-UG_DISABLE_ASSERT', | 19 | |
22 | ] | 20 | test_cpp_args = test_c_args |
23 | 21 | ||
24 | -if host_machine.system() == 'windows' | 22 | -if host_machine.system() == 'windows' |
25 | +if host_system == 'windows' | 23 | +if host_system == 'windows' |
26 | common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] | 24 | common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] |
27 | endif | 25 | endif |
28 | 26 | ||
29 | @@ -133,7 +133,7 @@ else | 27 | @@ -230,7 +230,7 @@ if have_dbus_daemon |
30 | endif | 28 | endif |
31 | 29 | ||
32 | # Test programs buildable on UNIX only | 30 | # Test programs buildable on UNIX only |
@@ -34,8 +32,8 @@ index 3a19c82..b762835 100644 | |||
34 | +if host_system != 'windows' | 32 | +if host_system != 'windows' |
35 | gio_tests += { | 33 | gio_tests += { |
36 | 'file' : {}, | 34 | 'file' : {}, |
37 | 'gdbus-peer' : { | 35 | 'gdbus-peer-object-manager' : {}, |
38 | @@ -385,7 +385,7 @@ if host_machine.system() != 'windows' | 36 | @@ -562,7 +562,7 @@ if host_machine.system() != 'windows' |
39 | endif # unix | 37 | endif # unix |
40 | 38 | ||
41 | # Test programs buildable on Windows only | 39 | # Test programs buildable on Windows only |
@@ -44,7 +42,7 @@ index 3a19c82..b762835 100644 | |||
44 | gio_tests += {'win32-streams' : {}} | 42 | gio_tests += {'win32-streams' : {}} |
45 | endif | 43 | endif |
46 | 44 | ||
47 | @@ -455,7 +455,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' | 45 | @@ -632,7 +632,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' |
48 | } | 46 | } |
49 | endif | 47 | endif |
50 | 48 | ||
@@ -54,10 +52,10 @@ index 3a19c82..b762835 100644 | |||
54 | 'gdbus-example-unix-fd-client' : { | 52 | 'gdbus-example-unix-fd-client' : { |
55 | 'install' : false, | 53 | 'install' : false, |
56 | diff --git a/glib/tests/meson.build b/glib/tests/meson.build | 54 | diff --git a/glib/tests/meson.build b/glib/tests/meson.build |
57 | index 6eb23e8..36eb919 100644 | 55 | index d80c86e..5329cda 100644 |
58 | --- a/glib/tests/meson.build | 56 | --- a/glib/tests/meson.build |
59 | +++ b/glib/tests/meson.build | 57 | +++ b/glib/tests/meson.build |
60 | @@ -137,7 +137,7 @@ if glib_conf.has('HAVE_EVENTFD') | 58 | @@ -216,7 +216,7 @@ if glib_conf.has('HAVE_EVENTFD') |
61 | } | 59 | } |
62 | endif | 60 | endif |
63 | 61 | ||
@@ -67,10 +65,10 @@ index 6eb23e8..36eb919 100644 | |||
67 | glib_tests += { | 65 | glib_tests += { |
68 | 'gpoll' : { | 66 | 'gpoll' : { |
69 | diff --git a/meson.build b/meson.build | 67 | diff --git a/meson.build b/meson.build |
70 | index 47f3a5c..7ea7ad1 100644 | 68 | index 813c9b7..6ee775e 100644 |
71 | --- a/meson.build | 69 | --- a/meson.build |
72 | +++ b/meson.build | 70 | +++ b/meson.build |
73 | @@ -32,6 +32,9 @@ else | 71 | @@ -54,6 +54,9 @@ else |
74 | endif | 72 | endif |
75 | 73 | ||
76 | host_system = host_machine.system() | 74 | host_system = host_machine.system() |
@@ -80,16 +78,3 @@ index 47f3a5c..7ea7ad1 100644 | |||
80 | 78 | ||
81 | if host_system == 'darwin' | 79 | if host_system == 'darwin' |
82 | ios_test_code = '''#include <TargetConditionals.h> | 80 | ios_test_code = '''#include <TargetConditionals.h> |
83 | diff --git a/tests/meson.build b/tests/meson.build | ||
84 | index 6741f8f..12fdc90 100644 | ||
85 | --- a/tests/meson.build | ||
86 | +++ b/tests/meson.build | ||
87 | @@ -73,7 +73,7 @@ test_extra_programs = { | ||
88 | 'unicode-collate' : {}, | ||
89 | } | ||
90 | |||
91 | -if host_machine.system() != 'windows' | ||
92 | +if host_system != 'windows' | ||
93 | tests += { | ||
94 | 'timeloop' : {}, | ||
95 | 'iochannel-test' : {}, | ||
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 new file mode 100644 index 0000000000..b11c283e6d --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Switch-from-the-deprecated-distutils-module-to-the-p.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From a8eb944a10353403241608a084787f6efcbb2eb7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jordan Williams <jordan@jwillikers.com> | ||
3 | Date: Fri, 1 Dec 2023 09:53:50 -0600 | ||
4 | Subject: [PATCH] Switch from the deprecated distutils module to the packaging | ||
5 | module | ||
6 | |||
7 | The distutils module was removed in Python 3.12. | ||
8 | |||
9 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/6ef967a0f930ce37a8c9b5aff969693b34714291] | ||
10 | |||
11 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
12 | --- | ||
13 | gio/gdbus-2.0/codegen/utils.py | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/gio/gdbus-2.0/codegen/utils.py b/gio/gdbus-2.0/codegen/utils.py | ||
17 | index 0204610..08f1ba9 100644 | ||
18 | --- a/gio/gdbus-2.0/codegen/utils.py | ||
19 | +++ b/gio/gdbus-2.0/codegen/utils.py | ||
20 | @@ -19,7 +19,7 @@ | ||
21 | # | ||
22 | # Author: David Zeuthen <davidz@redhat.com> | ||
23 | |||
24 | -import distutils.version | ||
25 | +import packaging.version | ||
26 | import os | ||
27 | import sys | ||
28 | |||
29 | @@ -166,4 +166,4 @@ def version_cmp_key(key): | ||
30 | v = str(key[0]) | ||
31 | else: | ||
32 | v = "0" | ||
33 | - return (distutils.version.LooseVersion(v), key[1]) | ||
34 | + return (packaging.version.Version(v), key[1]) | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch deleted file mode 100644 index 508c8c3bad..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From b833254bcc9fcf4cdc2572027b1154d799535ca4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Sun, 20 Dec 2020 22:01:43 +0100 | ||
4 | Subject: [PATCH] gio/tests/codegen.py: bump timeout to 100 seconds | ||
5 | |||
6 | This may be necessary on overloaded CI systems. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
10 | --- | ||
11 | gio/tests/codegen.py | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/gio/tests/codegen.py b/gio/tests/codegen.py | ||
15 | index 51de0ed..ca98c9d 100644 | ||
16 | --- a/gio/tests/codegen.py | ||
17 | +++ b/gio/tests/codegen.py | ||
18 | @@ -51,7 +51,7 @@ class TestCodegen(unittest.TestCase): | ||
19 | cwd = '' | ||
20 | |||
21 | def setUp(self): | ||
22 | - self.timeout_seconds = 10 # seconds per test | ||
23 | + self.timeout_seconds = 100 # seconds per test | ||
24 | self.tmpdir = tempfile.TemporaryDirectory() | ||
25 | self.cwd = os.getcwd() | ||
26 | os.chdir(self.tmpdir.name) | ||
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..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 92de6c7eb30b961b24a2dce812d5276487b7d23d 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,16 +8,15 @@ 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(-) |
15 | 14 | ||
16 | diff --git a/gio/tests/resources.c b/gio/tests/resources.c | 15 | diff --git a/gio/tests/resources.c b/gio/tests/resources.c |
17 | index c44d214..e289a01 100644 | 16 | index f567914..b21b616 100644 |
18 | --- a/gio/tests/resources.c | 17 | --- a/gio/tests/resources.c |
19 | +++ b/gio/tests/resources.c | 18 | +++ b/gio/tests/resources.c |
20 | @@ -993,7 +993,7 @@ main (int argc, | 19 | @@ -1068,7 +1068,7 @@ main (int argc, |
21 | g_test_add_func ("/resource/automatic", test_resource_automatic); | 20 | g_test_add_func ("/resource/automatic", test_resource_automatic); |
22 | /* This only uses automatic resources too, so it tests the constructors and destructors */ | 21 | /* This only uses automatic resources too, so it tests the constructors and destructors */ |
23 | g_test_add_func ("/resource/module", test_resource_module); | 22 | 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..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 4b97f457b7b44117e27d2a218c4b68e7fe3fe4ce 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,16 +9,15 @@ 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 afb6eaa..6aa70f5 100644 | 17 | index 6ee775e..8bc5fa7 100644 |
19 | --- a/meson.build | 18 | --- a/meson.build |
20 | +++ b/meson.build | 19 | +++ b/meson.build |
21 | @@ -1692,7 +1692,7 @@ atomicdefine = ''' | 20 | @@ -1938,7 +1938,7 @@ atomicdefine = ''' |
22 | # We know that we can always use real ("lock free") atomic operations with MSVC | 21 | # 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') | 22 | if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops') |
24 | have_atomic_lock_free = true | 23 | 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 new file mode 100644 index 0000000000..14dcb278e0 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 294f3e6e9a0a9f4733e85ed6810d1b743055370b Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Sat, 16 Sep 2023 22:28:27 +0200 | ||
4 | Subject: [PATCH] meson.build: do not enable pidfd features on native glib | ||
5 | builds | ||
6 | |||
7 | We still use host distros like alma 8 with kernels older than 5.4, | ||
8 | where these features are not implemented. | ||
9 | |||
10 | Upstream-Status: Inappropriate [oe-core specific] | ||
11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
12 | --- | ||
13 | meson.build | 3 ++- | ||
14 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/meson.build b/meson.build | ||
17 | index 8bc5fa7..df1fa60 100644 | ||
18 | --- a/meson.build | ||
19 | +++ b/meson.build | ||
20 | @@ -981,7 +981,8 @@ if cc.links('''#include <sys/syscall.h> | ||
21 | waitid (P_PIDFD, 0, &child_info, WEXITED | WNOHANG); | ||
22 | return 0; | ||
23 | }''', name : 'pidfd_open(2) system call') | ||
24 | - glib_conf.set('HAVE_PIDFD', 1) | ||
25 | + #requires kernel 5.4+ | ||
26 | + #glib_conf.set('HAVE_PIDFD', 1) | ||
27 | endif | ||
28 | |||
29 | # Check for __uint128_t (gcc) by checking for 128-bit division | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-tests-codegen.py-removing-unecessary-print-statement.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-tests-codegen.py-removing-unecessary-print-statement.patch deleted file mode 100644 index 40427e0e67..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-tests-codegen.py-removing-unecessary-print-statement.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | From 6178df5658045a6253ef806e018fe80d99a8f5fb Mon Sep 17 00:00:00 2001 | ||
2 | From: Yi Fan Yu <yifan.yu@windriver.com> | ||
3 | Date: Mon, 1 Feb 2021 16:10:28 -0500 | ||
4 | Subject: [PATCH] tests/codegen.py: removing unecessary print statement | ||
5 | |||
6 | A huge amount of output(boiler-plate code) is | ||
7 | printed to the console screen. | ||
8 | This is not critical to the test results. | ||
9 | |||
10 | This causes intermittent test failure when another process | ||
11 | has to parse its output. | ||
12 | |||
13 | Root cause is in ptest-runner, This is a workaround | ||
14 | |||
15 | Uptream-Status: Inappropriate [other] | ||
16 | |||
17 | |||
18 | |||
19 | Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> | ||
20 | --- | ||
21 | gio/tests/codegen.py | 1 - | ||
22 | 1 file changed, 1 deletion(-) | ||
23 | |||
24 | diff --git a/gio/tests/codegen.py b/gio/tests/codegen.py | ||
25 | index 51de0ede4..cfa4db42e 100644 | ||
26 | --- a/gio/tests/codegen.py | ||
27 | +++ b/gio/tests/codegen.py | ||
28 | @@ -250,7 +250,6 @@ class TestCodegen(unittest.TestCase): | ||
29 | |||
30 | result = Result(info, out, err, subs) | ||
31 | |||
32 | - print('Output:', result.out) | ||
33 | return result | ||
34 | |||
35 | def runCodegenWithInterface(self, interface_contents, *args): | ||
36 | -- | ||
37 | 2.29.2 | ||
38 | |||
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..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 79ce7e545dd3a93f77d2146d50b6fa061fbceed9 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 +- |
@@ -23,7 +22,7 @@ index 67d3675..4e92a7a 100755 | |||
23 | # GDBus - GLib D-Bus Library | 22 | # GDBus - GLib D-Bus Library |
24 | # | 23 | # |
25 | diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in | 24 | diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in |
26 | index 7380f24..c8abeaa 100755 | 25 | index aa5af43..56e8e2e 100755 |
27 | --- a/gobject/glib-genmarshal.in | 26 | --- a/gobject/glib-genmarshal.in |
28 | +++ b/gobject/glib-genmarshal.in | 27 | +++ b/gobject/glib-genmarshal.in |
29 | @@ -1,4 +1,4 @@ | 28 | @@ -1,4 +1,4 @@ |
@@ -33,7 +32,7 @@ index 7380f24..c8abeaa 100755 | |||
33 | # pylint: disable=too-many-lines, missing-docstring, invalid-name | 32 | # pylint: disable=too-many-lines, missing-docstring, invalid-name |
34 | 33 | ||
35 | diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in | 34 | diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in |
36 | index 91ad779..3ebef62 100755 | 35 | index 353e53a..8ed6c39 100755 |
37 | --- a/gobject/glib-mkenums.in | 36 | --- a/gobject/glib-mkenums.in |
38 | +++ b/gobject/glib-mkenums.in | 37 | +++ b/gobject/glib-mkenums.in |
39 | @@ -1,4 +1,4 @@ | 38 | @@ -1,4 +1,4 @@ |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch b/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch deleted file mode 100644 index 41ecfa1df8..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch +++ /dev/null | |||
@@ -1,121 +0,0 @@ | |||
1 | From 7cde170afe6854d674b50e32b4c1d3b511be9abe Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Mon, 9 Nov 2015 11:07:27 +0200 | ||
4 | Subject: [PATCH] Enable more tests while cross-compiling | ||
5 | |||
6 | Upstream disables a few tests while cross-compiling because their build requires | ||
7 | running other built binaries. This usually makes sense but in the cross-compile | ||
8 | case we can depend on glib-2.0-native. | ||
9 | |||
10 | Upstream-Status: Inappropriate [OE specific] | ||
11 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
12 | |||
13 | --- | ||
14 | gio/tests/meson.build | 24 ++++++++++++------------ | ||
15 | 1 file changed, 12 insertions(+), 12 deletions(-) | ||
16 | |||
17 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build | ||
18 | index 788cf97..dab65d2 100644 | ||
19 | --- a/gio/tests/meson.build | ||
20 | +++ b/gio/tests/meson.build | ||
21 | @@ -203,7 +203,7 @@ if host_machine.system() != 'windows' | ||
22 | |||
23 | # Test programs that need to bring up a session bus (requires dbus-daemon) | ||
24 | have_dbus_daemon = find_program('dbus-daemon', required : false).found() | ||
25 | - if have_dbus_daemon | ||
26 | + if true | ||
27 | annotate_args = [ | ||
28 | '--annotate', 'org.project.Bar', 'Key1', 'Value1', | ||
29 | '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2', | ||
30 | @@ -548,12 +548,12 @@ if installed_tests_enabled | ||
31 | endforeach | ||
32 | endif | ||
33 | |||
34 | -if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
35 | +if meson.is_cross_build() | ||
36 | |||
37 | plugin_resources_c = custom_target('plugin-resources.c', | ||
38 | input : 'test4.gresource.xml', | ||
39 | output : 'plugin-resources.c', | ||
40 | - command : [glib_compile_resources, | ||
41 | + command : ['glib-compile-resources', | ||
42 | '--target=@OUTPUT@', | ||
43 | '--sourcedir=' + meson.current_source_dir(), | ||
44 | '--generate-source', | ||
45 | @@ -577,7 +577,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
46 | test_gresource = custom_target('test.gresource', | ||
47 | input : 'test.gresource.xml', | ||
48 | output : 'test.gresource', | ||
49 | - command : [glib_compile_resources, | ||
50 | + command : ['glib-compile-resources', | ||
51 | '--target=@OUTPUT@', | ||
52 | '--sourcedir=' + meson.current_source_dir(), | ||
53 | '--sourcedir=' + meson.current_build_dir(), | ||
54 | @@ -588,7 +588,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
55 | test_resources2_c = custom_target('test_resources2.c', | ||
56 | input : 'test3.gresource.xml', | ||
57 | output : 'test_resources2.c', | ||
58 | - command : [glib_compile_resources, | ||
59 | + command : ['glib-compile-resources', | ||
60 | '--target=@OUTPUT@', | ||
61 | '--sourcedir=' + meson.current_source_dir(), | ||
62 | '--generate', | ||
63 | @@ -599,7 +599,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
64 | test_resources2_h = custom_target('test_resources2.h', | ||
65 | input : 'test3.gresource.xml', | ||
66 | output : 'test_resources2.h', | ||
67 | - command : [glib_compile_resources, | ||
68 | + command : ['glib-compile-resources', | ||
69 | '--target=@OUTPUT@', | ||
70 | '--sourcedir=' + meson.current_source_dir(), | ||
71 | '--generate', | ||
72 | @@ -611,7 +611,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
73 | input : 'test2.gresource.xml', | ||
74 | depends : big_test_resource, | ||
75 | output : 'test_resources.c', | ||
76 | - command : [glib_compile_resources, | ||
77 | + command : ['glib-compile-resources', | ||
78 | '--target=@OUTPUT@', | ||
79 | '--sourcedir=' + meson.current_source_dir(), | ||
80 | '--sourcedir=' + meson.current_build_dir(), | ||
81 | @@ -622,7 +622,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
82 | digit_test_resources_c = custom_target('digit_test_resources.c', | ||
83 | input : '111_digit_test.gresource.xml', | ||
84 | output : 'digit_test_resources.c', | ||
85 | - command : [glib_compile_resources, | ||
86 | + command : ['glib-compile-resources', | ||
87 | '--target=@OUTPUT@', | ||
88 | '--sourcedir=' + meson.current_source_dir(), | ||
89 | '--sourcedir=' + meson.current_build_dir(), | ||
90 | @@ -633,7 +633,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
91 | digit_test_resources_h = custom_target('digit_test_resources.h', | ||
92 | input : '111_digit_test.gresource.xml', | ||
93 | output : 'digit_test_resources.h', | ||
94 | - command : [glib_compile_resources, | ||
95 | + command : ['glib-compile-resources', | ||
96 | '--target=@OUTPUT@', | ||
97 | '--sourcedir=' + meson.current_source_dir(), | ||
98 | '--generate', | ||
99 | @@ -668,11 +668,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
100 | |||
101 | ld = find_program('ld', required : false) | ||
102 | |||
103 | - if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() and objcopy_supports_add_symbol and ld.found() | ||
104 | + if not meson.is_cross_build() | ||
105 | test_gresource_binary = custom_target('test5.gresource', | ||
106 | input : 'test5.gresource.xml', | ||
107 | output : 'test5.gresource', | ||
108 | - command : [glib_compile_resources, | ||
109 | + command : ['glib-compile-resources', | ||
110 | '--target=@OUTPUT@', | ||
111 | '--sourcedir=' + meson.current_source_dir(), | ||
112 | '--sourcedir=' + meson.current_build_dir(), | ||
113 | @@ -684,7 +684,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
114 | test_resources_binary_c = custom_target('test_resources_binary.c', | ||
115 | input : 'test5.gresource.xml', | ||
116 | output : 'test_resources_binary.c', | ||
117 | - command : [glib_compile_resources, | ||
118 | + command : ['glib-compile-resources', | ||
119 | '--target=@OUTPUT@', | ||
120 | '--sourcedir=' + meson.current_source_dir(), | ||
121 | '--sourcedir=' + meson.current_build_dir(), | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/fix-regex.patch b/meta/recipes-core/glib-2.0/glib-2.0/fix-regex.patch new file mode 100644 index 0000000000..bdfbd55899 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/fix-regex.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | From cce3ae98a2c1966719daabff5a4ec6cf94a846f6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Philip Withnall <pwithnall@gnome.org> | ||
3 | Date: Mon, 26 Feb 2024 16:55:44 +0000 | ||
4 | Subject: [PATCH] tests: Remove variable-length lookbehind tests for GRegex | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | PCRE2 10.43 has now introduced support for variable-length lookbehind, | ||
10 | so these tests now fail if GLib is built against PCRE2 10.43 or higher. | ||
11 | |||
12 | See | ||
13 | https://github.com/PCRE2Project/pcre2/blob/e8db6fa7137f4c6f66cb87e0a3c9467252ec1ef7/ChangeLog#L94. | ||
14 | |||
15 | Rather than making the tests conditional on the version of PCRE2 in use, | ||
16 | just remove them. They are mostly testing the PCRE2 code rather than | ||
17 | any code in GLib, so don’t have much value. | ||
18 | |||
19 | This should fix CI runs on msys2-mingw32, which updated to PCRE2 10.43 2 | ||
20 | days ago. | ||
21 | |||
22 | Signed-off-by: Philip Withnall <pwithnall@gnome.org> | ||
23 | |||
24 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/cce3ae98a2c1966719daabff5a4ec6cf94a846f6] | ||
25 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
26 | --- | ||
27 | glib/tests/regex.c | 10 ---------- | ||
28 | 1 file changed, 10 deletions(-) | ||
29 | |||
30 | diff --git a/glib/tests/regex.c b/glib/tests/regex.c | ||
31 | index 1082526292..d7a698ec67 100644 | ||
32 | --- a/glib/tests/regex.c | ||
33 | +++ b/glib/tests/regex.c | ||
34 | @@ -1885,16 +1885,6 @@ test_lookbehind (void) | ||
35 | g_match_info_free (match); | ||
36 | g_regex_unref (regex); | ||
37 | |||
38 | - regex = g_regex_new ("(?<!dogs?|cats?) x", G_REGEX_OPTIMIZE, G_REGEX_MATCH_DEFAULT, &error); | ||
39 | - g_assert (regex == NULL); | ||
40 | - g_assert_error (error, G_REGEX_ERROR, G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND); | ||
41 | - g_clear_error (&error); | ||
42 | - | ||
43 | - regex = g_regex_new ("(?<=ab(c|de)) foo", G_REGEX_OPTIMIZE, G_REGEX_MATCH_DEFAULT, &error); | ||
44 | - g_assert (regex == NULL); | ||
45 | - g_assert_error (error, G_REGEX_ERROR, G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND); | ||
46 | - g_clear_error (&error); | ||
47 | - | ||
48 | regex = g_regex_new ("(?<=abc|abde)foo", G_REGEX_OPTIMIZE, G_REGEX_MATCH_DEFAULT, &error); | ||
49 | g_assert (regex); | ||
50 | g_assert_no_error (error); | ||
51 | -- | ||
52 | GitLab | ||
53 | |||
54 | |||
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 new file mode 100644 index 0000000000..4f38509da6 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/memory-monitor.patch | |||
@@ -0,0 +1,361 @@ | |||
1 | From ce840b6b111e1e109e511f6833d6aa419e2b723a Mon Sep 17 00:00:00 2001 | ||
2 | From: Philip Withnall <philip@tecnocode.co.uk> | ||
3 | Date: Tue, 23 Jan 2024 11:16:52 +0000 | ||
4 | Subject: [PATCH] Merge branch '2887-memory-monitor-tests' into 'main' | ||
5 | |||
6 | tests: Fix race condition in memory-monitor-dbus.test | ||
7 | |||
8 | Closes #2887 | ||
9 | |||
10 | See merge request GNOME/glib!3844 | ||
11 | |||
12 | Hopefully these commits fix the occasional failures we've been seeing: | ||
13 | https://bugzilla.yoctoproject.org/show_bug.cgi?id=15362 | ||
14 | |||
15 | Upstream-Status: Backport | ||
16 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
17 | --- | ||
18 | gio/tests/memory-monitor-dbus.py.in | 64 +++++++++++++------- | ||
19 | gio/tests/memory-monitor-portal.py.in | 54 ++++++++++------- | ||
20 | gio/tests/power-profile-monitor-dbus.py.in | 35 ++++++----- | ||
21 | gio/tests/power-profile-monitor-portal.py.in | 34 ++++++----- | ||
22 | 4 files changed, 113 insertions(+), 74 deletions(-) | ||
23 | |||
24 | diff --git a/gio/tests/memory-monitor-dbus.py.in b/gio/tests/memory-monitor-dbus.py.in | ||
25 | index bf32918..7aae01e 100755 | ||
26 | --- a/gio/tests/memory-monitor-dbus.py.in | ||
27 | +++ b/gio/tests/memory-monitor-dbus.py.in | ||
28 | @@ -16,7 +16,6 @@ import sys | ||
29 | import subprocess | ||
30 | import fcntl | ||
31 | import os | ||
32 | -import time | ||
33 | |||
34 | import taptestrunner | ||
35 | |||
36 | @@ -57,53 +56,74 @@ try: | ||
37 | fcntl.fcntl(self.p_mock.stdout, fcntl.F_SETFL, flags | os.O_NONBLOCK) | ||
38 | self.last_warning = -1 | ||
39 | self.dbusmock = dbus.Interface(self.obj_lmm, dbusmock.MOCK_IFACE) | ||
40 | + | ||
41 | + try: | ||
42 | + self.wait_for_bus_object('org.freedesktop.LowMemoryMonitor', | ||
43 | + '/org/freedesktop/LowMemoryMonitor', | ||
44 | + system_bus=True) | ||
45 | + except: | ||
46 | + raise | ||
47 | + | ||
48 | self.memory_monitor = Gio.MemoryMonitor.dup_default() | ||
49 | + assert("GMemoryMonitorDBus" in str(self.memory_monitor)) | ||
50 | self.memory_monitor.connect("low-memory-warning", self.memory_warning_cb) | ||
51 | self.mainloop = GLib.MainLoop() | ||
52 | self.main_context = self.mainloop.get_context() | ||
53 | |||
54 | + # The LowMemoryMonitor API is stateless: it doesn’t expose any | ||
55 | + # properties, just a warning signal. Emit the signal in a loop until | ||
56 | + # the GMemoryMonitor instance has initialised and synchronised to | ||
57 | + # the right state. | ||
58 | + def emit_warning(level): | ||
59 | + self.dbusmock.EmitWarning(level) | ||
60 | + return GLib.SOURCE_CONTINUE | ||
61 | + | ||
62 | + idle_id = GLib.idle_add(emit_warning, 0) | ||
63 | + while self.last_warning != 0: | ||
64 | + self.main_context.iteration(True) | ||
65 | + GLib.source_remove(idle_id) | ||
66 | + | ||
67 | def tearDown(self): | ||
68 | self.p_mock.terminate() | ||
69 | self.p_mock.wait() | ||
70 | |||
71 | - def assertEventually(self, condition, message=None, timeout=50): | ||
72 | + def assertEventually(self, condition, message=None, timeout=5): | ||
73 | '''Assert that condition function eventually returns True. | ||
74 | |||
75 | - Timeout is in deciseconds, defaulting to 50 (5 seconds). message is | ||
76 | + Timeout is in seconds, defaulting to 5 seconds. message is | ||
77 | printed on failure. | ||
78 | ''' | ||
79 | - while timeout >= 0: | ||
80 | - context = GLib.MainContext.default() | ||
81 | - while context.iteration(False): | ||
82 | - pass | ||
83 | - if condition(): | ||
84 | - break | ||
85 | - timeout -= 1 | ||
86 | - time.sleep(0.1) | ||
87 | - else: | ||
88 | - self.fail(message or 'timed out waiting for ' + str(condition)) | ||
89 | + if not message: | ||
90 | + message = 'timed out waiting for ' + str(condition) | ||
91 | + | ||
92 | + def timed_out_cb(message): | ||
93 | + self.fail(message) | ||
94 | + return GLib.SOURCE_REMOVE | ||
95 | + | ||
96 | + timeout_source = GLib.timeout_source_new_seconds(timeout) | ||
97 | + timeout_source.set_callback(timed_out_cb, message) | ||
98 | + timeout_source.attach(self.main_context) | ||
99 | + | ||
100 | + while not condition(): | ||
101 | + self.main_context.iteration(True) | ||
102 | + | ||
103 | + timeout_source.destroy() | ||
104 | |||
105 | def memory_warning_cb(self, monitor, level): | ||
106 | + print("Received memory warning signal, level", level) | ||
107 | self.last_warning = level | ||
108 | self.main_context.wakeup() | ||
109 | |||
110 | def test_low_memory_warning_signal(self): | ||
111 | '''LowMemoryWarning signal''' | ||
112 | |||
113 | - # Wait 2 seconds | ||
114 | - timeout = 2 | ||
115 | - while timeout > 0: | ||
116 | - time.sleep(0.5) | ||
117 | - timeout -= 0.5 | ||
118 | - self.main_context.iteration(False) | ||
119 | - | ||
120 | self.dbusmock.EmitWarning(100) | ||
121 | # Wait 2 seconds or until warning | ||
122 | - self.assertEventually(lambda: self.last_warning == 100, "'100' low-memory warning not received", 20) | ||
123 | + self.assertEventually(lambda: self.last_warning == 100, "'100' low-memory warning not received", 2) | ||
124 | |||
125 | self.dbusmock.EmitWarning(255) | ||
126 | # Wait 2 seconds or until warning | ||
127 | - self.assertEventually(lambda: self.last_warning == 255, "'255' low-memory warning not received", 20) | ||
128 | + self.assertEventually(lambda: self.last_warning == 255, "'255' low-memory warning not received", 2) | ||
129 | |||
130 | except ImportError as e: | ||
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 | ||
133 | index 748cee8..f570508 100755 | ||
134 | --- a/gio/tests/memory-monitor-portal.py.in | ||
135 | +++ b/gio/tests/memory-monitor-portal.py.in | ||
136 | @@ -16,7 +16,6 @@ import sys | ||
137 | import subprocess | ||
138 | import fcntl | ||
139 | import os | ||
140 | -import time | ||
141 | |||
142 | import taptestrunner | ||
143 | |||
144 | @@ -80,26 +79,44 @@ try: | ||
145 | self.mainloop = GLib.MainLoop() | ||
146 | self.main_context = self.mainloop.get_context() | ||
147 | |||
148 | + # The LowMemoryMonitor API is stateless: it doesn’t expose any | ||
149 | + # properties, just a warning signal. Emit the signal in a loop until | ||
150 | + # the GMemoryMonitor instance has initialised and synchronised to | ||
151 | + # the right state. | ||
152 | + def emit_warning(level): | ||
153 | + self.dbusmock.EmitWarning(level) | ||
154 | + return GLib.SOURCE_CONTINUE | ||
155 | + | ||
156 | + idle_id = GLib.idle_add(self.emit_warning, 0) | ||
157 | + while self.last_warning != 0: | ||
158 | + self.main_context.iteration(True) | ||
159 | + GLib.source_remove(idle_id) | ||
160 | + | ||
161 | def tearDown(self): | ||
162 | self.p_mock.terminate() | ||
163 | self.p_mock.wait() | ||
164 | |||
165 | - def assertEventually(self, condition, message=None, timeout=50): | ||
166 | + def assertEventually(self, condition, message=None, timeout=5): | ||
167 | '''Assert that condition function eventually returns True. | ||
168 | |||
169 | - Timeout is in deciseconds, defaulting to 50 (5 seconds). message is | ||
170 | + Timeout is in seconds, defaulting to 5 seconds. message is | ||
171 | printed on failure. | ||
172 | ''' | ||
173 | - while timeout >= 0: | ||
174 | - context = GLib.MainContext.default() | ||
175 | - while context.iteration(False): | ||
176 | - pass | ||
177 | - if condition(): | ||
178 | - break | ||
179 | - timeout -= 1 | ||
180 | - time.sleep(0.1) | ||
181 | - else: | ||
182 | - self.fail(message or 'timed out waiting for ' + str(condition)) | ||
183 | + if not message: | ||
184 | + message = 'timed out waiting for ' + str(condition) | ||
185 | + | ||
186 | + def timed_out_cb(message): | ||
187 | + self.fail(message) | ||
188 | + return GLib.SOURCE_REMOVE | ||
189 | + | ||
190 | + timeout_source = GLib.timeout_source_new_seconds(timeout) | ||
191 | + timeout_source.set_callback(timed_out_cb, message) | ||
192 | + timeout_source.attach(self.main_context) | ||
193 | + | ||
194 | + while not condition(): | ||
195 | + self.main_context.iteration(True) | ||
196 | + | ||
197 | + timeout_source.destroy() | ||
198 | |||
199 | def portal_memory_warning_cb(self, monitor, level): | ||
200 | self.last_warning = level | ||
201 | @@ -108,20 +125,13 @@ try: | ||
202 | def test_low_memory_warning_portal_signal(self): | ||
203 | '''LowMemoryWarning signal''' | ||
204 | |||
205 | - # Wait 2 seconds | ||
206 | - timeout = 2 | ||
207 | - while timeout > 0: | ||
208 | - time.sleep(0.5) | ||
209 | - timeout -= 0.5 | ||
210 | - self.main_context.iteration(False) | ||
211 | - | ||
212 | self.dbusmock.EmitWarning(100) | ||
213 | # Wait 2 seconds or until warning | ||
214 | - self.assertEventually(lambda: self.last_warning == 100, "'100' low-memory warning not received", 20) | ||
215 | + self.assertEventually(lambda: self.last_warning == 100, "'100' low-memory warning not received", 2) | ||
216 | |||
217 | self.dbusmock.EmitWarning(255) | ||
218 | # Wait 2 seconds or until warning | ||
219 | - self.assertEventually(lambda: self.last_warning == 255, "'255' low-memory warning not received", 20) | ||
220 | + self.assertEventually(lambda: self.last_warning == 255, "'255' low-memory warning not received", 2) | ||
221 | |||
222 | except ImportError as e: | ||
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 | ||
225 | index 06e594f..f955afc 100755 | ||
226 | --- a/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 | ||
229 | import subprocess | ||
230 | import fcntl | ||
231 | import os | ||
232 | -import time | ||
233 | |||
234 | import taptestrunner | ||
235 | |||
236 | @@ -58,6 +57,7 @@ try: | ||
237 | self.power_saver_enabled = False | ||
238 | self.dbus_props = dbus.Interface(self.obj_ppd, dbus.PROPERTIES_IFACE) | ||
239 | self.power_profile_monitor = Gio.PowerProfileMonitor.dup_default() | ||
240 | + assert("GPowerProfileMonitorDBus" in str(self.power_profile_monitor)) | ||
241 | self.power_profile_monitor.connect("notify::power-saver-enabled", self.power_saver_enabled_cb) | ||
242 | self.mainloop = GLib.MainLoop() | ||
243 | self.main_context = self.mainloop.get_context() | ||
244 | @@ -66,22 +66,27 @@ try: | ||
245 | self.p_mock.terminate() | ||
246 | self.p_mock.wait() | ||
247 | |||
248 | - def assertEventually(self, condition, message=None, timeout=50): | ||
249 | + def assertEventually(self, condition, message=None, timeout=5): | ||
250 | '''Assert that condition function eventually returns True. | ||
251 | |||
252 | - Timeout is in deciseconds, defaulting to 50 (5 seconds). message is | ||
253 | + Timeout is in seconds, defaulting to 5 seconds. message is | ||
254 | printed on failure. | ||
255 | ''' | ||
256 | - while timeout >= 0: | ||
257 | - context = GLib.MainContext.default() | ||
258 | - while context.iteration(False): | ||
259 | - pass | ||
260 | - if condition(): | ||
261 | - break | ||
262 | - timeout -= 1 | ||
263 | - time.sleep(0.1) | ||
264 | - else: | ||
265 | - self.fail(message or 'timed out waiting for ' + str(condition)) | ||
266 | + if not message: | ||
267 | + message = 'timed out waiting for ' + str(condition) | ||
268 | + | ||
269 | + def timed_out_cb(message): | ||
270 | + self.fail(message) | ||
271 | + return GLib.SOURCE_REMOVE | ||
272 | + | ||
273 | + timeout_source = GLib.timeout_source_new_seconds(timeout) | ||
274 | + timeout_source.set_callback(timed_out_cb, message) | ||
275 | + timeout_source.attach(self.main_context) | ||
276 | + | ||
277 | + while not condition(): | ||
278 | + self.main_context.iteration(True) | ||
279 | + | ||
280 | + timeout_source.destroy() | ||
281 | |||
282 | def power_saver_enabled_cb(self, spec, data): | ||
283 | self.power_saver_enabled = self.power_profile_monitor.get_power_saver_enabled() | ||
284 | @@ -92,10 +97,10 @@ try: | ||
285 | |||
286 | self.assertEqual(self.power_profile_monitor.get_power_saver_enabled(), False) | ||
287 | self.dbus_props.Set('net.hadess.PowerProfiles', 'ActiveProfile', dbus.String('power-saver', variant_level=1)) | ||
288 | - self.assertEventually(lambda: self.power_saver_enabled == True, "power-saver didn't become enabled", 10) | ||
289 | + self.assertEventually(lambda: self.power_saver_enabled == True, "power-saver didn't become enabled", 1) | ||
290 | |||
291 | self.dbus_props.Set('net.hadess.PowerProfiles', 'ActiveProfile', dbus.String('balanced', variant_level=1)) | ||
292 | - self.assertEventually(lambda: self.power_saver_enabled == False, "power-saver didn't become disabled", 10) | ||
293 | + self.assertEventually(lambda: self.power_saver_enabled == False, "power-saver didn't become disabled", 1) | ||
294 | |||
295 | except ImportError as e: | ||
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 | ||
298 | index 09e9a45..ad2abf6 100755 | ||
299 | --- a/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 | ||
302 | import subprocess | ||
303 | import fcntl | ||
304 | import os | ||
305 | -import time | ||
306 | |||
307 | import taptestrunner | ||
308 | |||
309 | @@ -90,22 +89,27 @@ try: | ||
310 | self.p_mock.terminate() | ||
311 | self.p_mock.wait() | ||
312 | |||
313 | - def assertEventually(self, condition, message=None, timeout=50): | ||
314 | + def assertEventually(self, condition, message=None, timeout=5): | ||
315 | '''Assert that condition function eventually returns True. | ||
316 | |||
317 | - Timeout is in deciseconds, defaulting to 50 (5 seconds). message is | ||
318 | + Timeout is in seconds, defaulting to 5 seconds. message is | ||
319 | printed on failure. | ||
320 | ''' | ||
321 | - while timeout >= 0: | ||
322 | - context = GLib.MainContext.default() | ||
323 | - while context.iteration(False): | ||
324 | - pass | ||
325 | - if condition(): | ||
326 | - break | ||
327 | - timeout -= 1 | ||
328 | - time.sleep(0.1) | ||
329 | - else: | ||
330 | - self.fail(message or 'timed out waiting for ' + str(condition)) | ||
331 | + if not message: | ||
332 | + message = 'timed out waiting for ' + str(condition) | ||
333 | + | ||
334 | + def timed_out_cb(message): | ||
335 | + self.fail(message) | ||
336 | + return GLib.SOURCE_REMOVE | ||
337 | + | ||
338 | + timeout_source = GLib.timeout_source_new_seconds(timeout) | ||
339 | + timeout_source.set_callback(timed_out_cb, message) | ||
340 | + timeout_source.attach(self.main_context) | ||
341 | + | ||
342 | + while not condition(): | ||
343 | + self.main_context.iteration(True) | ||
344 | + | ||
345 | + timeout_source.destroy() | ||
346 | |||
347 | def power_saver_enabled_cb(self, spec, data): | ||
348 | self.power_saver_enabled = self.power_profile_monitor.get_power_saver_enabled() | ||
349 | @@ -116,10 +120,10 @@ try: | ||
350 | |||
351 | self.assertEqual(self.power_profile_monitor.get_power_saver_enabled(), False) | ||
352 | self.dbus_props.Set('net.hadess.PowerProfiles', 'ActiveProfile', dbus.String('power-saver', variant_level=1)) | ||
353 | - self.assertEventually(lambda: self.power_saver_enabled == True, "power-saver didn't become enabled", 10) | ||
354 | + self.assertEventually(lambda: self.power_saver_enabled == True, "power-saver didn't become enabled", 1) | ||
355 | |||
356 | self.dbus_props.Set('net.hadess.PowerProfiles', 'ActiveProfile', dbus.String('balanced', variant_level=1)) | ||
357 | - self.assertEventually(lambda: self.power_saver_enabled == False, "power-saver didn't become disabled", 10) | ||
358 | + self.assertEventually(lambda: self.power_saver_enabled == False, "power-saver didn't become disabled", 1) | ||
359 | |||
360 | def test_power_profile_power_saver_enabled_portal_default(self): | ||
361 | '''power-saver-enabled property default value''' | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-glibc b/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-glibc index c4648f58c7..3049e5116e 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-glibc +++ b/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-glibc | |||
@@ -3,3 +3,4 @@ have_c99_vsnprintf = true | |||
3 | have_c99_snprintf = true | 3 | have_c99_snprintf = true |
4 | have_unix98_printf = true | 4 | have_unix98_printf = true |
5 | va_val_copy = true | 5 | va_val_copy = true |
6 | have_strlcpy = true | ||
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 4cbcc29a50..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 011c9f024b6475d31e7d5432a38d00fb67eaea40 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,38 +13,32 @@ 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 | 12 +++++++++++- | 17 | gio/giomodule.c | 7 ------- |
19 | 1 file changed, 11 insertions(+), 1 deletion(-) | 18 | 1 file changed, 7 deletions(-) |
20 | 19 | ||
21 | diff --git a/gio/giomodule.c b/gio/giomodule.c | 20 | diff --git a/gio/giomodule.c b/gio/giomodule.c |
22 | index dc4d6d3..da46906 100644 | 21 | index 17fabe6..8021208 100644 |
23 | --- a/gio/giomodule.c | 22 | --- a/gio/giomodule.c |
24 | +++ b/gio/giomodule.c | 23 | +++ b/gio/giomodule.c |
25 | @@ -49,6 +49,8 @@ | 24 | @@ -1271,11 +1271,6 @@ get_gio_module_dir (void) |
26 | #include "gmemorymonitordbus.h" | ||
27 | #ifdef G_OS_WIN32 | ||
28 | #include "gregistrysettingsbackend.h" | ||
29 | +#else | ||
30 | +#include <dlfcn.h> | ||
31 | #endif | ||
32 | #include <glib/gstdio.h> | ||
33 | |||
34 | @@ -1163,7 +1165,15 @@ get_gio_module_dir (void) | ||
35 | NULL); | ||
36 | g_free (install_dir); | 25 | g_free (install_dir); |
37 | #else | 26 | #else |
38 | - module_dir = g_strdup (GIO_MODULE_DIR); | 27 | module_dir = g_strdup (GIO_MODULE_DIR); |
39 | + Dl_info info; | 28 | -#ifdef __APPLE__ |
40 | + | 29 | -#include "TargetConditionals.h" |
41 | + if (dladdr (g_io_module_new, &info)) { | 30 | -/* Only auto-relocate on macOS, not watchOS etc; older macOS SDKs only define TARGET_OS_MAC */ |
42 | + char *libdir = g_path_get_dirname (info.dli_fname); | 31 | -#if (defined (TARGET_OS_OSX) && TARGET_OS_OSX) || \ |
43 | + module_dir = g_build_filename (libdir, "gio", "modules", NULL); | 32 | - (!defined (TARGET_OS_OSX) && defined (TARGET_OS_MAC) && TARGET_OS_MAC) |
44 | + g_free (libdir); | 33 | #include <dlfcn.h> |
45 | + } else { | 34 | { |
46 | + module_dir = g_strdup (GIO_MODULE_DIR); | 35 | g_autofree gchar *path = NULL; |
47 | + } | 36 | @@ -1294,8 +1289,6 @@ get_gio_module_dir (void) |
37 | } | ||
38 | } | ||
39 | } | ||
40 | -#endif | ||
41 | -#endif | ||
48 | #endif | 42 | #endif |
49 | } | 43 | } |
50 | 44 | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest index 7a231b514b..831bc3b91f 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest +++ b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest | |||
@@ -5,5 +5,6 @@ if id -u glib2-test; then | |||
5 | userdel glib2-test | 5 | userdel glib2-test |
6 | fi | 6 | fi |
7 | useradd glib2-test | 7 | useradd glib2-test |
8 | su glib2-test -c 'gnome-desktop-testing-runner glib' | 8 | cd /tmp |
9 | su glib2-test -c 'G_TEST_TMPDIR=`readlink -f /tmp` gnome-desktop-testing-runner glib' | ||
9 | userdel glib2-test | 10 | userdel glib2-test |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/skip-timeout.patch b/meta/recipes-core/glib-2.0/glib-2.0/skip-timeout.patch new file mode 100644 index 0000000000..cd5ac287c3 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/skip-timeout.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From bb11d1a4ae77d93ec0743e54077cf0f990243fa6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Thu, 28 Mar 2024 16:27:09 +0000 | ||
4 | Subject: [PATCH] Skip /timeout/rounding test | ||
5 | |||
6 | This test is sensitive to load because it expects certain timeout operations | ||
7 | to succeed in specific time periods. Whilst these timeouts are fairly large, | ||
8 | they're still exceeded inside a qemu on a loaded system. | ||
9 | |||
10 | https://bugzilla.yoctoproject.org/show_bug.cgi?id=14464 | ||
11 | |||
12 | Upstream-Status: Inappropriate [OE-specific] | ||
13 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
14 | --- | ||
15 | glib/tests/timeout.c | 1 - | ||
16 | 1 file changed, 1 deletion(-) | ||
17 | |||
18 | diff --git a/glib/tests/timeout.c b/glib/tests/timeout.c | ||
19 | index 1ae3f3a34..85a715b0f 100644 | ||
20 | --- a/glib/tests/timeout.c | ||
21 | +++ b/glib/tests/timeout.c | ||
22 | @@ -214,7 +214,6 @@ main (int argc, char *argv[]) | ||
23 | g_test_add_func ("/timeout/seconds-once", test_seconds_once); | ||
24 | g_test_add_func ("/timeout/weeks-overflow", test_weeks_overflow); | ||
25 | g_test_add_func ("/timeout/far-future-ready-time", test_far_future_ready_time); | ||
26 | - g_test_add_func ("/timeout/rounding", test_rounding); | ||
27 | |||
28 | return g_test_run (); | ||
29 | } | ||
30 | -- | ||
31 | 2.34.1 | ||
32 | |||