summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-10-11 13:47:40 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-15 14:16:10 +0100
commit004574ae37cbe2329bdc2d684dc14cd5f5ec50ad (patch)
treef57b6609eafcd4b0864990ee6a65d97d96ae7160
parent73edefb0b9309dc82f3294f747e0c16c2c80be3a (diff)
downloadpoky-004574ae37cbe2329bdc2d684dc14cd5f5ec50ad.tar.gz
glib-2.0: upgrade to 2.62.1
Drop backported 0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch and 0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch where upstream has removed the problematic bit. (From OE-Core rev: 5a0de7b1ee37d52f3bf013301030a2679a8c0a9f) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch31
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch34
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch22
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch62
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch27
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch8
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch22
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb)8
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc2
9 files changed, 75 insertions, 141 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
index ede29c90ba..edac4c9f75 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 @@
1From 474e59abec88de0c455836c1f53152bf2aa26c34 Mon Sep 17 00:00:00 2001 1From 60b36289ac314ad972cf81c1acd19f6f2e58ff25 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 15 Feb 2019 11:17:27 +0100 3Date: Fri, 15 Feb 2019 11:17:27 +0100
4Subject: [PATCH] Do not write $bindir into pkg-config files 4Subject: [PATCH] Do not write $bindir into pkg-config files
@@ -9,33 +9,44 @@ rather than use target paths).
9 9
10Upstream-Status: Inappropriate [upstream wants the paths in .pc files] 10Upstream-Status: Inappropriate [upstream wants the paths in .pc files]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12
12--- 13---
13 gio/meson.build | 6 +++--- 14 gio/meson.build | 16 ++++++++--------
14 glib/meson.build | 6 +++--- 15 glib/meson.build | 6 +++---
15 2 files changed, 6 insertions(+), 6 deletions(-) 16 2 files changed, 11 insertions(+), 11 deletions(-)
16 17
17diff --git a/gio/meson.build b/gio/meson.build 18diff --git a/gio/meson.build b/gio/meson.build
18index 85d8b14..657720a 100644 19index 71e88c4..8ce3987 100644
19--- a/gio/meson.build 20--- a/gio/meson.build
20+++ b/gio/meson.build 21+++ b/gio/meson.build
21@@ -813,9 +813,9 @@ pkg.generate(libraries : libgio, 22@@ -831,14 +831,14 @@ pkg.generate(libgio,
22 'schemasdir=' + join_paths('${datadir}', schemas_subdir), 23 'schemasdir=' + join_paths('${datadir}', schemas_subdir),
23 'bindir=' + join_paths('${prefix}', get_option('bindir')), 24 'bindir=' + join_paths('${prefix}', get_option('bindir')),
24 'giomoduledir=' + giomodulesdir, 25 'giomoduledir=' + giomodulesdir,
26- 'gio=' + join_paths('${bindir}', 'gio'),
27- 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
25- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'), 28- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
26- 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), 29- 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'),
27- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen')], 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',
28+ 'glib_compile_schemas=glib-compile-schemas', 36+ 'glib_compile_schemas=glib-compile-schemas',
29+ 'glib_compile_resources=glib-compile-resources', 37+ 'glib_compile_resources=glib-compile-resources',
30+ 'gdbus_codegen=gdbus-codegen'], 38+ 'gdbus=gdbus',
39+ 'gdbus_codegen=gdbus-codegen',
40+ 'gresource=gresource',
41+ 'gsettings=gsettings'],
31 version : glib_version, 42 version : glib_version,
32 install_dir : glib_pkgconfigreldir, 43 install_dir : glib_pkgconfigreldir,
33 filebase : 'gio-2.0', 44 filebase : 'gio-2.0',
34diff --git a/glib/meson.build b/glib/meson.build 45diff --git a/glib/meson.build b/glib/meson.build
35index c05c694..434e8b1 100644 46index 91a48f1..978fb73 100644
36--- a/glib/meson.build 47--- a/glib/meson.build
37+++ b/glib/meson.build 48+++ b/glib/meson.build
38@@ -261,9 +261,9 @@ pkg.generate(libraries : [libglib, libintl], 49@@ -375,9 +375,9 @@ pkg.generate(libglib,
39 subdirs : ['glib-2.0'], 50 subdirs : ['glib-2.0'],
40 extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, 51 extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
41 variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), 52 variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),
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
new file mode 100644
index 0000000000..d8cf269bb8
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
@@ -0,0 +1,34 @@
1From 15f807481de53942525b48952c5b6bbb9fb66542 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%% original patch: uclibc_musl_translation.patch
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
32--
332.17.1
34
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 d22a646c5d..b02169e09b 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,4 +1,4 @@
1From f5a4b4c0579734923c9caf70944322efff57318b Mon Sep 17 00:00:00 2001 1From cfff734af6bff6a30a649f784ecf698658c01884 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 13 Feb 2019 15:32:05 +0100 3Date: Wed, 13 Feb 2019 15:32:05 +0100
4Subject: [PATCH] Set host_machine correctly when building with mingw32 4Subject: [PATCH] Set host_machine correctly when building with mingw32
@@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14 4 files changed, 9 insertions(+), 6 deletions(-) 14 4 files changed, 9 insertions(+), 6 deletions(-)
15 15
16diff --git a/gio/tests/meson.build b/gio/tests/meson.build 16diff --git a/gio/tests/meson.build b/gio/tests/meson.build
17index 028b196..217ccb1 100644 17index 95aafc1..9025eb2 100644
18--- a/gio/tests/meson.build 18--- a/gio/tests/meson.build
19+++ b/gio/tests/meson.build 19+++ b/gio/tests/meson.build
20@@ -12,7 +12,7 @@ test_c_args = [ 20@@ -13,7 +13,7 @@ test_c_args = [
21 '-DGLIB_COMPILE_SCHEMAS="@0@"'.format(glib_compile_schemas.full_path()), 21 '-UG_DISABLE_ASSERT',
22 ] 22 ]
23 23
24-if host_machine.system() == 'windows' 24-if host_machine.system() == 'windows'
@@ -26,7 +26,7 @@ index 028b196..217ccb1 100644
26 common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] 26 common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')]
27 endif 27 endif
28 28
29@@ -119,7 +119,7 @@ if dbus1_dep.found() 29@@ -120,7 +120,7 @@ if dbus1_dep.found()
30 endif 30 endif
31 31
32 # Test programs buildable on UNIX only 32 # Test programs buildable on UNIX only
@@ -35,7 +35,7 @@ index 028b196..217ccb1 100644
35 gio_tests += { 35 gio_tests += {
36 'file' : {}, 36 'file' : {},
37 'gdbus-peer' : { 37 'gdbus-peer' : {
38@@ -327,7 +327,7 @@ if host_machine.system() != 'windows' 38@@ -332,7 +332,7 @@ if host_machine.system() != 'windows'
39 endif # unix 39 endif # unix
40 40
41 # Test programs buildable on Windows only 41 # Test programs buildable on Windows only
@@ -44,7 +44,7 @@ index 028b196..217ccb1 100644
44 gio_tests += {'win32-streams' : {}} 44 gio_tests += {'win32-streams' : {}}
45 endif 45 endif
46 46
47@@ -392,7 +392,7 @@ if cc.get_id() != 'msvc' 47@@ -397,7 +397,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
48 } 48 }
49 endif 49 endif
50 50
@@ -54,7 +54,7 @@ index 028b196..217ccb1 100644
54 'gdbus-example-unix-fd-client' : { 54 'gdbus-example-unix-fd-client' : {
55 'install' : false, 55 'install' : false,
56diff --git a/glib/tests/meson.build b/glib/tests/meson.build 56diff --git a/glib/tests/meson.build b/glib/tests/meson.build
57index d54fc41..a4761fe 100644 57index c47133f..cad975f 100644
58--- a/glib/tests/meson.build 58--- a/glib/tests/meson.build
59+++ b/glib/tests/meson.build 59+++ b/glib/tests/meson.build
60@@ -132,7 +132,7 @@ if glib_conf.has('HAVE_EVENTFD') 60@@ -132,7 +132,7 @@ if glib_conf.has('HAVE_EVENTFD')
@@ -67,10 +67,10 @@ index d54fc41..a4761fe 100644
67 glib_tests += { 67 glib_tests += {
68 'gpoll' : { 68 'gpoll' : {
69diff --git a/meson.build b/meson.build 69diff --git a/meson.build b/meson.build
70index a745024..e87eae5 100644 70index 717d1bc..2a3beb8 100644
71--- a/meson.build 71--- a/meson.build
72+++ b/meson.build 72+++ b/meson.build
73@@ -31,6 +31,9 @@ else 73@@ -32,6 +32,9 @@ else
74 endif 74 endif
75 75
76 host_system = host_machine.system() 76 host_system = host_machine.system()
@@ -81,7 +81,7 @@ index a745024..e87eae5 100644
81 glib_version = meson.project_version() 81 glib_version = meson.project_version()
82 glib_api_version = '2.0' 82 glib_api_version = '2.0'
83diff --git a/tests/meson.build b/tests/meson.build 83diff --git a/tests/meson.build b/tests/meson.build
84index 11075dd..cd6067b 100644 84index ce30442..5710f2c 100644
85--- a/tests/meson.build 85--- a/tests/meson.build
86+++ b/tests/meson.build 86+++ b/tests/meson.build
87@@ -66,7 +66,7 @@ test_extra_programs = { 87@@ -66,7 +66,7 @@ test_extra_programs = {
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch
deleted file mode 100644
index d1ed028759..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1Upstream-Status: Backport [fc88e56bfc2b09a8fb2b350e76f6425ab0a056d7]
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 141acf6a2f3b21d63c9cfe620b8e20a506e78493 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Wed, 13 Mar 2019 16:22:09 +0000
7Subject: [PATCH] meson: do a build-time check for strlcpy before attempting
8 runtime check
9
10In cross-compilation environments the runtime check isn't possible so it is up
11to the builder to seed the cross file, but we can definitely state that strlcpy
12doesn't exist with a build test.
13---
14 meson.build | 30 ++++++++++++++++--------------
15 1 file changed, 16 insertions(+), 14 deletions(-)
16
17diff --git a/meson.build b/meson.build
18index 15039e448..414f2d9b1 100644
19--- a/meson.build
20+++ b/meson.build
21@@ -1860,22 +1860,24 @@ endif
22
23 # Test if we have strlcpy/strlcat with a compatible implementation:
24 # https://bugzilla.gnome.org/show_bug.cgi?id=53933
25-if cc_can_run
26- rres = cc.run('''#include <stdlib.h>
27- #include <string.h>
28- int main() {
29- char p[10];
30- (void) strlcpy (p, "hi", 10);
31- if (strlcat (p, "bye", 0) != 3)
32- return 1;
33- return 0;
34- }''',
35- name : 'OpenBSD strlcpy/strlcat')
36- if rres.compiled() and rres.returncode() == 0
37+if cc.has_function('strlcpy')
38+ if cc_can_run
39+ rres = cc.run('''#include <stdlib.h>
40+ #include <string.h>
41+ int main() {
42+ char p[10];
43+ (void) strlcpy (p, "hi", 10);
44+ if (strlcat (p, "bye", 0) != 3)
45+ return 1;
46+ return 0;
47+ }''',
48+ name : 'OpenBSD strlcpy/strlcat')
49+ if rres.compiled() and rres.returncode() == 0
50+ glib_conf.set('HAVE_STRLCPY', 1)
51+ endif
52+ elif meson.get_cross_property('have_strlcpy', false)
53 glib_conf.set('HAVE_STRLCPY', 1)
54 endif
55-elif meson.get_cross_property('have_strlcpy', false)
56- glib_conf.set('HAVE_STRLCPY', 1)
57 endif
58
59 python = import('python').find_installation('python3')
60--
612.11.0
62
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch
deleted file mode 100644
index 5a1a589890..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 635fe26af51f20194c8b208e7d01303be1086d68 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 19 Feb 2019 10:31:11 +0100
4Subject: [PATCH] meson.build: do not hardcode 'linux' as the host system
5
6OE build system can set this to other values that include 'linux',
7e.g. 'linux-gnueabi'
8
9Upstream-Status: Pending
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 meson.build | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/meson.build b/meson.build
16index 4348f20..af5ed63 100644
17--- a/meson.build
18+++ b/meson.build
19@@ -1574,7 +1574,7 @@ atomicdefine = '''
20 # We know that we can always use real ("lock free") atomic operations with MSVC
21 if cc.get_id() == 'msvc' or cc.links(atomictest, name : 'atomic ops')
22 have_atomic_lock_free = true
23- if (host_system == 'android' or host_system == 'linux') and not cc.compiles(atomicdefine, name : 'atomic ops define')
24+ if (host_system == 'android' or host_system.contains('linux')) and not cc.compiles(atomicdefine, name : 'atomic ops define')
25 # When building for armv5 on Linux, gcc provides
26 # __sync_bool_compare_and_swap but doesn't define
27 # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
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 380bee086c..7e9925845b 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 @@
1From 9c5d6e6ce5254a5f050bba2118a4a1807292c02a Mon Sep 17 00:00:00 2001 1From 6325bf4e8a2f569c55c8e1a36b9439d3566f98f6 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Fri, 11 Mar 2016 15:35:55 +0000 3Date: Fri, 11 Mar 2016 15:35:55 +0000
4Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds 4Subject: [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
21diff --git a/gio/giomodule.c b/gio/giomodule.c 21diff --git a/gio/giomodule.c b/gio/giomodule.c
22index b92162d..fce9933 100644 22index 1007abd..5380982 100644
23--- a/gio/giomodule.c 23--- a/gio/giomodule.c
24+++ b/gio/giomodule.c 24+++ b/gio/giomodule.c
25@@ -40,6 +40,8 @@ 25@@ -44,6 +44,8 @@
26 #include "gnetworkmonitor.h" 26 #include "gnetworkmonitor.h"
27 #ifdef G_OS_WIN32 27 #ifdef G_OS_WIN32
28 #include "gregistrysettingsbackend.h" 28 #include "gregistrysettingsbackend.h"
@@ -31,7 +31,7 @@ index b92162d..fce9933 100644
31 #endif 31 #endif
32 #include <glib/gstdio.h> 32 #include <glib/gstdio.h>
33 33
34@@ -1156,7 +1158,15 @@ get_gio_module_dir (void) 34@@ -1158,7 +1160,15 @@ get_gio_module_dir (void)
35 #endif 35 #endif
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/uclibc_musl_translation.patch b/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
deleted file mode 100644
index 7aa6217d69..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Fix DATADIRNAME on uclibc/Linux
2
3translation files are always installed under PREFIX/share/locale in uclibc
4based systems therefore lets set DATADIRNAME to "share".
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Upstream-Status: Pending
8Index: glib-2.46.1/m4macros/glib-gettext.m4
9===================================================================
10--- glib-2.46.1.orig/m4macros/glib-gettext.m4
11+++ glib-2.46.1/m4macros/glib-gettext.m4
12@@ -243,6 +243,10 @@ msgstr ""
13 CATOBJEXT=.mo
14 DATADIRNAME=share
15 ;;
16+ *-*-musl* | *-*-linux-uclibc*)
17+ CATOBJEXT=.gmo
18+ DATADIRNAME=share
19+ ;;
20 *)
21 CATOBJEXT=.mo
22 DATADIRNAME=lib
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
index 740473719d..6d841ec9d9 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.62.1.bb
@@ -6,7 +6,7 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
6 6
7SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ 7SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
8 file://run-ptest \ 8 file://run-ptest \
9 file://uclibc_musl_translation.patch \ 9 file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \
10 file://Enable-more-tests-while-cross-compiling.patch \ 10 file://Enable-more-tests-while-cross-compiling.patch \
11 file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ 11 file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
12 file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ 12 file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
@@ -14,12 +14,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
14 file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ 14 file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
15 file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \ 15 file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \
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.build-do-not-hardcode-linux-as-the-host-system.patch \
18 file://0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch \
19 " 17 "
20 18
21SRC_URI_append_class-native = " file://relocate-modules.patch" 19SRC_URI_append_class-native = " file://relocate-modules.patch"
22SRC_URI_append_class-target = " file://glib-meson.cross" 20SRC_URI_append_class-target = " file://glib-meson.cross"
23 21
24SRC_URI[md5sum] = "f036f78a7fca330d9f7d939fcf794bde" 22SRC_URI[md5sum] = "64c14b4fe46c478992560c2f48a5b649"
25SRC_URI[sha256sum] = "8b12c0af569afd3b71200556ad751bad4cf4bf7bc4b5f880638459a42ca86310" 23SRC_URI[sha256sum] = "3dd9024e1d0872a6da7ac509937ccf997161b11d7d35be337c7e829cbae0f9df"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 3ae22f5e80..8b95f21204 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -158,6 +158,8 @@ RDEPENDS_${PN}-ptest += "\
158 ${PN}-locale-pl \ 158 ${PN}-locale-pl \
159 ${PN}-locale-ru \ 159 ${PN}-locale-ru \
160 ${PN}-locale-th \ 160 ${PN}-locale-th \
161 python3-core \
162 python3-modules \
161 " 163 "
162 164
163RDEPENDS_${PN}-ptest_append_libc-glibc = "\ 165RDEPENDS_${PN}-ptest_append_libc-glibc = "\