summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0/glib-2.0
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch39
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch61
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch31
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch27
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch40
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch95
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch26
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch28
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch29
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-tests-codegen.py-removing-unecessary-print-statement.patch38
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch44
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch121
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common3
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-glibc5
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-linux5
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-mingw6
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-musl6
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch50
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/run-ptest9
19 files changed, 0 insertions, 663 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 @@
1From 658c034d92027dc8af5f784cae852123fac79b19 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 16 Apr 2016 13:28:59 -0700
4Subject: [PATCH] Do not ignore return value of write()
5
6gcc warns about ignoring return value when compiling
7with fortify turned on.
8
9assert when write() fails
10
11Upstream-Status: Submitted
12Signed-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
18diff --git a/glib/tests/unix.c b/glib/tests/unix.c
19index 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
deleted file mode 100644
index 5fe3aa898e..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
+++ /dev/null
@@ -1,61 +0,0 @@
1From 0797a40627a4cb5439a24b872edc65356dceaaf0 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 write $bindir into pkg-config files
5
6This would otherwise break when using the files 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---
14 gio/meson.build | 16 ++++++++--------
15 glib/meson.build | 6 +++---
16 2 files changed, 11 insertions(+), 11 deletions(-)
17
18diff --git a/gio/meson.build b/gio/meson.build
19index 532b086..98468a3 100644
20--- a/gio/meson.build
21+++ b/gio/meson.build
22@@ -820,14 +820,14 @@ pkg.generate(libgio,
23 'schemasdir=' + join_paths('${datadir}', schemas_subdir),
24 'bindir=' + join_paths('${prefix}', get_option('bindir')),
25 'giomoduledir=' + pkgconfig_giomodulesdir,
26- 'gio=' + join_paths('${bindir}', 'gio'),
27- 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
28- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
29- 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'),
30- 'gdbus=' + join_paths('${bindir}', 'gdbus'),
31- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'),
32- 'gresource=' + join_paths('${bindir}', 'gresource'),
33- 'gsettings=' + join_paths('${bindir}', 'gsettings')],
34+ 'gio=gio',
35+ 'gio_querymodules=gio-querymodules',
36+ 'glib_compile_schemas=glib-compile-schemas',
37+ 'glib_compile_resources=glib-compile-resources',
38+ 'gdbus=gdbus',
39+ 'gdbus_codegen=gdbus-codegen',
40+ 'gresource=gresource',
41+ 'gsettings=gsettings'],
42 version : glib_version,
43 install_dir : glib_pkgconfigreldir,
44 filebase : 'gio-2.0',
45diff --git a/glib/meson.build b/glib/meson.build
46index aaf5f00..1e0992b 100644
47--- a/glib/meson.build
48+++ b/glib/meson.build
49@@ -375,9 +375,9 @@ pkg.generate(libglib,
50 subdirs : ['glib-2.0'],
51 extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
52 variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
53- 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'),
54- 'gobject_query=' + join_paths('${bindir}', 'gobject-query'),
55- 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')],
56+ 'glib_genmarshal=glib-genmarshal',
57+ 'gobject_query=gobject-query',
58+ 'glib_mkenums=glib-mkenums'],
59 version : glib_version,
60 install_dir : glib_pkgconfigreldir,
61 filebase : 'glib-2.0',
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
deleted file mode 100644
index 16f2d31496..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From c94e669de98a3892c699bd8d0d2b5164b2de747e 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
13---
14 m4macros/glib-gettext.m4 | 4 ++++
15 1 file changed, 4 insertions(+)
16
17diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
18index df6fbf0..47db864 100644
19--- a/m4macros/glib-gettext.m4
20+++ b/m4macros/glib-gettext.m4
21@@ -293,6 +293,10 @@ msgstr ""
22 CATOBJEXT=.mo
23 DATADIRNAME=share
24 ;;
25+ *-*-musl* | *-*-linux-uclibc*)
26+ CATOBJEXT=.gmo
27+ DATADIRNAME=share
28+ ;;
29 *)
30 CATOBJEXT=.mo
31 DATADIRNAME=lib
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
deleted file mode 100644
index 597864d9ac..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 0015db45cd1bfefc04959dffab5dabeead93136f 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---
13 gio/meson.build | 1 +
14 1 file changed, 1 insertion(+)
15
16diff --git a/gio/meson.build b/gio/meson.build
17index 2ef60ed..532b086 100644
18--- a/gio/meson.build
19+++ b/gio/meson.build
20@@ -936,6 +936,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
21 c_args : gio_c_args,
22 # intl.lib is not compatible with SAFESEH
23 link_args : noseh_link_args,
24+ install_dir: glib_libexecdir,
25 dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
26
27 glib_compile_schemas = executable('glib-compile-schemas',
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
deleted file mode 100644
index 6fd93526ce..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 4f47b8a8d650d185aa61aec2f56a283522a723c4 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---
14 gio/glib-compile-schemas.c | 13 -------------
15 1 file changed, 13 deletions(-)
16
17diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
18index 7888120..7acbd5b 100644
19--- a/gio/glib-compile-schemas.c
20+++ b/gio/glib-compile-schemas.c
21@@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state,
22 return;
23 }
24
25- if (path && (g_str_has_prefix (path, "/apps/") ||
26- g_str_has_prefix (path, "/desktop/") ||
27- g_str_has_prefix (path, "/system/")))
28- {
29- gchar *message = NULL;
30- message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”. "
31- "Paths starting with "
32- "“/apps/”, “/desktop/” or “/system/” are deprecated."),
33- id, path);
34- g_printerr ("%s\n", message);
35- g_free (message);
36- }
37-
38 state->schema_state = schema_state_new (path, gettext_domain,
39 extends, extends_name, list_of);
40
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
deleted file mode 100644
index d6765b163b..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
+++ /dev/null
@@ -1,95 +0,0 @@
1From 333809ded70ad4e3470b7134e3fac1a42ff48e61 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---
10 gio/tests/meson.build | 8 ++++----
11 glib/tests/meson.build | 2 +-
12 meson.build | 3 +++
13 tests/meson.build | 2 +-
14 4 files changed, 9 insertions(+), 6 deletions(-)
15
16diff --git a/gio/tests/meson.build b/gio/tests/meson.build
17index 3a19c82..b762835 100644
18--- a/gio/tests/meson.build
19+++ b/gio/tests/meson.build
20@@ -12,7 +12,7 @@ test_c_args = [
21 '-UG_DISABLE_ASSERT',
22 ]
23
24-if host_machine.system() == 'windows'
25+if host_system == 'windows'
26 common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')]
27 endif
28
29@@ -133,7 +133,7 @@ else
30 endif
31
32 # Test programs buildable on UNIX only
33-if host_machine.system() != 'windows'
34+if host_system != 'windows'
35 gio_tests += {
36 'file' : {},
37 'gdbus-peer' : {
38@@ -385,7 +385,7 @@ if host_machine.system() != 'windows'
39 endif # unix
40
41 # Test programs buildable on Windows only
42-if host_machine.system() == 'windows'
43+if host_system == 'windows'
44 gio_tests += {'win32-streams' : {}}
45 endif
46
47@@ -455,7 +455,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
48 }
49 endif
50
51-if host_machine.system() != 'windows'
52+if host_system != 'windows'
53 test_extra_programs += {
54 'gdbus-example-unix-fd-client' : {
55 'install' : false,
56diff --git a/glib/tests/meson.build b/glib/tests/meson.build
57index 6eb23e8..36eb919 100644
58--- a/glib/tests/meson.build
59+++ b/glib/tests/meson.build
60@@ -137,7 +137,7 @@ if glib_conf.has('HAVE_EVENTFD')
61 }
62 endif
63
64-if host_machine.system() == 'windows'
65+if host_system == 'windows'
66 if winsock2.found()
67 glib_tests += {
68 'gpoll' : {
69diff --git a/meson.build b/meson.build
70index 47f3a5c..7ea7ad1 100644
71--- a/meson.build
72+++ b/meson.build
73@@ -32,6 +32,9 @@ else
74 endif
75
76 host_system = host_machine.system()
77+if host_system == 'mingw32'
78+ host_system = 'windows'
79+endif
80
81 if host_system == 'darwin'
82 ios_test_code = '''#include <TargetConditionals.h>
83diff --git a/tests/meson.build b/tests/meson.build
84index 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-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 @@
1From b833254bcc9fcf4cdc2572027b1154d799535ca4 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Sun, 20 Dec 2020 22:01:43 +0100
4Subject: [PATCH] gio/tests/codegen.py: bump timeout to 100 seconds
5
6This may be necessary on overloaded CI systems.
7
8Upstream-Status: Pending
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 gio/tests/codegen.py | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/gio/tests/codegen.py b/gio/tests/codegen.py
15index 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
deleted file mode 100644
index d33fdd4d8b..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 92de6c7eb30b961b24a2dce812d5276487b7d23d 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---
13 gio/tests/resources.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/gio/tests/resources.c b/gio/tests/resources.c
17index c44d214..e289a01 100644
18--- a/gio/tests/resources.c
19+++ b/gio/tests/resources.c
20@@ -993,7 +993,7 @@ main (int argc,
21 g_test_add_func ("/resource/automatic", test_resource_automatic);
22 /* This only uses automatic resources too, so it tests the constructors and destructors */
23 g_test_add_func ("/resource/module", test_resource_module);
24- g_test_add_func ("/resource/binary-linked", test_resource_binary_linked);
25+ /* g_test_add_func ("/resource/binary-linked", test_resource_binary_linked); */
26 #endif
27 g_test_add_func ("/resource/uri/query-info", test_uri_query_info);
28 g_test_add_func ("/resource/uri/file", test_uri_file);
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
deleted file mode 100644
index 44482dd2b7..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 4b97f457b7b44117e27d2a218c4b68e7fe3fe4ce 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---
14 meson.build | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/meson.build b/meson.build
18index afb6eaa..6aa70f5 100644
19--- a/meson.build
20+++ b/meson.build
21@@ -1692,7 +1692,7 @@ atomicdefine = '''
22 # We know that we can always use real ("lock free") atomic operations with MSVC
23 if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops')
24 have_atomic_lock_free = true
25- if cc.get_id() == 'gcc' and not cc.compiles(atomicdefine, name : 'atomic ops define')
26+ if (cc.get_id() == 'gcc' or cc.get_id() == 'clang') and not cc.compiles(atomicdefine, name : 'atomic ops define')
27 # Old gcc release may provide
28 # __sync_bool_compare_and_swap but doesn't define
29 # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
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 @@
1From 6178df5658045a6253ef806e018fe80d99a8f5fb Mon Sep 17 00:00:00 2001
2From: Yi Fan Yu <yifan.yu@windriver.com>
3Date: Mon, 1 Feb 2021 16:10:28 -0500
4Subject: [PATCH] tests/codegen.py: removing unecessary print statement
5
6A huge amount of output(boiler-plate code) is
7printed to the console screen.
8This is not critical to the test results.
9
10This causes intermittent test failure when another process
11has to parse its output.
12
13Root cause is in ptest-runner, This is a workaround
14
15Uptream-Status: Inappropriate [other]
16
17
18
19Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
20---
21 gio/tests/codegen.py | 1 -
22 1 file changed, 1 deletion(-)
23
24diff --git a/gio/tests/codegen.py b/gio/tests/codegen.py
25index 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--
372.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
deleted file mode 100644
index 1c645f3a9a..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From 79ce7e545dd3a93f77d2146d50b6fa061fbceed9 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---
10 gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +-
11 gobject/glib-genmarshal.in | 2 +-
12 gobject/glib-mkenums.in | 2 +-
13 3 files changed, 3 insertions(+), 3 deletions(-)
14
15diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
16index 67d3675..4e92a7a 100755
17--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
18+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
19@@ -1,4 +1,4 @@
20-#!/usr/bin/env @PYTHON@
21+#!/usr/bin/env python3
22
23 # GDBus - GLib D-Bus Library
24 #
25diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in
26index 7380f24..c8abeaa 100755
27--- a/gobject/glib-genmarshal.in
28+++ b/gobject/glib-genmarshal.in
29@@ -1,4 +1,4 @@
30-#!/usr/bin/env @PYTHON@
31+#!/usr/bin/env python3
32
33 # pylint: disable=too-many-lines, missing-docstring, invalid-name
34
35diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
36index 91ad779..3ebef62 100755
37--- a/gobject/glib-mkenums.in
38+++ b/gobject/glib-mkenums.in
39@@ -1,4 +1,4 @@
40-#!/usr/bin/env @PYTHON@
41+#!/usr/bin/env python3
42
43 # If the code below looks horrible and unpythonic, do not panic.
44 #
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 @@
1From 7cde170afe6854d674b50e32b4c1d3b511be9abe Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Mon, 9 Nov 2015 11:07:27 +0200
4Subject: [PATCH] Enable more tests while cross-compiling
5
6Upstream disables a few tests while cross-compiling because their build requires
7running other built binaries. This usually makes sense but in the cross-compile
8case we can depend on glib-2.0-native.
9
10Upstream-Status: Inappropriate [OE specific]
11Signed-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
17diff --git a/gio/tests/meson.build b/gio/tests/meson.build
18index 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/meson.cross.d/common b/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common
deleted file mode 100644
index 0d7c5fa3f8..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common
+++ /dev/null
@@ -1,3 +0,0 @@
1[properties]
2# On all known supported architectures the stack grows down
3growing_stack = false
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
deleted file mode 100644
index c4648f58c7..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-glibc
+++ /dev/null
@@ -1,5 +0,0 @@
1[properties]
2have_c99_vsnprintf = true
3have_c99_snprintf = true
4have_unix98_printf = true
5va_val_copy = true
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-linux b/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-linux
deleted file mode 100644
index adad7e62ee..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-linux
+++ /dev/null
@@ -1,5 +0,0 @@
1[properties]
2have_proc_self_cmdline = true
3
4[binaries]
5env = '/usr/bin/env'
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-mingw b/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-mingw
deleted file mode 100644
index 75f911ba1e..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-mingw
+++ /dev/null
@@ -1,6 +0,0 @@
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/glib-2.0/meson.cross.d/common-musl b/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-musl
deleted file mode 100644
index 3049e5116e..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/meson.cross.d/common-musl
+++ /dev/null
@@ -1,6 +0,0 @@
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/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
deleted file mode 100644
index 4cbcc29a50..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From 011c9f024b6475d31e7d5432a38d00fb67eaea40 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---
18 gio/giomodule.c | 12 +++++++++++-
19 1 file changed, 11 insertions(+), 1 deletion(-)
20
21diff --git a/gio/giomodule.c b/gio/giomodule.c
22index dc4d6d3..da46906 100644
23--- a/gio/giomodule.c
24+++ b/gio/giomodule.c
25@@ -49,6 +49,8 @@
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);
37 #else
38- module_dir = g_strdup (GIO_MODULE_DIR);
39+ Dl_info info;
40+
41+ if (dladdr (g_io_module_new, &info)) {
42+ char *libdir = g_path_get_dirname (info.dli_fname);
43+ module_dir = g_build_filename (libdir, "gio", "modules", NULL);
44+ g_free (libdir);
45+ } else {
46+ module_dir = g_strdup (GIO_MODULE_DIR);
47+ }
48 #endif
49 }
50
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
deleted file mode 100644
index 7a231b514b..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
+++ /dev/null
@@ -1,9 +0,0 @@
1#! /bin/sh
2
3set -eux
4if id -u glib2-test; then
5 userdel glib2-test
6fi
7useradd glib2-test
8su glib2-test -c 'gnome-desktop-testing-runner glib'
9userdel glib2-test
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-06 13:25:38 +0000