diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-04-27 10:40:00 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-28 11:51:42 +0100 |
commit | 0f2998617042099a17d8ee721a9f76450b5c3666 (patch) | |
tree | 48dca408ef827c2f00e11996266d011d831416d5 /meta/recipes-core/glib-2.0 | |
parent | 2a791efa59dfb81155e40400644e9ea061ab83a4 (diff) | |
download | poky-0f2998617042099a17d8ee721a9f76450b5c3666.tar.gz |
glib: upgrade 2.72.0 -> 2.72.1
(From OE-Core rev: e167060bfb105799e0931c06a6aa1275163bf261)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-tests-Add-C-tests-for-typechecking-with-atomic-compa.patch | 64 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0002-gatomic-Add-a-C-variant-of-g_atomic_int_compare_and_.patch | 70 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch | 32 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch | 8 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.72.1.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.72.0.bb) | 4 |
5 files changed, 20 insertions, 158 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-tests-Add-C-tests-for-typechecking-with-atomic-compa.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-tests-Add-C-tests-for-typechecking-with-atomic-compa.patch deleted file mode 100644 index 4842f462e1..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0001-tests-Add-C-tests-for-typechecking-with-atomic-compa.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | From 44b4bcd56d7ac2bd8ebf00e9fa433ad897d68216 Mon Sep 17 00:00:00 2001 | ||
2 | From: Philip Withnall <pwithnall@endlessos.org> | ||
3 | Date: Fri, 1 Apr 2022 13:44:45 +0100 | ||
4 | Subject: [PATCH 1/2] tests: Add C++ tests for typechecking with atomic compare | ||
5 | and exchanges | ||
6 | |||
7 | Signed-off-by: Philip Withnall <pwithnall@endlessos.org> | ||
8 | |||
9 | Helps: #2625 | ||
10 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2578] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | glib/tests/cxx.cpp | 28 ++++++++++++++++++++++++++++ | ||
14 | 1 file changed, 28 insertions(+) | ||
15 | |||
16 | diff --git a/glib/tests/cxx.cpp b/glib/tests/cxx.cpp | ||
17 | index be0a6bfa1..7d7f27c91 100644 | ||
18 | --- a/glib/tests/cxx.cpp | ||
19 | +++ b/glib/tests/cxx.cpp | ||
20 | @@ -53,6 +53,32 @@ test_typeof (void) | ||
21 | #endif | ||
22 | } | ||
23 | |||
24 | +static void | ||
25 | +test_atomic_pointer_compare_and_exchange (void) | ||
26 | +{ | ||
27 | + const gchar *str1 = "str1"; | ||
28 | + const gchar *str2 = "str2"; | ||
29 | + const gchar *atomic_string = str1; | ||
30 | + | ||
31 | + g_test_message ("Test that g_atomic_pointer_compare_and_exchange() with a " | ||
32 | + "non-void* pointer doesn’t have any compiler warnings in C++ mode"); | ||
33 | + | ||
34 | + g_assert_true (g_atomic_pointer_compare_and_exchange (&atomic_string, str1, str2)); | ||
35 | + g_assert_true (atomic_string == str2); | ||
36 | +} | ||
37 | + | ||
38 | +static void | ||
39 | +test_atomic_int_compare_and_exchange (void) | ||
40 | +{ | ||
41 | + gint atomic_int = 5; | ||
42 | + | ||
43 | + g_test_message ("Test that g_atomic_int_compare_and_exchange() doesn’t have " | ||
44 | + "any compiler warnings in C++ mode"); | ||
45 | + | ||
46 | + g_assert_true (g_atomic_int_compare_and_exchange (&atomic_int, 5, 50)); | ||
47 | + g_assert_cmpint (atomic_int, ==, 50); | ||
48 | +} | ||
49 | + | ||
50 | int | ||
51 | main (int argc, char *argv[]) | ||
52 | { | ||
53 | @@ -63,6 +89,8 @@ main (int argc, char *argv[]) | ||
54 | #endif | ||
55 | |||
56 | g_test_add_func ("/C++/typeof", test_typeof); | ||
57 | + g_test_add_func ("/C++/atomic-pointer-compare-and-exchange", test_atomic_pointer_compare_and_exchange); | ||
58 | + g_test_add_func ("/C++/atomic-int-compare-and-exchange", test_atomic_int_compare_and_exchange); | ||
59 | |||
60 | return g_test_run (); | ||
61 | } | ||
62 | -- | ||
63 | 2.35.1 | ||
64 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0002-gatomic-Add-a-C-variant-of-g_atomic_int_compare_and_.patch b/meta/recipes-core/glib-2.0/glib-2.0/0002-gatomic-Add-a-C-variant-of-g_atomic_int_compare_and_.patch deleted file mode 100644 index a07f94672f..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0002-gatomic-Add-a-C-variant-of-g_atomic_int_compare_and_.patch +++ /dev/null | |||
@@ -1,70 +0,0 @@ | |||
1 | From 2668390454bc0efe52a262eb2faa4a2bd5a062e2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Philip Withnall <pwithnall@endlessos.org> | ||
3 | Date: Fri, 1 Apr 2022 13:47:19 +0100 | ||
4 | Subject: [PATCH 2/2] gatomic: Add a C++ variant of | ||
5 | g_atomic_int_compare_and_exchange() | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | The C++ variant implements type safety differently, to avoid warnings | ||
11 | from C++ compilers about: | ||
12 | ``` | ||
13 | ../../../gnome-commander-1.14.2/src/intviewer/searcher.cc:303:5: error: cannot initialize a parameter of type 'gint *' (aka 'int *') with an rvalue of type 'void *' | ||
14 | g_atomic_int_compare_and_exchange ((gint*)&src->priv->progress_value, oldval, (gint)d); | ||
15 | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
16 | /mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux/gnome-commander/1.14.2-r0/recipe-sysroot/usr/include/glib-2.0/glib/gatomic.h:160:44: note: expanded from macro 'g_atomic_int_compare_and_exchange' | ||
17 | __atomic_compare_exchange_n ((atomic), (void *) (&(gaicae_oldval)), (newval), FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ? TRUE : FALSE; \ | ||
18 | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
19 | ``` | ||
20 | |||
21 | This complements the existing C++ variant for | ||
22 | `g_atomic_pointer_compare_and_exchange()`, and fixes a regression on C++ | ||
23 | from https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2114. | ||
24 | |||
25 | With the addition of the unit tests in the previous commit, this is | ||
26 | effectively tested by the FreeBSD and macOS CI jobs, as they use | ||
27 | `clang++` in C++ mode. `g++` doesn’t seem to emit a warning about this. | ||
28 | |||
29 | Signed-off-by: Philip Withnall <pwithnall@endlessos.org> | ||
30 | |||
31 | Fixes: #2625 | ||
32 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2578] | ||
33 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
34 | --- | ||
35 | glib/gatomic.h | 12 ++++++++++++ | ||
36 | 1 file changed, 12 insertions(+) | ||
37 | |||
38 | diff --git a/glib/gatomic.h b/glib/gatomic.h | ||
39 | index 5eba1dbc7..8b2b880c8 100644 | ||
40 | --- a/glib/gatomic.h | ||
41 | +++ b/glib/gatomic.h | ||
42 | @@ -152,6 +152,17 @@ G_END_DECLS | ||
43 | (void) (0 ? *(atomic) ^ *(atomic) : 1); \ | ||
44 | __atomic_fetch_sub ((atomic), 1, __ATOMIC_SEQ_CST) == 1; \ | ||
45 | })) | ||
46 | +#if defined(glib_typeof) && defined(__cplusplus) && __cplusplus >= 201103L | ||
47 | +/* See comments below about equivalent g_atomic_pointer_compare_and_exchange() | ||
48 | + * shenanigans for type-safety when compiling in C++ mode. */ | ||
49 | +#define g_atomic_int_compare_and_exchange(atomic, oldval, newval) \ | ||
50 | + (G_GNUC_EXTENSION ({ \ | ||
51 | + glib_typeof (*(atomic)) gaicae_oldval = (oldval); \ | ||
52 | + G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint)); \ | ||
53 | + (void) (0 ? *(atomic) ^ (newval) ^ (oldval) : 1); \ | ||
54 | + __atomic_compare_exchange_n ((atomic), &gaicae_oldval, (newval), FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ? TRUE : FALSE; \ | ||
55 | + })) | ||
56 | +#else /* if !(defined(glib_typeof) && defined(__cplusplus) && __cplusplus >= 201103L) */ | ||
57 | #define g_atomic_int_compare_and_exchange(atomic, oldval, newval) \ | ||
58 | (G_GNUC_EXTENSION ({ \ | ||
59 | gint gaicae_oldval = (oldval); \ | ||
60 | @@ -159,6 +170,7 @@ G_END_DECLS | ||
61 | (void) (0 ? *(atomic) ^ (newval) ^ (oldval) : 1); \ | ||
62 | __atomic_compare_exchange_n ((atomic), (void *) (&(gaicae_oldval)), (newval), FALSE, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ? TRUE : FALSE; \ | ||
63 | })) | ||
64 | +#endif /* defined(glib_typeof) */ | ||
65 | #define g_atomic_int_add(atomic, val) \ | ||
66 | (G_GNUC_EXTENSION ({ \ | ||
67 | G_STATIC_ASSERT (sizeof *(atomic) == sizeof (gint)); \ | ||
68 | -- | ||
69 | 2.35.1 | ||
70 | |||
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 index 6147bdae46..f5c161fe04 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From d2d7af496b4f4a13779179dbcbb98de56b09783f Mon Sep 17 00:00:00 2001 | 1 | From 1f3c05529c0c9032ae0a289fb1f088b7541fc9b0 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: Mon, 9 Nov 2015 11:07:27 +0200 | 3 | Date: Mon, 9 Nov 2015 11:07:27 +0200 |
4 | Subject: [PATCH] Enable more tests while cross-compiling | 4 | Subject: [PATCH] Enable more tests while cross-compiling |
@@ -9,24 +9,25 @@ case we can depend on glib-2.0-native. | |||
9 | 9 | ||
10 | Upstream-Status: Inappropriate [OE specific] | 10 | Upstream-Status: Inappropriate [OE specific] |
11 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | 11 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
12 | |||
12 | --- | 13 | --- |
13 | gio/tests/meson.build | 24 ++++++++++++------------ | 14 | gio/tests/meson.build | 24 ++++++++++++------------ |
14 | 1 file changed, 12 insertions(+), 12 deletions(-) | 15 | 1 file changed, 12 insertions(+), 12 deletions(-) |
15 | 16 | ||
16 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build | 17 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build |
17 | index e8d10a0f11f2..abe676767c60 100644 | 18 | index 3ed23a5..5df932a 100644 |
18 | --- a/gio/tests/meson.build | 19 | --- a/gio/tests/meson.build |
19 | +++ b/gio/tests/meson.build | 20 | +++ b/gio/tests/meson.build |
20 | @@ -250,7 +250,7 @@ if host_machine.system() != 'windows' | 21 | @@ -253,7 +253,7 @@ if host_machine.system() != 'windows' |
22 | } | ||
23 | endif | ||
21 | 24 | ||
22 | # Test programs that need to bring up a session bus (requires dbus-daemon) | ||
23 | have_dbus_daemon = find_program('dbus-daemon', required : false).found() | ||
24 | - if have_dbus_daemon | 25 | - if have_dbus_daemon |
25 | + if true | 26 | + if true |
26 | annotate_args = [ | 27 | annotate_args = [ |
27 | '--annotate', 'org.project.Bar', 'Key1', 'Value1', | 28 | '--annotate', 'org.project.Bar', 'Key1', 'Value1', |
28 | '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2', | 29 | '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2', |
29 | @@ -601,14 +601,14 @@ if installed_tests_enabled | 30 | @@ -603,14 +603,14 @@ if installed_tests_enabled |
30 | endforeach | 31 | endforeach |
31 | endif | 32 | endif |
32 | 33 | ||
@@ -43,7 +44,7 @@ index e8d10a0f11f2..abe676767c60 100644 | |||
43 | compiler_type, | 44 | compiler_type, |
44 | '--target=@OUTPUT@', | 45 | '--target=@OUTPUT@', |
45 | '--sourcedir=' + meson.current_source_dir(), | 46 | '--sourcedir=' + meson.current_source_dir(), |
46 | @@ -634,7 +634,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | 47 | @@ -636,7 +636,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
47 | test_gresource = custom_target('test.gresource', | 48 | test_gresource = custom_target('test.gresource', |
48 | input : 'test.gresource.xml', | 49 | input : 'test.gresource.xml', |
49 | output : 'test.gresource', | 50 | output : 'test.gresource', |
@@ -52,7 +53,7 @@ index e8d10a0f11f2..abe676767c60 100644 | |||
52 | compiler_type, | 53 | compiler_type, |
53 | '--target=@OUTPUT@', | 54 | '--target=@OUTPUT@', |
54 | '--sourcedir=' + meson.current_source_dir(), | 55 | '--sourcedir=' + meson.current_source_dir(), |
55 | @@ -647,7 +647,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | 56 | @@ -649,7 +649,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
56 | test_resources2_c = custom_target('test_resources2.c', | 57 | test_resources2_c = custom_target('test_resources2.c', |
57 | input : 'test3.gresource.xml', | 58 | input : 'test3.gresource.xml', |
58 | output : 'test_resources2.c', | 59 | output : 'test_resources2.c', |
@@ -61,7 +62,7 @@ index e8d10a0f11f2..abe676767c60 100644 | |||
61 | compiler_type, | 62 | compiler_type, |
62 | '--target=@OUTPUT@', | 63 | '--target=@OUTPUT@', |
63 | '--sourcedir=' + meson.current_source_dir(), | 64 | '--sourcedir=' + meson.current_source_dir(), |
64 | @@ -660,7 +660,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | 65 | @@ -662,7 +662,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
65 | test_resources2_h = custom_target('test_resources2.h', | 66 | test_resources2_h = custom_target('test_resources2.h', |
66 | input : 'test3.gresource.xml', | 67 | input : 'test3.gresource.xml', |
67 | output : 'test_resources2.h', | 68 | output : 'test_resources2.h', |
@@ -70,7 +71,7 @@ index e8d10a0f11f2..abe676767c60 100644 | |||
70 | compiler_type, | 71 | compiler_type, |
71 | '--target=@OUTPUT@', | 72 | '--target=@OUTPUT@', |
72 | '--sourcedir=' + meson.current_source_dir(), | 73 | '--sourcedir=' + meson.current_source_dir(), |
73 | @@ -674,7 +674,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | 74 | @@ -676,7 +676,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
74 | input : 'test2.gresource.xml', | 75 | input : 'test2.gresource.xml', |
75 | depends : big_test_resource, | 76 | depends : big_test_resource, |
76 | output : 'test_resources.c', | 77 | output : 'test_resources.c', |
@@ -79,7 +80,7 @@ index e8d10a0f11f2..abe676767c60 100644 | |||
79 | compiler_type, | 80 | compiler_type, |
80 | '--target=@OUTPUT@', | 81 | '--target=@OUTPUT@', |
81 | '--sourcedir=' + meson.current_source_dir(), | 82 | '--sourcedir=' + meson.current_source_dir(), |
82 | @@ -687,7 +687,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | 83 | @@ -689,7 +689,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
83 | digit_test_resources_c = custom_target('digit_test_resources.c', | 84 | digit_test_resources_c = custom_target('digit_test_resources.c', |
84 | input : '111_digit_test.gresource.xml', | 85 | input : '111_digit_test.gresource.xml', |
85 | output : 'digit_test_resources.c', | 86 | output : 'digit_test_resources.c', |
@@ -88,7 +89,7 @@ index e8d10a0f11f2..abe676767c60 100644 | |||
88 | compiler_type, | 89 | compiler_type, |
89 | '--target=@OUTPUT@', | 90 | '--target=@OUTPUT@', |
90 | '--sourcedir=' + meson.current_source_dir(), | 91 | '--sourcedir=' + meson.current_source_dir(), |
91 | @@ -700,7 +700,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | 92 | @@ -702,7 +702,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
92 | digit_test_resources_h = custom_target('digit_test_resources.h', | 93 | digit_test_resources_h = custom_target('digit_test_resources.h', |
93 | input : '111_digit_test.gresource.xml', | 94 | input : '111_digit_test.gresource.xml', |
94 | output : 'digit_test_resources.h', | 95 | output : 'digit_test_resources.h', |
@@ -97,7 +98,7 @@ index e8d10a0f11f2..abe676767c60 100644 | |||
97 | compiler_type, | 98 | compiler_type, |
98 | '--target=@OUTPUT@', | 99 | '--target=@OUTPUT@', |
99 | '--sourcedir=' + meson.current_source_dir(), | 100 | '--sourcedir=' + meson.current_source_dir(), |
100 | @@ -742,11 +742,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | 101 | @@ -744,11 +744,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
101 | 102 | ||
102 | ld = find_program('ld', required : false) | 103 | ld = find_program('ld', required : false) |
103 | 104 | ||
@@ -111,7 +112,7 @@ index e8d10a0f11f2..abe676767c60 100644 | |||
111 | compiler_type, | 112 | compiler_type, |
112 | '--target=@OUTPUT@', | 113 | '--target=@OUTPUT@', |
113 | '--sourcedir=' + meson.current_source_dir(), | 114 | '--sourcedir=' + meson.current_source_dir(), |
114 | @@ -760,7 +760,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | 115 | @@ -762,7 +762,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
115 | test_resources_binary_c = custom_target('test_resources_binary.c', | 116 | test_resources_binary_c = custom_target('test_resources_binary.c', |
116 | input : 'test5.gresource.xml', | 117 | input : 'test5.gresource.xml', |
117 | output : 'test_resources_binary.c', | 118 | output : 'test_resources_binary.c', |
@@ -120,6 +121,3 @@ index e8d10a0f11f2..abe676767c60 100644 | |||
120 | compiler_type, | 121 | compiler_type, |
121 | '--target=@OUTPUT@', | 122 | '--target=@OUTPUT@', |
122 | '--sourcedir=' + meson.current_source_dir(), | 123 | '--sourcedir=' + meson.current_source_dir(), |
123 | -- | ||
124 | 2.34.1 | ||
125 | |||
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 d3bb05e669..816b790ce7 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 d4e95568151cb7a62b6a29a4d2c3f532fd55c98c Mon Sep 17 00:00:00 2001 | 1 | From d52b1b530c5d8a1e70ae45d6e2139e9d3f25207f 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 |
@@ -19,10 +19,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | |||
19 | 1 file changed, 11 insertions(+), 1 deletion(-) | 19 | 1 file changed, 11 insertions(+), 1 deletion(-) |
20 | 20 | ||
21 | diff --git a/gio/giomodule.c b/gio/giomodule.c | 21 | diff --git a/gio/giomodule.c b/gio/giomodule.c |
22 | index d34037a..7442df6 100644 | 22 | index 2a043cc..e2d2310 100644 |
23 | --- a/gio/giomodule.c | 23 | --- a/gio/giomodule.c |
24 | +++ b/gio/giomodule.c | 24 | +++ b/gio/giomodule.c |
25 | @@ -54,6 +54,8 @@ | 25 | @@ -56,6 +56,8 @@ |
26 | #ifdef G_OS_WIN32 | 26 | #ifdef G_OS_WIN32 |
27 | #include "gregistrysettingsbackend.h" | 27 | #include "gregistrysettingsbackend.h" |
28 | #include "giowin32-priv.h" | 28 | #include "giowin32-priv.h" |
@@ -31,7 +31,7 @@ index d34037a..7442df6 100644 | |||
31 | #endif | 31 | #endif |
32 | #include <glib/gstdio.h> | 32 | #include <glib/gstdio.h> |
33 | 33 | ||
34 | @@ -1224,7 +1226,15 @@ get_gio_module_dir (void) | 34 | @@ -1267,7 +1269,15 @@ get_gio_module_dir (void) |
35 | NULL); | 35 | NULL); |
36 | g_free (install_dir); | 36 | g_free (install_dir); |
37 | #else | 37 | #else |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.72.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.72.1.bb index 62479e3c3f..c9ccedd81f 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.72.0.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.72.1.bb | |||
@@ -16,12 +16,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ | |||
16 | file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ | 16 | file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ |
17 | file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ | 17 | file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ |
18 | file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ | 18 | file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ |
19 | file://0001-tests-Add-C-tests-for-typechecking-with-atomic-compa.patch \ | ||
20 | file://0002-gatomic-Add-a-C-variant-of-g_atomic_int_compare_and_.patch \ | ||
21 | " | 19 | " |
22 | SRC_URI:append:class-native = " file://relocate-modules.patch" | 20 | SRC_URI:append:class-native = " file://relocate-modules.patch" |
23 | 21 | ||
24 | SRC_URI[sha256sum] = "d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d" | 22 | SRC_URI[sha256sum] = "c07e57147b254cef92ce80a0378dc0c02a4358e7de4702e9f403069781095fe2" |
25 | 23 | ||
26 | # Find any meson cross files in FILESPATH that are relevant for the current | 24 | # Find any meson cross files in FILESPATH that are relevant for the current |
27 | # build (using siteinfo) and add them to EXTRA_OEMESON. | 25 | # build (using siteinfo) and add them to EXTRA_OEMESON. |