summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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/Enable-more-tests-while-cross-compiling.patch42
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/date-lt.patch20
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch2
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb)8
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc5
6 files changed, 77 insertions, 64 deletions
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
new file mode 100644
index 0000000000..f0c5d84ba7
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Revert-Use-absolute-paths-in-pkg-config-files.patch
@@ -0,0 +1,64 @@
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/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 50781e7892..5060880926 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 4b1a6d247c78125096a6ea5ab3cab8a1f000dc23 Mon Sep 17 00:00:00 2001 1From 70e462e070f8eb20b7660c1cf88271c0449e43cc 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,17 +9,15 @@ 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
13--- 12---
14 gio/tests/Makefile.am | 10 ++++++---- 13 gio/tests/Makefile.am | 10 ++++++----
15 tests/gobject/Makefile.am | 8 +++++--- 14 1 file changed, 6 insertions(+), 4 deletions(-)
16 2 files changed, 11 insertions(+), 7 deletions(-)
17 15
18diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am 16diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
19index 1f0bed7..8295deb 100644 17index c4e7a92..633e85c 100644
20--- a/gio/tests/Makefile.am 18--- a/gio/tests/Makefile.am
21+++ b/gio/tests/Makefile.am 19+++ b/gio/tests/Makefile.am
22@@ -550,10 +550,9 @@ test_programs += \ 20@@ -583,10 +583,9 @@ test_programs += \
23 endif 21 endif
24 22
25 # ----------------------------------------------------------------------------- 23 # -----------------------------------------------------------------------------
@@ -32,7 +30,7 @@ index 1f0bed7..8295deb 100644
32 test_programs += resources 30 test_programs += resources
33 resources_SOURCES = resources.c 31 resources_SOURCES = resources.c
34 nodist_resources_SOURCES = test_resources.c test_resources2.c test_resources2.h 32 nodist_resources_SOURCES = test_resources.c test_resources2.c test_resources2.h
35@@ -578,7 +577,11 @@ if !ENABLE_INSTALLED_TESTS 33@@ -611,7 +610,11 @@ if !ENABLE_INSTALLED_TESTS
36 libresourceplugin_la_LDFLAGS += -rpath / 34 libresourceplugin_la_LDFLAGS += -rpath /
37 endif 35 endif
38 36
@@ -44,7 +42,7 @@ index 1f0bed7..8295deb 100644
44 42
45 test-generated.txt: test1.txt 43 test-generated.txt: test1.txt
46 $(AM_V_GEN) echo "Generated" > $@ && \ 44 $(AM_V_GEN) echo "Generated" > $@ && \
47@@ -599,7 +602,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) -- 45@@ -632,7 +635,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) --
48 46
49 EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt test4.gresource.xml 47 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 48 CLEANFILES += test-generated.txt test_resources.c test_resources2.[ch] plugin_resources.c test.gresource
@@ -52,29 +50,3 @@ index 1f0bed7..8295deb 100644
52 50
53 BUILT_SOURCES += giotypefuncs.inc 51 BUILT_SOURCES += giotypefuncs.inc
54 52
55diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am
56index 0e60987..927d13a 100644
57--- a/tests/gobject/Makefile.am
58+++ b/tests/gobject/Makefile.am
59@@ -51,10 +51,13 @@ if ENABLE_TIMELOOP
60 installed_test_programs += timeloop-closure
61 endif
62
63-# The marshal test requires running a binary, which means we cannot
64-# build it when cross-compiling
65+# The marshal test requires running a binary, which means we require
66+# glib-native when cross-compiling
67 if !CROSS_COMPILING
68 glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal
69+else
70+glib_genmarshal=$(shell which glib-genmarshal)
71+endif
72
73 testmarshal.h: stamp-testmarshal.h
74 @true
75@@ -71,4 +74,3 @@ testmarshal.c: testmarshal.h testmarshal.list $(glib_genmarshal)
76 BUILT_SOURCES += testmarshal.h testmarshal.c
77 CLEANFILES += stamp-testmarshal.h testmarshal.h testmarshal.c
78 EXTRA_DIST += testcommon.h testmarshal.list
79-endif # !CROSS_COMPILING
80\ No newline at end of file
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/date-lt.patch b/meta/recipes-core/glib-2.0/glib-2.0/date-lt.patch
deleted file mode 100644
index dd0aff7281..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/date-lt.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Update Lithuanian month names in the test suite as glibc changed the translations.
2
3Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/merge_requests/373]
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6diff --git a/glib/tests/date.c b/glib/tests/date.c
7index b801ca704..6646c227c 100644
8--- a/glib/tests/date.c
9+++ b/glib/tests/date.c
10@@ -365,8 +365,8 @@ test_month_names (void)
11 TEST_DATE ( 1, 4, 2018, "%Y m. %OB", "2018 m. balandis");
12 TEST_DATE ( 1, 5, 2018, "%Y m. %OB", "2018 m. gegužė");
13 TEST_DATE ( 1, 6, 2018, "%Y m. %OB", "2018 m. birželis");
14- TEST_DATE (17, 7, 2018, "%Y m. %b %e d.", "2018 m. Lie 17 d.");
15- TEST_DATE ( 1, 8, 2018, "%Y m. %Ob", "2018 m. Rgp");
16+ TEST_DATE (17, 7, 2018, "%Y m. %b %e d.", "2018 m. Liep. 17 d.");
17+ TEST_DATE ( 1, 8, 2018, "%Y m. %Ob", "2018 m. rugp.");
18 }
19 else
20 g_test_skip ("locale lt_LT not available, skipping Lithuanian month names test");
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 f9794d3dd2..9ec011a095 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 8326961841f4d16c7239e747de11e3817c35cfd2 Mon Sep 17 00:00:00 2001 1From 43967e85b7a87f9c2e780504ef30f4c9bf56f8f5 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
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb
index 1271a7c269..8aad570fa9 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb
@@ -8,15 +8,15 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
8 file://configure-libtool.patch \ 8 file://configure-libtool.patch \
9 file://run-ptest \ 9 file://run-ptest \
10 file://uclibc_musl_translation.patch \ 10 file://uclibc_musl_translation.patch \
11 file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
12 file://Enable-more-tests-while-cross-compiling.patch \ 11 file://Enable-more-tests-while-cross-compiling.patch \
12 file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
13 file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ 13 file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
14 file://0001-Do-not-ignore-return-value-of-write.patch \ 14 file://0001-Do-not-ignore-return-value-of-write.patch \
15 file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ 15 file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
16 file://date-lt.patch \ 16 file://0001-Revert-Use-absolute-paths-in-pkg-config-files.patch \
17 " 17 "
18 18
19SRC_URI_append_class-native = " file://relocate-modules.patch" 19SRC_URI_append_class-native = " file://relocate-modules.patch"
20 20
21SRC_URI[md5sum] = "9b5d21c802f55bf37171c4fbfe7d32d1" 21SRC_URI[md5sum] = "8058c7bde846dcffe5fa453eca366d73"
22SRC_URI[sha256sum] = "c0f4ce0730b4f95c47b711613b5406a887c2ee13ea6d25930d72a4fa7fdb77f6" 22SRC_URI[sha256sum] = "8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index a868b6df23..c9093cee86 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -142,8 +142,6 @@ RDEPENDS_${PN}-ptest += "\
142 shared-mime-info \ 142 shared-mime-info \
143 " 143 "
144 144
145# When https://gitlab.gnome.org/GNOME/glib/issues/1343 is
146# fixed add locale-base-pl-pl
147RDEPENDS_${PN}-ptest_append_libc-glibc = "\ 145RDEPENDS_${PN}-ptest_append_libc-glibc = "\
148 glibc-gconv-utf-16 \ 146 glibc-gconv-utf-16 \
149 glibc-charmap-utf-8 \ 147 glibc-charmap-utf-8 \
@@ -167,6 +165,5 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = "\
167 locale-base-fr-fr \ 165 locale-base-fr-fr \
168 locale-base-es-es \ 166 locale-base-es-es \
169 locale-base-en-gb \ 167 locale-base-en-gb \
168 locale-base-pl-pl \
170 " 169 "
171
172INSANE_SKIP_${PN}-ptest += "libdir"