summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-11-14 16:57:35 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-30 10:49:22 +0000
commit709a730bf04e30ce2d1ba1bf48c2b5c8e6631f9f (patch)
treeee8a7e5480ca2d7247f31a7ea022f12e3d4076f5
parenta46657ceb1dfb86330a4778186f8e3d81e1ac233 (diff)
downloadpoky-709a730bf04e30ce2d1ba1bf48c2b5c8e6631f9f.tar.gz
glib-2.0: update to 2.54.2
LGPL version has been updated from 2.0 to 2.1, adjust the checksums accordingly. Rebase various patches. A few tools have been rewritten from perl (or C) to python, so add a patch that avoids hardcoding the python path in the shebang, and remove previous patching with sed. (From OE-Core rev: eef7883587acc933d6f34b559ec03ff84d18573b) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch25
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch46
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch30
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch38
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.54.2.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.52.3.bb)5
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc16
6 files changed, 95 insertions, 65 deletions
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
index 41a190eddf..67ca6240bc 100644
--- 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
@@ -1,7 +1,7 @@
1From 41534253b6b61ed4769eb6a3966698a50ee73b71 Mon Sep 17 00:00:00 2001 1From 2acf40361eecd17c6981743dabd06e25a9934258 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 12 Jun 2015 17:08:46 +0300 3Date: Fri, 12 Jun 2015 17:08:46 +0300
4Subject: [PATCH] Remove the warning about deprecated paths in schemas 4Subject: [PATCH 05/10] Remove the warning about deprecated paths in schemas
5 5
6Some schemas in gsettings-desktop-schemas (such as proxy and locale) 6Some schemas in gsettings-desktop-schemas (such as proxy and locale)
7are still using deprecated paths, as of 3.16.1. This causes warning 7are still using deprecated paths, as of 3.16.1. This causes warning
@@ -11,26 +11,33 @@ Upstream-Status: Inappropriate
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12 12
13--- 13---
14 gio/glib-compile-schemas.c | 6 ------ 14 gio/glib-compile-schemas.c | 13 -------------
15 1 file changed, 6 deletions(-) 15 1 file changed, 13 deletions(-)
16 16
17diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c 17diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
18index e42949b..ec79d7c 100644 18index b8de090..130f89b 100644
19--- a/gio/glib-compile-schemas.c 19--- a/gio/glib-compile-schemas.c
20+++ b/gio/glib-compile-schemas.c 20+++ b/gio/glib-compile-schemas.c
21@@ -1202,12 +1202,6 @@ parse_state_start_schema (ParseState *state, 21@@ -1219,19 +1219,6 @@ parse_state_start_schema (ParseState *state,
22 return; 22 return;
23 } 23 }
24 24
25- if (path && (g_str_has_prefix (path, "/apps/") || 25- if (path && (g_str_has_prefix (path, "/apps/") ||
26- g_str_has_prefix (path, "/desktop/") || 26- g_str_has_prefix (path, "/desktop/") ||
27- g_str_has_prefix (path, "/system/"))) 27- g_str_has_prefix (path, "/system/")))
28- g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with " 28- {
29- "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path); 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- }
30- 37-
31 state->schema_state = schema_state_new (path, gettext_domain, 38 state->schema_state = schema_state_new (path, gettext_domain,
32 extends, extends_name, list_of); 39 extends, extends_name, list_of);
33 40
34-- 41--
352.1.4 422.14.1
36 43
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
new file mode 100644
index 0000000000..697d63d5fe
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch
@@ -0,0 +1,46 @@
1From b9160d951b9af647b97766c57295ca4f45cf9521 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 10/10] 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 gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +-
10 gobject/glib-genmarshal.in | 2 +-
11 gobject/glib-mkenums.in | 2 +-
12 3 files changed, 3 insertions(+), 3 deletions(-)
13
14diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
15index 8050981..e693ef3 100644
16--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
17+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
18@@ -1,4 +1,4 @@
19-#!/usr/bin/env @PYTHON@
20+#!/usr/bin/env python3
21
22 # GDBus - GLib D-Bus Library
23 #
24diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in
25index 09e8408..b2f9d99 100755
26--- a/gobject/glib-genmarshal.in
27+++ b/gobject/glib-genmarshal.in
28@@ -1,4 +1,4 @@
29-#!/usr/bin/env @PYTHON@
30+#!/usr/bin/env python3
31
32 # pylint: disable=too-many-lines, missing-docstring, invalid-name
33
34diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
35index d4bfd11..051fce4 100755
36--- a/gobject/glib-mkenums.in
37+++ b/gobject/glib-mkenums.in
38@@ -1,4 +1,4 @@
39-#!/usr/bin/env @PYTHON@
40+#!/usr/bin/env python3
41
42 # If the code below looks horrible and unpythonic, do not panic.
43 #
44--
452.14.1
46
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 9b4ded14d5..b98f933dae 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,7 +1,7 @@
1From 310dfe1bdd16d4b254732fcc202c6211629bc7b6 Mon Sep 17 00:00:00 2001 1From d762907d33b81cf7469b5696c87f2188d2050afb 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 06/10] Enable more tests while cross-compiling
5 5
6Upstream disables a few tests while cross-compiling because their build requires 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 7running other built binaries. This usually makes sense but in the cross-compile
@@ -9,16 +9,17 @@ 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 | 8 +++----- 14 gio/tests/Makefile.am | 10 ++++++----
14 tests/gobject/Makefile.am | 8 +++----- 15 tests/gobject/Makefile.am | 8 +++++---
15 2 files changed, 6 insertions(+), 10 deletions(-) 16 2 files changed, 11 insertions(+), 7 deletions(-)
16 17
17diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am 18diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
18index 868873f..533e454 100644 19index acc1da4..9176640 100644
19--- a/gio/tests/Makefile.am 20--- a/gio/tests/Makefile.am
20+++ b/gio/tests/Makefile.am 21+++ b/gio/tests/Makefile.am
21@@ -503,10 +503,9 @@ test_programs += \ 22@@ -516,10 +516,9 @@ test_programs += \
22 endif 23 endif
23 24
24 # ----------------------------------------------------------------------------- 25 # -----------------------------------------------------------------------------
@@ -31,7 +32,7 @@ index 868873f..533e454 100644
31 test_programs += resources 32 test_programs += resources
32 resources_SOURCES = resources.c 33 resources_SOURCES = resources.c
33 nodist_resources_SOURCES = test_resources.c test_resources2.c test_resources2.h 34 nodist_resources_SOURCES = test_resources.c test_resources2.c test_resources2.h
34@@ -528,7 +527,11 @@ if !ENABLE_INSTALLED_TESTS 35@@ -543,7 +542,11 @@ if !ENABLE_INSTALLED_TESTS
35 libresourceplugin_la_LDFLAGS += -rpath / 36 libresourceplugin_la_LDFLAGS += -rpath /
36 endif 37 endif
37 38
@@ -41,18 +42,18 @@ index 868873f..533e454 100644
41+glib_compile_resources=glib-compile-resources 42+glib_compile_resources=glib-compile-resources
42+endif 43+endif
43 44
44 resources.o: test_resources2.h 45 test-generated.txt: test1.txt
45 test_resources.c: test2.gresource.xml Makefile $(shell $(glib_compile_resources) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/test2.gresource.xml) 46 $(AM_V_GEN) echo "Generated" > $@ && \
46@@ -545,7 +548,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) -- 47@@ -564,7 +567,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) --
47 48
48 EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt test4.gresource.xml 49 EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt test4.gresource.xml
49 CLEANFILES += test-generated.txt test_resources.c test_resources2.[ch] plugin_resources.c test.gresource 50 CLEANFILES += test-generated.txt test_resources.c test_resources2.[ch] plugin_resources.c test.gresource
50-endif # !CROSS_COMPILING 51-endif # !CROSS_COMPILING
51 52
52 BUILT_SOURCES += giotypefuncs.c 53 BUILT_SOURCES += giotypefuncs.inc
53 54
54diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am 55diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am
55index 16f2827..4c2208e 100644 56index 656941d..68555ff 100644
56--- a/tests/gobject/Makefile.am 57--- a/tests/gobject/Makefile.am
57+++ b/tests/gobject/Makefile.am 58+++ b/tests/gobject/Makefile.am
58@@ -48,10 +48,13 @@ if ENABLE_TIMELOOP 59@@ -48,10 +48,13 @@ if ENABLE_TIMELOOP
@@ -79,3 +80,6 @@ index 16f2827..4c2208e 100644
79 80
80 dist-hook: $(BUILT_EXTRA_DIST) 81 dist-hook: $(BUILT_EXTRA_DIST)
81 files='$(BUILT_EXTRA_DIST)'; \ 82 files='$(BUILT_EXTRA_DIST)'; \
83--
842.14.1
85
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
index aa5de27d12..59b891347d 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
@@ -1,7 +1,7 @@
1From e8740833336c59d6f616a1781b256e648e338c26 Mon Sep 17 00:00:00 2001 1From 1dd1e6ddca5deada049bac2e1ee1fe4ecc5342c5 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 28 Apr 2012 18:24:50 +0200 3Date: Sat, 28 Apr 2012 18:24:50 +0200
4Subject: [PATCH] configure: use $host_alias-libtool instead of libtool 4Subject: [PATCH 01/10] configure: use $host_alias-libtool instead of libtool
5 directly 5 directly
6 6
7Poky renames libtool to $host_alias-libtool. 7Poky renames libtool to $host_alias-libtool.
@@ -18,24 +18,16 @@ Rebased to glib-2.31.20+ by Andre McCurdy <armccurdy@gmail.com>
18Upstream-Status: Inappropriate [configuration] 18Upstream-Status: Inappropriate [configuration]
19 19
20Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 20Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
21
21--- 22---
22 configure.ac | 10 +++++----- 23 configure.ac | 4 ++--
23 1 file changed, 5 insertions(+), 5 deletions(-) 24 1 file changed, 2 insertions(+), 2 deletions(-)
24 25
25diff --git a/configure.ac b/configure.ac 26diff --git a/configure.ac b/configure.ac
26index 1af90c5..f6b7a73 100644 27index 6fa6eb0..b6f78a6 100644
27--- a/configure.ac 28--- a/configure.ac
28+++ b/configure.ac 29+++ b/configure.ac
29@@ -1378,7 +1378,7 @@ if test x"$glib_native_win32" = xyes; then 30@@ -1428,9 +1428,9 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [
30 G_MODULE_LDFLAGS=
31 else
32 export SED
33- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
34+ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
35 fi
36 dnl G_MODULE_IMPL= don't reset, so cmd-line can override
37 G_MODULE_NEED_USCORE=0
38@@ -1427,13 +1427,13 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [
39 LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" 31 LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
40 dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness 32 dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
41 echo "void glib_plugin_test(void) { }" > plugin.c 33 echo "void glib_plugin_test(void) { }" > plugin.c
@@ -47,20 +39,6 @@ index 1af90c5..f6b7a73 100644
47 ${LDFLAGS} -module -o plugin.la -export-dynamic \ 39 ${LDFLAGS} -module -o plugin.la -export-dynamic \
48 -shrext ".o" -avoid-version plugin.lo \ 40 -shrext ".o" -avoid-version plugin.lo \
49 -rpath /dont/care >/dev/null 2>&1 41 -rpath /dont/care >/dev/null 2>&1
50- eval `./libtool --config | grep ^objdir`
51+ eval `./$host_alias-libtool --config | grep ^objdir`
52 AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
53 glib_cv_rtldglobal_broken,[
54 AC_TRY_RUN([
55@@ -1506,7 +1506,7 @@ fi
56
57 AC_MSG_CHECKING(for the suffix of module shared libraries)
58 export SED
59-shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
60+shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='`
61 eval $shrext_cmds
62 module=yes eval std_shrext=$shrext_cmds
63 # chop the initial dot
64-- 42--
651.9.1 432.14.1
66 44
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.52.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.54.2.bb
index b1fe600992..60ce1b5f7f 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.52.3.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.54.2.bb
@@ -15,9 +15,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
15 file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ 15 file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
16 file://0001-Do-not-ignore-return-value-of-write.patch \ 16 file://0001-Do-not-ignore-return-value-of-write.patch \
17 file://0001-Test-for-pthread_getname_np-before-using-it.patch \ 17 file://0001-Test-for-pthread_getname_np-before-using-it.patch \
18 file://0010-Do-not-hardcode-python-path-into-various-tools.patch \
18 " 19 "
19 20
20SRC_URI_append_class-native = " file://relocate-modules.patch" 21SRC_URI_append_class-native = " file://relocate-modules.patch"
21 22
22SRC_URI[md5sum] = "89265d0289a436e99cad54491eb21ef4" 23SRC_URI[md5sum] = "50f83e08f080f99b1e2f0ad2b760fb81"
23SRC_URI[sha256sum] = "25ee7635a7c0fcd4ec91cbc3ae07c7f8f5ce621d8183511f414ded09e7e4e128" 24SRC_URI[sha256sum] = "bb89e5c5aad33169a8c7f28b45671c7899c12f74caf707737f784d7102758e6c"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 8434b7dae3..42ab5f1562 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -4,11 +4,11 @@ HOMEPAGE = "https://developer.gnome.org/glib/"
4 4
5# pcre is under BSD; 5# pcre is under BSD;
6# docs/reference/COPYING is with a 'public domai'-like license! 6# docs/reference/COPYING is with a 'public domai'-like license!
7LICENSE = "LGPLv2+ & BSD & PD" 7LICENSE = "LGPLv2.1+ & BSD & PD"
8LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ 8LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
9 file://glib/glib.h;beginline=4;endline=17;md5=b4f0f4a399c19e5ebb20c31b79d6bc32 \ 9 file://glib/glib.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \
10 file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ 10 file://gmodule/COPYING;md5=4fbd65380cdd255951079008b364516c \
11 file://gmodule/gmodule.h;beginline=4;endline=17;md5=b4f0f4a399c19e5ebb20c31b79d6bc32 \ 11 file://gmodule/gmodule.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \
12 file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \ 12 file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \
13 file://glib/pcre/pcre.h;beginline=11;endline=35;md5=de27f2bf633d20a2b7af0b1983423283 \ 13 file://glib/pcre/pcre.h;beginline=11;endline=35;md5=de27f2bf633d20a2b7af0b1983423283 \
14 file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc" 14 file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc"
@@ -95,12 +95,6 @@ do_install_append () {
95 rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc 95 rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc
96 rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo 96 rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo
97 97
98 # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
99 # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
100 if [ -f ${D}${bindir}/glib-mkenums ]; then
101 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums
102 fi
103
104 if [ -e ${D}${libdir}/charset.alias ]; then 98 if [ -e ${D}${libdir}/charset.alias ]; then
105 rm -f ${D}${libdir}/charset.alias 99 rm -f ${D}${libdir}/charset.alias
106 fi 100 fi