summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-06-07 14:19:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-08 16:01:41 +0100
commit3c80692e3653b74df269adafc2f01ad008c3240a (patch)
treee34450be4a05ef4809772e1eb2631872654bf958 /meta/recipes-core/glib-2.0
parent62a30ab5c7b820a8645c2e8b8302b5d1ea62c180 (diff)
downloadpoky-3c80692e3653b74df269adafc2f01ad008c3240a.tar.gz
glib-2.0: udpate 2.58.3 -> 2.60.3
Drop autotools-specific parts from patches, as all autotools files have been removed upstream (meson is now the only option). Remove autotools-specific 0001-Revert-Use-absolute-paths-in-pkg-config-files.patch Remove backported fix-nl-abaltmon.patch Add a hunk to Enable-more-tests-while-cross-compiling.patch which comments out the part of the tests that hard-codes native ld for building. (From OE-Core rev: c7479bfd5fad4b9ba2e4299048a0c432200a5204) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 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-Install-gio-querymodules-as-libexec_PROGRAM.patch23
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Revert-Use-absolute-paths-in-pkg-config-files.patch64
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch61
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch126
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/fix-nl-abaltmon.patch104
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch6
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.60.3.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb)6
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc2
8 files changed, 92 insertions, 300 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
index f246254942..a3d71f2b7a 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
@@ -1,4 +1,4 @@
1From 17fc9230fb932432d8faaaabf8c56fdc4845495e Mon Sep 17 00:00:00 2001 1From d29dfba67b1808eea6d428085f95b6e42cf2d1e4 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com> 2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 22 Mar 2016 15:14:58 +0200 3Date: Tue, 22 Mar 2016 15:14:58 +0200
4Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM 4Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM
@@ -10,29 +10,14 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
10Upstream-Status: Inappropriate [OE specific] 10Upstream-Status: Inappropriate [OE specific]
11 11
12--- 12---
13 gio/Makefile.am | 3 ++-
14 gio/meson.build | 1 + 13 gio/meson.build | 1 +
15 2 files changed, 3 insertions(+), 1 deletion(-) 14 1 file changed, 1 insertion(+)
16 15
17diff --git a/gio/Makefile.am b/gio/Makefile.am
18index e14cad2..bf2bcc7 100644
19--- a/gio/Makefile.am
20+++ b/gio/Makefile.am
21@@ -835,7 +835,8 @@ gio.def: libgio-2.0.la
22 gio-2.0.lib: libgio-2.0.la gio.def
23 $(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gio.def -out:$@
24
25-bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings gio-launch-desktop
26+bin_PROGRAMS = glib-compile-schemas glib-compile-resources gsettings gio-launch-desktop
27+libexec_PROGRAMS = gio-querymodules
28
29 glib_compile_resources_LDADD = libgio-2.0.la \
30 $(top_builddir)/gobject/libgobject-2.0.la \
31diff --git a/gio/meson.build b/gio/meson.build 16diff --git a/gio/meson.build b/gio/meson.build
32index b83d8f5..85d8b14 100644 17index 4e5e021..90a741a 100644
33--- a/gio/meson.build 18--- a/gio/meson.build
34+++ b/gio/meson.build 19+++ b/gio/meson.build
35@@ -925,6 +925,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu 20@@ -940,6 +940,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
36 c_args : gio_c_args, 21 c_args : gio_c_args,
37 # intl.lib is not compatible with SAFESEH 22 # intl.lib is not compatible with SAFESEH
38 link_args : noseh_link_args, 23 link_args : noseh_link_args,
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Revert-Use-absolute-paths-in-pkg-config-files.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Revert-Use-absolute-paths-in-pkg-config-files.patch
deleted file mode 100644
index f0c5d84ba7..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Revert-Use-absolute-paths-in-pkg-config-files.patch
+++ /dev/null
@@ -1,64 +0,0 @@
1From abc26aed7a28678dfcc20b21726a97c7c02ea73b Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Thu, 14 Feb 2019 14:55:15 +0800
4Subject: [PATCH] Revert "Use absolute paths in pkg-config files"
5
6This reverts commit e7a7c9b97776fa2a638d18ea3a931ba84e778f80.
7
8The glib pkgconfig files now contain absolute paths, but they're
9target paths so when we used them from a sysroot it fails. Upstream
10thinks that we should be setting
11GLIB_MKENUMS=/path/to/sysroot/usr/bin/glib-mkenums but that really
12doesn't scale.
13
14For now, we just revert the change to put absolute paths into
15the sysroot. This should be re-evaluated when we move the recipe to use
16meson.
17
18Upstream-Status: Inappropriate [Revert of an upstream commit]
19Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
20---
21 gio-2.0.pc.in | 7 +++----
22 glib-2.0.pc.in | 7 +++----
23 2 files changed, 6 insertions(+), 8 deletions(-)
24
25diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in
26index d67e80839..526f0daa0 100644
27--- a/gio-2.0.pc.in
28+++ b/gio-2.0.pc.in
29@@ -5,11 +5,10 @@ includedir=@includedir@
30
31 datadir=@datadir@
32 schemasdir=${datadir}/glib-2.0/schemas
33-bindir=@bindir@
34 giomoduledir=@GIO_MODULE_DIR@
35-glib_compile_schemas=${bindir}/glib-compile-schemas
36-glib_compile_resources=${bindir}/glib-compile-resources
37-gdbus_codegen=${bindir}/gdbus-codegen
38+glib_compile_schemas=glib-compile-schemas
39+glib_compile_resources=glib-compile-resources
40+gdbus_codegen=gdbus-codegen
41
42 Name: GIO
43 Description: glib I/O library
44diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in
45index 3c5ea81dc..275fc0163 100644
46--- a/glib-2.0.pc.in
47+++ b/glib-2.0.pc.in
48@@ -3,10 +3,9 @@ exec_prefix=@exec_prefix@
49 libdir=@libdir@
50 includedir=@includedir@
51
52-bindir=@bindir@
53-glib_genmarshal=${bindir}/glib-genmarshal
54-gobject_query=${bindir}/gobject-query
55-glib_mkenums=${bindir}/glib-mkenums
56+glib_genmarshal=glib-genmarshal
57+gobject_query=gobject-query
58+glib_mkenums=glib-mkenums
59
60 Name: GLib
61 Description: C Utility Library
62--
632.17.1
64
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 2b7fab7bde..d22a646c5d 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 4169f11beedacfbb8c7934a4c99189d44935a6b9 Mon Sep 17 00:00:00 2001 1From f5a4b4c0579734923c9caf70944322efff57318b 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
@@ -8,13 +8,13 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8 8
9--- 9---
10 gio/tests/meson.build | 8 ++++---- 10 gio/tests/meson.build | 8 ++++----
11 glib/tests/meson.build | 4 ++-- 11 glib/tests/meson.build | 2 +-
12 meson.build | 3 +++ 12 meson.build | 3 +++
13 tests/meson.build | 2 +- 13 tests/meson.build | 2 +-
14 4 files changed, 10 insertions(+), 7 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 181f5c7..11a1f12 100644 17index 028b196..217ccb1 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@@ -12,7 +12,7 @@ test_c_args = [
@@ -26,57 +26,48 @@ index 181f5c7..11a1f12 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@@ -122,7 +122,7 @@ if dbus1_dep.found() 29@@ -119,7 +119,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
33-if host_machine.system() != 'windows' 33-if host_machine.system() != 'windows'
34+if host_system != 'windows' 34+if host_system != 'windows'
35 gio_tests += [{ 35 gio_tests += {
36 'file' : {}, 36 'file' : {},
37 'gdbus-peer' : { 37 'gdbus-peer' : {
38@@ -314,7 +314,7 @@ if host_machine.system() != 'windows' 38@@ -327,7 +327,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
42-if host_machine.system() == 'windows' 42-if host_machine.system() == 'windows'
43+if host_system == 'windows' 43+if host_system == 'windows'
44 gio_tests += [{'win32-streams' : {}}] 44 gio_tests += {'win32-streams' : {}}
45 endif 45 endif
46 46
47@@ -379,7 +379,7 @@ if cc.get_id() != 'msvc' 47@@ -392,7 +392,7 @@ if cc.get_id() != 'msvc'
48 }] 48 }
49 endif 49 endif
50 50
51-if host_machine.system() != 'windows' 51-if host_machine.system() != 'windows'
52+if host_system != 'windows' 52+if host_system != 'windows'
53 test_extra_programs += [{ 53 test_extra_programs += {
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 d7b6a7a..6678a08 100644 57index d54fc41..a4761fe 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@@ -45,7 +45,7 @@ glib_tests = { 60@@ -132,7 +132,7 @@ if glib_conf.has('HAVE_EVENTFD')
61 'hook' : {}, 61 }
62 'hostutils' : {}, 62 endif
63 'include' : { 63
64- 'skip' : host_machine.system() == 'windows', 64-if host_machine.system() == 'windows'
65+ 'skip' : host_system == 'windows', 65+if host_system == 'windows'
66 }, 66 if winsock2.found()
67 'keyfile' : {}, 67 glib_tests += {
68 'list' : {}, 68 'gpoll' : {
69@@ -112,7 +112,7 @@ glib_tests = {
70 'utils' : {},
71 'unicode' : {},
72 'unix' : {
73- 'skip' : host_machine.system() == 'windows',
74+ 'skip' : host_system == 'windows',
75 },
76 'uri' : {},
77 '1bit-mutex' : {},
78diff --git a/meson.build b/meson.build 69diff --git a/meson.build b/meson.build
79index f7405a2..4348f20 100644 70index a745024..e87eae5 100644
80--- a/meson.build 71--- a/meson.build
81+++ b/meson.build 72+++ b/meson.build
82@@ -31,6 +31,9 @@ else 73@@ -31,6 +31,9 @@ else
@@ -90,15 +81,15 @@ index f7405a2..4348f20 100644
90 glib_version = meson.project_version() 81 glib_version = meson.project_version()
91 glib_api_version = '2.0' 82 glib_api_version = '2.0'
92diff --git a/tests/meson.build b/tests/meson.build 83diff --git a/tests/meson.build b/tests/meson.build
93index 80e45d7..9f3869f 100644 84index 11075dd..cd6067b 100644
94--- a/tests/meson.build 85--- a/tests/meson.build
95+++ b/tests/meson.build 86+++ b/tests/meson.build
96@@ -67,7 +67,7 @@ test_extra_programs = { 87@@ -66,7 +66,7 @@ test_extra_programs = {
97 'unicode-collate' : {}, 88 'unicode-collate' : {},
98 } 89 }
99 90
100-if host_machine.system() != 'windows' 91-if host_machine.system() != 'windows'
101+if host_system != 'windows' 92+if host_system != 'windows'
102 tests += [{ 93 tests += {
103 'timeloop' : {}, 94 'timeloop' : {},
104 'spawn-test' : {}, 95 'iochannel-test' : {},
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 5ccd3203fb..ff2629f06c 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 @@
1From 1481c6d5f08f9dbbe10abc87b372a1f61db36476 Mon Sep 17 00:00:00 2001 1From 23cd157352ac8a53f992ddc6d6d01caadf1c79bc Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com> 2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Mon, 9 Nov 2015 11:07:27 +0200 3Date: Mon, 9 Nov 2015 11:07:27 +0200
4Subject: [PATCH] Enable more tests while cross-compiling 4Subject: [PATCH] Enable more tests while cross-compiling
@@ -9,54 +9,16 @@ case we can depend on glib-2.0-native.
9 9
10Upstream-Status: Inappropriate [OE specific] 10Upstream-Status: Inappropriate [OE specific]
11Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 11Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
12
12--- 13---
13 gio/tests/Makefile.am | 10 ++++++---- 14 gio/tests/meson.build | 26 ++++++++++++++------------
14 gio/tests/meson.build | 15 ++++++++------- 15 1 file changed, 14 insertions(+), 12 deletions(-)
15 tests/gobject/Makefile.am | 6 ++++++
16 3 files changed, 20 insertions(+), 11 deletions(-)
17 16
18diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
19index c4e7a92..633e85c 100644
20--- a/gio/tests/Makefile.am
21+++ b/gio/tests/Makefile.am
22@@ -583,10 +583,9 @@ test_programs += \
23 endif
24
25 # -----------------------------------------------------------------------------
26-# The resources test is a bit more complicated, and we cannot build it when
27-# cross-compiling GIO because it requires running a binary...
28+# The resources test is a bit more complicated, and requires glib-native
29+# for running a binary
30
31-if !CROSS_COMPILING
32 test_programs += resources
33 resources_SOURCES = resources.c
34 nodist_resources_SOURCES = test_resources.c test_resources2.c test_resources2.h
35@@ -611,7 +610,11 @@ if !ENABLE_INSTALLED_TESTS
36 libresourceplugin_la_LDFLAGS += -rpath /
37 endif
38
39+if !CROSS_COMPILING
40 glib_compile_resources=$(top_builddir)/gio/glib-compile-resources
41+else
42+glib_compile_resources=glib-compile-resources
43+endif
44
45 test-generated.txt: test1.txt
46 $(AM_V_GEN) echo "Generated" > $@ && \
47@@ -632,7 +635,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) --
48
49 EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt test4.gresource.xml
50 CLEANFILES += test-generated.txt test_resources.c test_resources2.[ch] plugin_resources.c test.gresource
51-endif # !CROSS_COMPILING
52
53 BUILT_SOURCES += giotypefuncs.inc
54
55diff --git a/gio/tests/meson.build b/gio/tests/meson.build 17diff --git a/gio/tests/meson.build b/gio/tests/meson.build
56index dca33bd..181f5c7 100644 18index 65f43e2..028b196 100644
57--- a/gio/tests/meson.build 19--- a/gio/tests/meson.build
58+++ b/gio/tests/meson.build 20+++ b/gio/tests/meson.build
59@@ -173,7 +173,7 @@ if host_machine.system() != 'windows' 21@@ -185,7 +185,7 @@ if host_machine.system() != 'windows'
60 22
61 # Test programs that need to bring up a session bus (requires dbus-daemon) 23 # Test programs that need to bring up a session bus (requires dbus-daemon)
62 have_dbus_daemon = find_program('dbus-daemon', required : false).found() 24 have_dbus_daemon = find_program('dbus-daemon', required : false).found()
@@ -65,8 +27,8 @@ index dca33bd..181f5c7 100644
65 annotate_args = [ 27 annotate_args = [
66 '--annotate', 'org.project.Bar', 'Key1', 'Value1', 28 '--annotate', 'org.project.Bar', 'Key1', 'Value1',
67 '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2', 29 '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2',
68@@ -406,12 +406,13 @@ if installed_tests_enabled 30@@ -453,12 +453,13 @@ if installed_tests_enabled
69 install_subdir('cert-tests', install_dir : installed_tests_execdir) 31 install_data('static-link.py', install_dir : installed_tests_execdir)
70 endif 32 endif
71 33
72-if not meson.is_cross_build() or meson.has_exe_wrapper() 34-if not meson.is_cross_build() or meson.has_exe_wrapper()
@@ -81,7 +43,7 @@ index dca33bd..181f5c7 100644
81 '--target=@OUTPUT@', 43 '--target=@OUTPUT@',
82 '--sourcedir=' + meson.current_source_dir(), 44 '--sourcedir=' + meson.current_source_dir(),
83 '--generate-source', 45 '--generate-source',
84@@ -428,7 +429,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() 46@@ -482,7 +483,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
85 test_gresource = custom_target('test.gresource', 47 test_gresource = custom_target('test.gresource',
86 input : 'test.gresource.xml', 48 input : 'test.gresource.xml',
87 output : 'test.gresource', 49 output : 'test.gresource',
@@ -90,7 +52,7 @@ index dca33bd..181f5c7 100644
90 '--target=@OUTPUT@', 52 '--target=@OUTPUT@',
91 '--sourcedir=' + meson.current_source_dir(), 53 '--sourcedir=' + meson.current_source_dir(),
92 '--sourcedir=' + meson.current_build_dir(), 54 '--sourcedir=' + meson.current_build_dir(),
93@@ -439,7 +440,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() 55@@ -493,7 +494,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
94 test_resources2_c = custom_target('test_resources2.c', 56 test_resources2_c = custom_target('test_resources2.c',
95 input : 'test3.gresource.xml', 57 input : 'test3.gresource.xml',
96 output : 'test_resources2.c', 58 output : 'test_resources2.c',
@@ -99,7 +61,7 @@ index dca33bd..181f5c7 100644
99 '--target=@OUTPUT@', 61 '--target=@OUTPUT@',
100 '--sourcedir=' + meson.current_source_dir(), 62 '--sourcedir=' + meson.current_source_dir(),
101 '--generate', 63 '--generate',
102@@ -450,7 +451,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() 64@@ -504,7 +505,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
103 test_resources2_h = custom_target('test_resources2.h', 65 test_resources2_h = custom_target('test_resources2.h',
104 input : 'test3.gresource.xml', 66 input : 'test3.gresource.xml',
105 output : 'test_resources2.h', 67 output : 'test_resources2.h',
@@ -108,30 +70,54 @@ index dca33bd..181f5c7 100644
108 '--target=@OUTPUT@', 70 '--target=@OUTPUT@',
109 '--sourcedir=' + meson.current_source_dir(), 71 '--sourcedir=' + meson.current_source_dir(),
110 '--generate', 72 '--generate',
111@@ -461,7 +462,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() 73@@ -516,7 +517,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
112 test_resources_c = custom_target('test_resources.c',
113 input : 'test2.gresource.xml', 74 input : 'test2.gresource.xml',
75 depends : big_test_resource,
114 output : 'test_resources.c', 76 output : 'test_resources.c',
115- command : [glib_compile_resources, 77- command : [glib_compile_resources,
116+ command : ['glib-compile-resources', 78+ command : ['glib-compile-resources',
117 '--target=@OUTPUT@', 79 '--target=@OUTPUT@',
118 '--sourcedir=' + meson.current_source_dir(), 80 '--sourcedir=' + meson.current_source_dir(),
119 '--generate-source', 81 '--sourcedir=' + meson.current_build_dir(),
120diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am 82@@ -527,7 +528,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
121index 1bcefbe..77e646a 100644 83 digit_test_resources_c = custom_target('digit_test_resources.c',
122--- a/tests/gobject/Makefile.am 84 input : '111_digit_test.gresource.xml',
123+++ b/tests/gobject/Makefile.am 85 output : 'digit_test_resources.c',
124@@ -51,7 +51,13 @@ if ENABLE_TIMELOOP 86- command : [glib_compile_resources,
125 installed_test_programs += timeloop-closure 87+ command : ['glib-compile-resources',
126 endif 88 '--target=@OUTPUT@',
127 89 '--sourcedir=' + meson.current_source_dir(),
128+# The marshal test requires running a binary, which means we require 90 '--sourcedir=' + meson.current_build_dir(),
129+# glib-native when cross-compiling 91@@ -538,7 +539,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
130+if !CROSS_COMPILING 92 digit_test_resources_h = custom_target('digit_test_resources.h',
131 glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal 93 input : '111_digit_test.gresource.xml',
132+else 94 output : 'digit_test_resources.h',
133+glib_genmarshal=$(shell which glib-genmarshal) 95- command : [glib_compile_resources,
134+endif 96+ command : ['glib-compile-resources',
135 97 '--target=@OUTPUT@',
136 testmarshal.h: stamp-testmarshal.h 98 '--sourcedir=' + meson.current_source_dir(),
137 @true 99 '--generate',
100@@ -565,11 +566,12 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
101 # Support for --add-symbol was added to LLVM objcopy in 2019
102 # (https://reviews.llvm.org/D58234). FIXME: This test could be enabled for
103 # LLVM once that support is in a stable release.
104- if build_machine.system() == 'linux' and cc.get_id() == 'gcc'
105+ #if build_machine.system() == 'linux' and cc.get_id() == 'gcc'
106+ if not meson.is_cross_build()
107 test_gresource_binary = custom_target('test5.gresource',
108 input : 'test5.gresource.xml',
109 output : 'test5.gresource',
110- command : [glib_compile_resources,
111+ command : ['glib-compile-resources',
112 '--target=@OUTPUT@',
113 '--sourcedir=' + meson.current_source_dir(),
114 '--sourcedir=' + meson.current_build_dir(),
115@@ -581,7 +583,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
116 test_resources_binary_c = custom_target('test_resources_binary.c',
117 input : 'test5.gresource.xml',
118 output : 'test_resources_binary.c',
119- command : [glib_compile_resources,
120+ command : ['glib-compile-resources',
121 '--target=@OUTPUT@',
122 '--sourcedir=' + meson.current_source_dir(),
123 '--sourcedir=' + meson.current_build_dir(),
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/fix-nl-abaltmon.patch b/meta/recipes-core/glib-2.0/glib-2.0/fix-nl-abaltmon.patch
deleted file mode 100644
index c36a397fef..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/fix-nl-abaltmon.patch
+++ /dev/null
@@ -1,104 +0,0 @@
1Fix the last few remaining bugs in glib's date/locale code.
2
3Upstream-Status: Backport
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6From 93d8482384ebc5c7d1f3d92b0190db0371269663 Mon Sep 17 00:00:00 2001
7From: Rafal Luzynski <digitalfreak@lingonborough.com>
8Date: Fri, 10 May 2019 00:40:27 +0200
9Subject: [PATCH] build: Fix a typo in the test whether _NL_ABALTMON_n is
10 supported
11
12The correct spelling is "_NL_ABALTMON_n" rather than "_NL_ALTMON_n".
13The typo made Meson build think that _NL_ABALTMON_n constants are
14not supported which was totally wrong. This made g_date_time_format()
15output incorrect abbreviated month names in some languages.
16The old configure.ac script was correct here.
17
18Bug introduced in commit be4f96b6502c01d2a51d60b7a669c8ef82e22a4d.
19
20Closes: #1759
21---
22 meson.build | 26 +++++++++++++-------------
23 1 file changed, 13 insertions(+), 13 deletions(-)
24
25diff --git a/meson.build b/meson.build
26index c5d2ce5f8..08fa40ac5 100644
27--- a/meson.build
28+++ b/meson.build
29@@ -1002,20 +1002,20 @@ if cc.links('''#ifndef _GNU_SOURCE
30 #include <langinfo.h>
31 int main (int argc, char ** argv) {
32 char *str;
33- str = nl_langinfo (_NL_ALTMON_1);
34- str = nl_langinfo (_NL_ALTMON_2);
35- str = nl_langinfo (_NL_ALTMON_3);
36- str = nl_langinfo (_NL_ALTMON_4);
37- str = nl_langinfo (_NL_ALTMON_5);
38- str = nl_langinfo (_NL_ALTMON_6);
39- str = nl_langinfo (_NL_ALTMON_7);
40- str = nl_langinfo (_NL_ALTMON_8);
41- str = nl_langinfo (_NL_ALTMON_9);
42- str = nl_langinfo (_NL_ALTMON_10);
43- str = nl_langinfo (_NL_ALTMON_11);
44- str = nl_langinfo (_NL_ALTMON_12);
45+ str = nl_langinfo (_NL_ABALTMON_1);
46+ str = nl_langinfo (_NL_ABALTMON_2);
47+ str = nl_langinfo (_NL_ABALTMON_3);
48+ str = nl_langinfo (_NL_ABALTMON_4);
49+ str = nl_langinfo (_NL_ABALTMON_5);
50+ str = nl_langinfo (_NL_ABALTMON_6);
51+ str = nl_langinfo (_NL_ABALTMON_7);
52+ str = nl_langinfo (_NL_ABALTMON_8);
53+ str = nl_langinfo (_NL_ABALTMON_9);
54+ str = nl_langinfo (_NL_ABALTMON_10);
55+ str = nl_langinfo (_NL_ABALTMON_11);
56+ str = nl_langinfo (_NL_ABALTMON_12);
57 return 0;
58- }''', name : 'nl_langinfo (_NL_ALTMON_n)')
59+ }''', name : 'nl_langinfo (_NL_ABALTMON_n)')
60 glib_conf.set('HAVE_LANGINFO_ABALTMON', 1)
61 endif
62
63--
642.18.1
65
66From 35c28be32762d5af6b93cb6a3420c5977f7bf599 Mon Sep 17 00:00:00 2001
67From: Rafal Luzynski <digitalfreak@lingonborough.com>
68Date: Mon, 13 May 2019 23:11:28 +0200
69Subject: [PATCH] tests: Update month name check for Greek locale
70MIME-Version: 1.0
71Content-Type: text/plain; charset=UTF-8
72Content-Transfer-Encoding: 8bit
73
74Update the abbreviated month name in the test to match the actual
75translation. Otherwise the test fails with false positive.
76
77Vocabulary:
78
79July (nominative) - Greek: Ιούλιος (abbreviated: Ιούλ)
80Of July (genitive) - Greek: Ιουλίου (abbreviated: Ιουλ)
81
82This is similar to commit 4d215e006ee69bd7a993bf853722993433adbf9a
83and commit 7fe793e125c316ac34edd8158df5a132cb044bc1.
84
85Closes #1776
86---
87 glib/tests/date.c | 2 +-
88 1 file changed, 1 insertion(+), 1 deletion(-)
89
90diff --git a/glib/tests/date.c b/glib/tests/date.c
91index 8eb28712b..ff13ad101 100644
92--- a/glib/tests/date.c
93+++ b/glib/tests/date.c
94@@ -388,7 +388,7 @@ test_month_names (void)
95 TEST_DATE ( 1, 4, 2018, "%OB %Y", "Απρίλιος 2018");
96 TEST_DATE ( 1, 5, 2018, "%OB %Y", "Μάιος 2018");
97 TEST_DATE ( 1, 6, 2018, "%OB %Y", "Ιούνιος 2018");
98- TEST_DATE (16, 7, 2018, "%e %b %Y", "16 Ιούλ 2018");
99+ TEST_DATE (16, 7, 2018, "%e %b %Y", "16 Ιουλ 2018");
100 TEST_DATE ( 1, 8, 2018, "%Ob %Y", "Αύγ 2018");
101 }
102 else
103--
1042.18.1
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 a4e0c9201f..2d698a67c8 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 9d985803c50cfb99253c757934985f937da34822 Mon Sep 17 00:00:00 2001 1From 17ca85e329bf39c004b73a02e94b597dac41ddfe 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,7 +19,7 @@ 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 36c0cef..912e490 100644 22index b92162d..fce9933 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@@ -40,6 +40,8 @@
@@ -31,7 +31,7 @@ index 36c0cef..912e490 100644
31 #endif 31 #endif
32 #include <glib/gstdio.h> 32 #include <glib/gstdio.h>
33 33
34@@ -1099,7 +1101,15 @@ get_gio_module_dir (void) 34@@ -1156,7 +1158,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_2.58.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.60.3.bb
index d749be34ee..f4ade098ef 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.60.3.bb
@@ -12,16 +12,14 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
12 file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ 12 file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
13 file://0001-Do-not-ignore-return-value-of-write.patch \ 13 file://0001-Do-not-ignore-return-value-of-write.patch \
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-Revert-Use-absolute-paths-in-pkg-config-files.patch \
16 file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \ 15 file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \
17 file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ 16 file://0001-Do-not-write-bindir-into-pkg-config-files.patch \
18 file://0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch \ 17 file://0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch \
19 file://0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch \ 18 file://0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch \
20 file://fix-nl-abaltmon.patch \
21 file://glib-meson.cross \ 19 file://glib-meson.cross \
22 " 20 "
23 21
24SRC_URI_append_class-native = " file://relocate-modules.patch" 22SRC_URI_append_class-native = " file://relocate-modules.patch"
25 23
26SRC_URI[md5sum] = "8058c7bde846dcffe5fa453eca366d73" 24SRC_URI[md5sum] = "112a850caa8d2c21e24d4c9844e8b1fe"
27SRC_URI[sha256sum] = "8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481" 25SRC_URI[sha256sum] = "04ab0d560d45790d055f50db2d69974eab8b693a77390075462c56e652b760b9"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 385596c754..3ae22f5e80 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -48,7 +48,7 @@ PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, libxslt-native xmlto-native"
48PACKAGECONFIG[libelf] = ",,elfutils" 48PACKAGECONFIG[libelf] = ",,elfutils"
49PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false,dbus" 49PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false,dbus"
50 50
51EXTRA_OEMESON = "-Ddtrace=false -Dfam=false -Dsystemtap=false -Dselinux=false" 51EXTRA_OEMESON = "-Ddtrace=false -Dfam=false -Dsystemtap=false -Dselinux=disabled"
52EXTRA_OEMESON_append_class-target = " --cross-file ${WORKDIR}/glib-meson.cross" 52EXTRA_OEMESON_append_class-target = " --cross-file ${WORKDIR}/glib-meson.cross"
53 53
54do_configure_prepend() { 54do_configure_prepend() {
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-10 13:57:32 +0000