summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0/files
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/glib-2.0/files')
-rw-r--r--meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch65
-rw-r--r--meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch29
-rw-r--r--meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch26
-rw-r--r--meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch39
-rw-r--r--meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch80
-rw-r--r--meta/recipes-core/glib-2.0/files/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch27
-rw-r--r--meta/recipes-core/glib-2.0/files/0001-girepository-introspection-correctly-install-.gir-fi.patch88
-rw-r--r--meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch28
-rw-r--r--meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch29
-rw-r--r--meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch43
-rw-r--r--meta/recipes-core/glib-2.0/files/meson.cross.d/common3
-rw-r--r--meta/recipes-core/glib-2.0/files/meson.cross.d/common-glibc6
-rw-r--r--meta/recipes-core/glib-2.0/files/meson.cross.d/common-linux5
-rw-r--r--meta/recipes-core/glib-2.0/files/meson.cross.d/common-mingw6
-rw-r--r--meta/recipes-core/glib-2.0/files/meson.cross.d/common-musl6
-rw-r--r--meta/recipes-core/glib-2.0/files/relocate-modules.patch44
-rw-r--r--meta/recipes-core/glib-2.0/files/run-ptest10
-rw-r--r--meta/recipes-core/glib-2.0/files/skip-timeout.patch29
18 files changed, 563 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch
new file mode 100644
index 0000000000..f6eba04fd4
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch
@@ -0,0 +1,65 @@
1From 0561dcbf0918631d8106c3f6c2d8e92a5ec4b887 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 15 Feb 2019 11:17:27 +0100
4Subject: [PATCH] Do not prefix executables with $bindir in pkg-config files
5
6This would otherwise break when using the executables to build other target
7components (we need to rely on PATH containing the paths to utilities,
8rather than use target paths).
9
10Upstream-Status: Inappropriate [upstream wants the paths in .pc files]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 gio/meson.build | 17 +++++++++--------
14 glib/meson.build | 7 ++++---
15 2 files changed, 13 insertions(+), 11 deletions(-)
16
17diff --git a/gio/meson.build b/gio/meson.build
18index 77cba7b..25d709e 100644
19--- a/gio/meson.build
20+++ b/gio/meson.build
21@@ -883,17 +883,18 @@ libgio_dep = declare_dependency(link_with : libgio,
22 pkg.generate(libgio,
23 requires : ['glib-2.0', 'gobject-2.0'],
24 variables : [
25+ 'bindir=' + '${prefix}' / get_option('bindir'),
26 'schemasdir=' + '${datadir}' / schemas_subdir,
27 'dtdsdir=' + '${datadir}' / dtds_subdir,
28 'giomoduledir=' + pkgconfig_giomodulesdir,
29- 'gio=' + '${bindir}' / 'gio',
30- 'gio_querymodules=' + pkgconfig_multiarch_bindir / 'gio-querymodules',
31- 'glib_compile_schemas=' + pkgconfig_multiarch_bindir / 'glib-compile-schemas',
32- 'glib_compile_resources=' + '${bindir}' / 'glib-compile-resources',
33- 'gdbus=' + '${bindir}' /'gdbus',
34- 'gdbus_codegen=' + '${bindir}' / 'gdbus-codegen',
35- 'gresource=' + '${bindir}' / 'gresource',
36- 'gsettings=' + '${bindir}' / 'gsettings',
37+ 'gio=gio',
38+ 'gio_querymodules=gio-querymodules',
39+ 'glib_compile_schemas=glib-compile-schemas',
40+ 'glib_compile_resources=glib-compile-resources',
41+ 'gdbus=gdbus',
42+ 'gdbus_codegen=gdbus-codegen',
43+ 'gresource=gresource',
44+ 'gsettings=gsettings',
45 ],
46 version : glib_version,
47 install_dir : glib_pkgconfigreldir,
48diff --git a/glib/meson.build b/glib/meson.build
49index d2efeba..5f5841d 100644
50--- a/glib/meson.build
51+++ b/glib/meson.build
52@@ -447,9 +447,10 @@ pkg.generate(libglib,
53 subdirs : ['glib-2.0'],
54 extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
55 variables : [
56- 'glib_genmarshal=' + '${bindir}' / 'glib-genmarshal',
57- 'gobject_query=' + '${bindir}' / 'gobject-query',
58- 'glib_mkenums=' + '${bindir}' / 'glib-mkenums',
59+ 'bindir=' + '${prefix}' / get_option('bindir'),
60+ 'glib_genmarshal=glib-genmarshal',
61+ 'gobject_query=gobject-query',
62+ 'glib_mkenums=glib-mkenums',
63 'glib_valgrind_suppressions=' + '${datadir}' /
64 valgrind_suppression_file_install_subdir /
65 fs.name(valgrind_suppression_file),
diff --git a/meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch b/meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
new file mode 100644
index 0000000000..129bc7f8ae
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
@@ -0,0 +1,29 @@
1From ccb25e8c0bab54eac8ba0e9d7083ce81461ab72a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 15 Mar 2014 22:42:29 -0700
4Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
5
6translation files are always installed under PREFIX/share/locale in uclibc
7based systems therefore lets set DATADIRNAME to "share".
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10Upstream-Status: Pending
11---
12 m4macros/glib-gettext.m4 | 4 ++++
13 1 file changed, 4 insertions(+)
14
15diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
16index df6fbf0..47db864 100644
17--- a/m4macros/glib-gettext.m4
18+++ b/m4macros/glib-gettext.m4
19@@ -293,6 +293,10 @@ msgstr ""
20 CATOBJEXT=.mo
21 DATADIRNAME=share
22 ;;
23+ *-*-musl* | *-*-linux-uclibc*)
24+ CATOBJEXT=.gmo
25+ DATADIRNAME=share
26+ ;;
27 *)
28 CATOBJEXT=.mo
29 DATADIRNAME=lib
diff --git a/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
new file mode 100644
index 0000000000..3e12f8abbe
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
@@ -0,0 +1,26 @@
1From caab40411d8520dae77a4b7933ebaffbb00559fe Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 22 Mar 2016 15:14:58 +0200
4Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM
5
6We want to install this binary with the gio library, and debian
7renamer does not cope with library packages with files in ${bindir}
8
9Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
10Upstream-Status: Inappropriate [OE specific]
11---
12 gio/meson.build | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/gio/meson.build b/gio/meson.build
16index 59c2b0f..77cba7b 100644
17--- a/gio/meson.build
18+++ b/gio/meson.build
19@@ -1007,6 +1007,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
20 c_args : gio_c_args,
21 # intl.lib is not compatible with SAFESEH
22 link_args : noseh_link_args,
23+ install_dir: glib_libexecdir,
24 dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
25
26 glib_compile_schemas = executable('glib-compile-schemas',
diff --git a/meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
new file mode 100644
index 0000000000..9b0b83afa4
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
@@ -0,0 +1,39 @@
1From 65c036b1ede453e89893076f4ece21c946505096 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 12 Jun 2015 17:08:46 +0300
4Subject: [PATCH] Remove the warning about deprecated paths in schemas
5
6Some schemas in gsettings-desktop-schemas (such as proxy and locale)
7are still using deprecated paths, as of 3.16.1. This causes warning
8messages, and meta/lib/oe/rootfs.py complaints about them.
9
10Upstream-Status: Inappropriate
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 gio/glib-compile-schemas.c | 13 -------------
14 1 file changed, 13 deletions(-)
15
16diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
17index 04ef404..e791ce2 100644
18--- a/gio/glib-compile-schemas.c
19+++ b/gio/glib-compile-schemas.c
20@@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state,
21 return;
22 }
23
24- if (path && (g_str_has_prefix (path, "/apps/") ||
25- g_str_has_prefix (path, "/desktop/") ||
26- g_str_has_prefix (path, "/system/")))
27- {
28- gchar *message = NULL;
29- message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”. "
30- "Paths starting with "
31- "“/apps/”, “/desktop/” or “/system/” are deprecated."),
32- id, path);
33- g_printerr ("%s\n", message);
34- g_free (message);
35- }
36-
37 state->schema_state = schema_state_new (path, gettext_domain,
38 extends, extends_name, list_of);
39
diff --git a/meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch b/meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
new file mode 100644
index 0000000000..a2f9dd9672
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
@@ -0,0 +1,80 @@
1From 01810df82fae752428d3756c85edb2eb7bbf3c15 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 13 Feb 2019 15:32:05 +0100
4Subject: [PATCH] Set host_machine correctly when building with mingw32
5
6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 gio/tests/meson.build | 8 ++++----
10 glib/tests/meson.build | 2 +-
11 meson.build | 3 +++
12 3 files changed, 8 insertions(+), 5 deletions(-)
13
14diff --git a/gio/tests/meson.build b/gio/tests/meson.build
15index 232ecca..563298b 100644
16--- a/gio/tests/meson.build
17+++ b/gio/tests/meson.build
18@@ -29,7 +29,7 @@ endif
19
20 test_cpp_args = test_c_args
21
22-if host_machine.system() == 'windows'
23+if host_system == 'windows'
24 common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')]
25 endif
26
27@@ -244,7 +244,7 @@ if have_dbus_daemon
28 endif
29
30 # Test programs buildable on UNIX only
31-if host_machine.system() != 'windows'
32+if host_system != 'windows'
33 gio_tests += {
34 'file' : {
35 # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/3148
36@@ -593,7 +593,7 @@ if host_machine.system() != 'windows'
37 endif # unix
38
39 # Test programs buildable on Windows only
40-if host_machine.system() == 'windows'
41+if host_system == 'windows'
42 gio_tests += {'win32-streams' : {}}
43 endif
44
45@@ -663,7 +663,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
46 }
47 endif
48
49-if host_machine.system() != 'windows'
50+if host_system != 'windows'
51 test_extra_programs += {
52 'gdbus-example-unix-fd-client' : {
53 'install' : false,
54diff --git a/glib/tests/meson.build b/glib/tests/meson.build
55index f6efc59..83eb5a5 100644
56--- a/glib/tests/meson.build
57+++ b/glib/tests/meson.build
58@@ -226,7 +226,7 @@ if glib_conf.has('HAVE_EVENTFD')
59 }
60 endif
61
62-if host_machine.system() == 'windows'
63+if host_system == 'windows'
64 if winsock2.found()
65 glib_tests += {
66 'gpoll' : {
67diff --git a/meson.build b/meson.build
68index 7534542..2560686 100644
69--- a/meson.build
70+++ b/meson.build
71@@ -54,6 +54,9 @@ else
72 endif
73
74 host_system = host_machine.system()
75+if host_system == 'mingw32'
76+ host_system = 'windows'
77+endif
78
79 if host_system == 'darwin'
80 ios_test_code = '''#include <TargetConditionals.h>
diff --git a/meta/recipes-core/glib-2.0/files/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch b/meta/recipes-core/glib-2.0/files/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch
new file mode 100644
index 0000000000..bb84f3969e
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/files/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch
@@ -0,0 +1,27 @@
1From e8b4f53b567339aad90b585673d55a5c6176535a Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 8 Jan 2020 18:22:46 +0100
4Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test
5
6This test requires building resources in a way that is
7not cross-compatible (hardcodes ld and objcopy).
8
9Upstream-Status: Inappropriate [oe-core specific]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 gio/tests/resources.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/gio/tests/resources.c b/gio/tests/resources.c
16index f7dc039..f708876 100644
17--- a/gio/tests/resources.c
18+++ b/gio/tests/resources.c
19@@ -1068,7 +1068,7 @@ main (int argc,
20 g_test_add_func ("/resource/automatic", test_resource_automatic);
21 /* This only uses automatic resources too, so it tests the constructors and destructors */
22 g_test_add_func ("/resource/module", test_resource_module);
23- g_test_add_func ("/resource/binary-linked", test_resource_binary_linked);
24+ /* g_test_add_func ("/resource/binary-linked", test_resource_binary_linked); */
25 #endif
26 g_test_add_func ("/resource/uri/query-info", test_uri_query_info);
27 g_test_add_func ("/resource/uri/file", test_uri_file);
diff --git a/meta/recipes-core/glib-2.0/files/0001-girepository-introspection-correctly-install-.gir-fi.patch b/meta/recipes-core/glib-2.0/files/0001-girepository-introspection-correctly-install-.gir-fi.patch
new file mode 100644
index 0000000000..76e5f58748
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/files/0001-girepository-introspection-correctly-install-.gir-fi.patch
@@ -0,0 +1,88 @@
1From 4e6be5d15e5d2f8e494d22a3d49b623064f9c1a5 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 23 Apr 2024 11:24:34 +0200
4Subject: [PATCH] girepository/introspection: correctly install .gir files into
5 custom locations provided via meson option
6
7Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4020]
8Signed-off-by: Alexander Kanavin <alex@linutronix.de>
9---
10 girepository/introspection/meson.build | 9 +++++++++
11 1 file changed, 9 insertions(+)
12
13diff --git a/girepository/introspection/meson.build b/girepository/introspection/meson.build
14index 9405686..862ca61 100644
15--- a/girepository/introspection/meson.build
16+++ b/girepository/introspection/meson.build
17@@ -49,6 +49,7 @@ glib_gir = gnome.generate_gir(libglib,
18 export_packages: 'glib-2.0',
19 header: 'glib.h',
20 install: true,
21+ install_dir_gir: glib_girdir,
22 dependencies: [
23 libgobject_dep,
24 ],
25@@ -76,6 +77,7 @@ if host_system == 'windows'
26 header: 'glib.h',
27 includes: [ glib_gir[0] ],
28 install: true,
29+ install_dir_gir: glib_girdir,
30 dependencies: [
31 libgobject_dep,
32 ],
33@@ -104,6 +106,7 @@ else
34 header: 'glib.h',
35 includes: [ glib_gir[0] ],
36 install: true,
37+ install_dir_gir: glib_girdir,
38 dependencies: [
39 libgobject_dep,
40 ],
41@@ -137,6 +140,7 @@ gobject_gir = gnome.generate_gir(libgobject,
42 header: 'glib-object.h',
43 includes: [ glib_gir[0] ],
44 install: true,
45+ install_dir_gir: glib_girdir,
46 env: gi_gen_env_variables,
47 extra_args: gir_args + [
48 '-DGOBJECT_COMPILATION',
49@@ -162,6 +166,7 @@ gmodule_gir = gnome.generate_gir(libgmodule,
50 header: 'gmodule.h',
51 includes: [ glib_gir[0] ],
52 install: true,
53+ install_dir_gir: glib_girdir,
54 dependencies: [
55 libglib_dep,
56 ],
57@@ -224,6 +229,7 @@ gio_gir = gnome.generate_gir(libgio,
58 header: 'gio/gio.h',
59 includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0] ],
60 install: true,
61+ install_dir_gir: glib_girdir,
62 dependencies: [
63 libglib_dep,
64 libgobject_dep,
65@@ -249,6 +255,7 @@ if host_system == 'windows'
66 header: 'gio/gio.h',
67 includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0], gio_gir[0] ],
68 install: true,
69+ install_dir_gir: glib_girdir,
70 dependencies: [
71 libglib_dep,
72 libgobject_dep,
73@@ -277,6 +284,7 @@ else
74 header: 'gio/gio.h',
75 includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0], gio_gir[0] ],
76 install: true,
77+ install_dir_gir: glib_girdir,
78 dependencies: [
79 libglib_dep,
80 libgobject_dep,
81@@ -314,6 +322,7 @@ girepository_gir = gnome.generate_gir(libgirepository,
82 header: 'girepository/girepository.h',
83 includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0], gio_gir[0] ],
84 install: true,
85+ install_dir_gir: glib_girdir,
86 dependencies: [ libglib_dep, libgobject_dep, libgmodule_dep, libgio_dep ],
87 extra_args: gir_args + libgirepository_gir_args,
88 )
diff --git a/meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch b/meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch
new file mode 100644
index 0000000000..2f80529987
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch
@@ -0,0 +1,28 @@
1From 3dc2e741e18ccb740e98eb4e808ff83153b70e83 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 12 Oct 2019 17:46:26 -0700
4Subject: [PATCH] meson: Run atomics test on clang as well
5
6Fixes
7./glib-2.62.1/glib/gatomic.c:675:2: error: G_ATOMIC_LOCK_FREE defined, but incapable of lock-free atomics.
8^
9
10Upstream-Status: Pending
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 meson.build | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/meson.build b/meson.build
17index 2560686..5c46d0b 100644
18--- a/meson.build
19+++ b/meson.build
20@@ -2024,7 +2024,7 @@ atomicdefine = '''
21 # We know that we can always use real ("lock free") atomic operations with MSVC
22 if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops')
23 have_atomic_lock_free = true
24- if cc.get_id() == 'gcc' and not cc.compiles(atomicdefine, name : 'atomic ops define')
25+ if (cc.get_id() == 'gcc' or cc.get_id() == 'clang') and not cc.compiles(atomicdefine, name : 'atomic ops define')
26 # Old gcc release may provide
27 # __sync_bool_compare_and_swap but doesn't define
28 # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
diff --git a/meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch b/meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch
new file mode 100644
index 0000000000..82955de671
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch
@@ -0,0 +1,29 @@
1From 59525eedfbbfe4a16fdd0b340bc3f2479431c7d5 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Sat, 16 Sep 2023 22:28:27 +0200
4Subject: [PATCH] meson.build: do not enable pidfd features on native glib
5 builds
6
7We still use host distros like alma 8 with kernels older than 5.4,
8where these features are not implemented.
9
10Upstream-Status: Inappropriate [oe-core specific]
11Signed-off-by: Alexander Kanavin <alex@linutronix.de>
12---
13 meson.build | 3 ++-
14 1 file changed, 2 insertions(+), 1 deletion(-)
15
16diff --git a/meson.build b/meson.build
17index 5c46d0b..222c1a1 100644
18--- a/meson.build
19+++ b/meson.build
20@@ -1022,7 +1022,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/files/0010-Do-not-hardcode-python-path-into-various-tools.patch b/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch
new file mode 100644
index 0000000000..a51c186b00
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch
@@ -0,0 +1,43 @@
1From e6784ba43af83e22556921786c8f15e4cd246298 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 3 Oct 2017 10:45:55 +0300
4Subject: [PATCH] Do not hardcode python path into various tools
5
6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +-
10 gobject/glib-genmarshal.in | 2 +-
11 gobject/glib-mkenums.in | 2 +-
12 3 files changed, 3 insertions(+), 3 deletions(-)
13
14diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
15index 67d3675..4e92a7a 100755
16--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
17+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
18@@ -1,4 +1,4 @@
19-#!/usr/bin/env @PYTHON@
20+#!/usr/bin/env python3
21
22 # GDBus - GLib D-Bus Library
23 #
24diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in
25index aa5af43..56e8e2e 100755
26--- a/gobject/glib-genmarshal.in
27+++ b/gobject/glib-genmarshal.in
28@@ -1,4 +1,4 @@
29-#!/usr/bin/env @PYTHON@
30+#!/usr/bin/env python3
31
32 # pylint: disable=too-many-lines, missing-docstring, invalid-name
33
34diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
35index e10b910..4b619f8 100755
36--- a/gobject/glib-mkenums.in
37+++ b/gobject/glib-mkenums.in
38@@ -1,4 +1,4 @@
39-#!/usr/bin/env @PYTHON@
40+#!/usr/bin/env python3
41
42 # If the code below looks horrible and unpythonic, do not panic.
43 #
diff --git a/meta/recipes-core/glib-2.0/files/meson.cross.d/common b/meta/recipes-core/glib-2.0/files/meson.cross.d/common
new file mode 100644
index 0000000000..0d7c5fa3f8
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/files/meson.cross.d/common
@@ -0,0 +1,3 @@
1[properties]
2# On all known supported architectures the stack grows down
3growing_stack = false
diff --git a/meta/recipes-core/glib-2.0/files/meson.cross.d/common-glibc b/meta/recipes-core/glib-2.0/files/meson.cross.d/common-glibc
new file mode 100644
index 0000000000..3049e5116e
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/files/meson.cross.d/common-glibc
@@ -0,0 +1,6 @@
1[properties]
2have_c99_vsnprintf = true
3have_c99_snprintf = true
4have_unix98_printf = true
5va_val_copy = true
6have_strlcpy = true
diff --git a/meta/recipes-core/glib-2.0/files/meson.cross.d/common-linux b/meta/recipes-core/glib-2.0/files/meson.cross.d/common-linux
new file mode 100644
index 0000000000..adad7e62ee
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/files/meson.cross.d/common-linux
@@ -0,0 +1,5 @@
1[properties]
2have_proc_self_cmdline = true
3
4[binaries]
5env = '/usr/bin/env'
diff --git a/meta/recipes-core/glib-2.0/files/meson.cross.d/common-mingw b/meta/recipes-core/glib-2.0/files/meson.cross.d/common-mingw
new file mode 100644
index 0000000000..75f911ba1e
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/files/meson.cross.d/common-mingw
@@ -0,0 +1,6 @@
1[properties]
2have_c99_vsnprintf = false
3have_c99_snprintf = false
4have_unix98_printf = false
5va_val_copy = true
6have_proc_self_cmdline = false
diff --git a/meta/recipes-core/glib-2.0/files/meson.cross.d/common-musl b/meta/recipes-core/glib-2.0/files/meson.cross.d/common-musl
new file mode 100644
index 0000000000..3049e5116e
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/files/meson.cross.d/common-musl
@@ -0,0 +1,6 @@
1[properties]
2have_c99_vsnprintf = true
3have_c99_snprintf = true
4have_unix98_printf = true
5va_val_copy = true
6have_strlcpy = true
diff --git a/meta/recipes-core/glib-2.0/files/relocate-modules.patch b/meta/recipes-core/glib-2.0/files/relocate-modules.patch
new file mode 100644
index 0000000000..d6e9019f39
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/files/relocate-modules.patch
@@ -0,0 +1,44 @@
1From 47ea2576a13d5bc86692b4ba8cb4a8f2fd38c6ca Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Fri, 11 Mar 2016 15:35:55 +0000
4Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
5
6Instead of hard-coding GIO_MODULE_PATH when glib is built, use dladdr() to
7determine where libglib.so is and use that path to calculate GIO_MODULES_DIR.
8
9This solves relocation problems with GIOModule for native builds of glib.
10
11Upstream-Status: Inappropriate
12Signed-off-by: Ross Burton <ross.burton@intel.com>
13
14Port patch to 2.48
15Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
16---
17 gio/giomodule.c | 7 -------
18 1 file changed, 7 deletions(-)
19
20diff --git a/gio/giomodule.c b/gio/giomodule.c
21index 1e14955..3c09bb5 100644
22--- a/gio/giomodule.c
23+++ b/gio/giomodule.c
24@@ -1259,11 +1259,6 @@ get_gio_module_dir (void)
25 g_free (install_dir);
26 #else
27 module_dir = g_strdup (GIO_MODULE_DIR);
28-#ifdef __APPLE__
29-#include "TargetConditionals.h"
30-/* Only auto-relocate on macOS, not watchOS etc; older macOS SDKs only define TARGET_OS_MAC */
31-#if (defined (TARGET_OS_OSX) && TARGET_OS_OSX) || \
32- (!defined (TARGET_OS_OSX) && defined (TARGET_OS_MAC) && TARGET_OS_MAC)
33 #include <dlfcn.h>
34 {
35 g_autofree gchar *path = NULL;
36@@ -1282,8 +1277,6 @@ get_gio_module_dir (void)
37 }
38 }
39 }
40-#endif
41-#endif
42 #endif
43 }
44
diff --git a/meta/recipes-core/glib-2.0/files/run-ptest b/meta/recipes-core/glib-2.0/files/run-ptest
new file mode 100644
index 0000000000..831bc3b91f
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/files/run-ptest
@@ -0,0 +1,10 @@
1#! /bin/sh
2
3set -eux
4if id -u glib2-test; then
5 userdel glib2-test
6fi
7useradd glib2-test
8cd /tmp
9su glib2-test -c 'G_TEST_TMPDIR=`readlink -f /tmp` gnome-desktop-testing-runner glib'
10userdel glib2-test
diff --git a/meta/recipes-core/glib-2.0/files/skip-timeout.patch b/meta/recipes-core/glib-2.0/files/skip-timeout.patch
new file mode 100644
index 0000000000..b1c62cc39c
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/files/skip-timeout.patch
@@ -0,0 +1,29 @@
1From 682d8a616ca111c0e45c8a9cb02e992e63c69586 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@arm.com>
3Date: Thu, 28 Mar 2024 16:27:09 +0000
4Subject: [PATCH] Skip /timeout/rounding test
5
6This test is sensitive to load because it expects certain timeout operations
7to succeed in specific time periods. Whilst these timeouts are fairly large,
8they're still exceeded inside a qemu on a loaded system.
9
10https://bugzilla.yoctoproject.org/show_bug.cgi?id=14464
11
12Upstream-Status: Inappropriate [OE-specific]
13Signed-off-by: Ross Burton <ross.burton@arm.com>
14---
15 glib/tests/timeout.c | 1 -
16 1 file changed, 1 deletion(-)
17
18diff --git a/glib/tests/timeout.c b/glib/tests/timeout.c
19index 1ae3f3a..85a715b 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 }
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-07-03 01:34:44 +0000