<div dir="ltr">Odd major version numbers are development releases, so this won't be accepted into oe-core.<div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 7 November 2017 at 00:17, Alistair Francis <span dir="ltr"><<a href="mailto:alistair.francis@xilinx.com" target="_blank">alistair.francis@xilinx.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Update to Glib version 2.53.7.<br>
<br>
Signed-off-by: Alistair Francis <<a href="mailto:alistair.francis@xilinx.com">alistair.francis@xilinx.com</a>><br>
---<br>
...evert-meson-Substitute-the-<wbr>Python-shebang.patch | 54 ++++++++++++++++++++++<br>
.../glib-2.0/glib-2.0/<wbr>configure-libtool.patch | 34 +++-----------<br>
.../{<a href="http://glib-2.0_2.52.3.bb" rel="noreferrer" target="_blank">glib-2.0_2.52.3.bb</a> => <a href="http://glib-2.0_2.53.7.bb" rel="noreferrer" target="_blank">glib-2.0_2.53.7.bb</a>} | 6 +--<br>
meta/recipes-core/glib-2.0/<wbr>glib.inc | 8 ++--<br>
4 files changed, 67 insertions(+), 35 deletions(-)<br>
create mode 100644 meta/recipes-core/glib-2.0/<wbr>glib-2.0/0001-Partially-<wbr>Revert-meson-Substitute-the-<wbr>Python-shebang.patch<br>
rename meta/recipes-core/glib-2.0/{<a href="http://glib-2.0_2.52.3.bb" rel="noreferrer" target="_blank">gl<wbr>ib-2.0_2.52.3.bb</a> => <a href="http://glib-2.0_2.53.7.bb" rel="noreferrer" target="_blank">glib-2.0_2.53.7.bb</a>} (76%)<br>
<br>
diff --git a/meta/recipes-core/glib-2.0/<wbr>glib-2.0/0001-Partially-<wbr>Revert-meson-Substitute-the-<wbr>Python-shebang.patch b/meta/recipes-core/glib-2.0/<wbr>glib-2.0/0001-Partially-<wbr>Revert-meson-Substitute-the-<wbr>Python-shebang.patch<br>
new file mode 100644<br>
index 0000000000..979247cbba<br>
--- /dev/null<br>
+++ b/meta/recipes-core/glib-2.0/<wbr>glib-2.0/0001-Partially-<wbr>Revert-meson-Substitute-the-<wbr>Python-shebang.patch<br>
@@ -0,0 +1,54 @@<br>
+From be007b2e6fbe93904e36ccddc707f9<wbr>6b30ad8300 Mon Sep 17 00:00:00 2001<br>
+From: Alistair Francis <<a href="mailto:alistair.francis@xilinx.com">alistair.francis@xilinx.com</a>><br>
+Date: Mon, 6 Nov 2017 15:23:16 -0800<br>
+Subject: [PATCH] Partially Revert: meson: Substitute the Python shebang<br>
+<br>
+Partially revert this patch:<br>
+commit 0f18a2ebda4ec0440ec545542f9fc2<wbr>f60cd54c5d<br>
+Author: Emmanuele Bassi <<a href="mailto:ebassi@gnome.org">ebassi@gnome.org</a>><br>
+Date: Fri Jul 14 20:43:19 2017 +0100<br>
+<br>
+ meson: Substitute the Python shebang<br>
+<br>
+ Just like we do with Autotools. This allows building glib-mkenums and<br>
+ glib-genmarshal on older platforms that only have Python 2.<br>
+<br>
+The above patch stops using the hardcoded python3 enviroment to run<br>
+Python scripts and instead uses the PYTHON variable used from configure.<br>
+<br>
+This patch casues QA issues when building Glib and results in the env<br>
+string being too long (resulting in clipping) which results in build<br>
+failures.<br>
+<br>
+As we always have Python 3 we don't need a workaround for Python 2.<br>
+<br>
+Signed-off-by: Alistair Francis <<a href="mailto:alistair.francis@xilinx.com">alistair.francis@xilinx.com</a>><br>
+Upstream-Status: Inappropriate [OE specific]<br>
+---<br>
+ gobject/<a href="http://glib-genmarshal.in" rel="noreferrer" target="_blank">glib-genmarshal.in</a> | 2 +-<br>
+ gobject/<a href="http://glib-mkenums.in" rel="noreferrer" target="_blank">glib-mkenums.in</a> | 2 +-<br>
+ 2 files changed, 2 insertions(+), 2 deletions(-)<br>
+<br>
+diff --git a/gobject/<a href="http://glib-genmarshal.in" rel="noreferrer" target="_blank">glib-genmarshal.in</a> b/gobject/<a href="http://glib-genmarshal.in" rel="noreferrer" target="_blank">glib-genmarshal.in</a><br>
+index ed6de0ae8..ec30410bd 100755<br>
+--- a/gobject/<a href="http://glib-genmarshal.in" rel="noreferrer" target="_blank">glib-genmarshal.in</a><br>
++++ b/gobject/<a href="http://glib-genmarshal.in" rel="noreferrer" target="_blank">glib-genmarshal.in</a><br>
+@@ -1,4 +1,4 @@<br>
+-#!/usr/bin/env @PYTHON@<br>
++#!/usr/bin/env python3<br>
+<br>
+ # pylint: disable=too-many-lines, missing-docstring, invalid-name<br>
+<br>
+diff --git a/gobject/<a href="http://glib-mkenums.in" rel="noreferrer" target="_blank">glib-mkenums.in</a> b/gobject/<a href="http://glib-mkenums.in" rel="noreferrer" target="_blank">glib-mkenums.in</a><br>
+index d4bfd11c3..051fce4ca 100755<br>
+--- a/gobject/<a href="http://glib-mkenums.in" rel="noreferrer" target="_blank">glib-mkenums.in</a><br>
++++ b/gobject/<a href="http://glib-mkenums.in" rel="noreferrer" target="_blank">glib-mkenums.in</a><br>
+@@ -1,4 +1,4 @@<br>
+-#!/usr/bin/env @PYTHON@<br>
++#!/usr/bin/env python3<br>
+<br>
+ # If the code below looks horrible and unpythonic, do not panic.<br>
+ #<br>
+--<br>
+2.11.0<br>
+<br>
diff --git a/meta/recipes-core/glib-2.0/<wbr>glib-2.0/configure-libtool.<wbr>patch b/meta/recipes-core/glib-2.0/<wbr>glib-2.0/configure-libtool.<wbr>patch<br>
index aa5de27d12..d759ea1d7f 100644<br>
--- a/meta/recipes-core/glib-2.0/<wbr>glib-2.0/configure-libtool.<wbr>patch<br>
+++ b/meta/recipes-core/glib-2.0/<wbr>glib-2.0/configure-libtool.<wbr>patch<br>
@@ -14,28 +14,20 @@ from PATH though<br>
Rebased to glib-2.27.3 by Dongxiao Xu <<a href="mailto:dongxiao.xu@intel.com">dongxiao.xu@intel.com</a>><br>
Rebased to glib-2.32.1 by Martin Jansa <<a href="mailto:Martin.Jansa@gmail.com">Martin.Jansa@gmail.com</a>><br>
Rebased to glib-2.31.20+ by Andre McCurdy <<a href="mailto:armccurdy@gmail.com">armccurdy@gmail.com</a>><br>
+Rebased to glib-2.53.4+ by Alistair Francis <<a href="mailto:alistair.francis@xilinx.com">alistair.francis@xilinx.com</a>><br>
<br>
Upstream-Status: Inappropriate [configuration]<br>
<br>
Signed-off-by: Martin Jansa <<a href="mailto:Martin.Jansa@gmail.com">Martin.Jansa@gmail.com</a>><br>
---<br>
- <a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> | 10 +++++-----<br>
- 1 file changed, 5 insertions(+), 5 deletions(-)<br>
+ <a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> | 4 ++--<br>
+ 1 file changed, 2 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
-index 1af90c5..f6b7a73 100644<br>
+index f322edfea..7cf86c2fa 100644<br>
--- a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
+++ b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
-@@ -1378,7 +1378,7 @@ if test x"$glib_native_win32" = xyes; then<br>
- G_MODULE_LDFLAGS=<br>
- else<br>
- export SED<br>
-- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`<br>
-+ G_MODULE_LDFLAGS=`(./$host_<wbr>alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`<br>
- fi<br>
- dnl G_MODULE_IMPL= don't reset, so cmd-line can override<br>
- G_MODULE_NEED_USCORE=0<br>
-@@ -1427,13 +1427,13 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [<br>
+@@ -1428,9 +1428,9 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL" ], [<br>
LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"<br>
dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness<br>
echo "void glib_plugin_test(void) { }" > plugin.c<br>
@@ -47,20 +39,6 @@ index 1af90c5..f6b7a73 100644<br>
${LDFLAGS} -module -o <a href="http://plugin.la" rel="noreferrer" target="_blank">plugin.la</a> -export-dynamic \<br>
-shrext ".o" -avoid-version plugin.lo \<br>
-rpath /dont/care >/dev/null 2>&1<br>
-- eval `./libtool --config | grep ^objdir`<br>
-+ eval `./$host_alias-libtool --config | grep ^objdir`<br>
- AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],<br>
- glib_cv_rtldglobal_broken,[<br>
- AC_TRY_RUN([<br>
-@@ -1506,7 +1506,7 @@ fi<br>
-<br>
- AC_MSG_CHECKING(for the suffix of module shared libraries)<br>
- export SED<br>
--shrext_cmds=`./libtool --config | grep '^shrext_cmds='`<br>
-+shrext_cmds=`./$host_alias-<wbr>libtool --config | grep '^shrext_cmds='`<br>
- eval $shrext_cmds<br>
- module=yes eval std_shrext=$shrext_cmds<br>
- # chop the initial dot<br>
--<br>
-1.9.1<br>
+2.11.0<br>
<br>
diff --git a/meta/recipes-core/glib-2.0/<a href="http://glib-2.0_2.52.3.bb" rel="noreferrer" target="_blank">g<wbr>lib-2.0_2.52.3.bb</a> b/meta/recipes-core/glib-2.0/<a href="http://glib-2.0_2.53.7.bb" rel="noreferrer" target="_blank">g<wbr>lib-2.0_2.53.7.bb</a><br>
similarity index 76%<br>
rename from meta/recipes-core/glib-2.0/<a href="http://glib-2.0_2.52.3.bb" rel="noreferrer" target="_blank">gli<wbr>b-2.0_2.52.3.bb</a><br>
rename to meta/recipes-core/glib-2.0/<a href="http://glib-2.0_2.53.7.bb" rel="noreferrer" target="_blank">gli<wbr>b-2.0_2.53.7.bb</a><br>
index b1fe600992..c3807a23ab 100644<br>
--- a/meta/recipes-core/glib-2.0/<a href="http://glib-2.0_2.52.3.bb" rel="noreferrer" target="_blank">g<wbr>lib-2.0_2.52.3.bb</a><br>
+++ b/meta/recipes-core/glib-2.0/<a href="http://glib-2.0_2.53.7.bb" rel="noreferrer" target="_blank">g<wbr>lib-2.0_2.53.7.bb</a><br>
@@ -10,14 +10,14 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_<wbr>VER}/glib-${PV}.tar.xz \<br>
file://ptest-paths.patch \<br>
file://uclibc_musl_<wbr>translation.patch \<br>
file://allow-run-media-sdX-<wbr>drive-mount-if-username-root.<wbr>patch \<br>
- file://0001-Remove-the-<wbr>warning-about-deprecated-<wbr>paths-in-schemas.patch \<br>
file://Enable-more-tests-<wbr>while-cross-compiling.patch \<br>
file://0001-Install-gio-<wbr>querymodules-as-libexec_<wbr>PROGRAM.patch \<br>
file://0001-Do-not-ignore-<wbr>return-value-of-write.patch \<br>
file://0001-Test-for-pthread_<wbr>getname_np-before-using-it.<wbr>patch \<br>
+ file://0001-Partially-Revert-<wbr>meson-Substitute-the-Python-<wbr>shebang.patch \<br>
"<br>
<br>
SRC_URI_append_class-native = " file://relocate-modules.patch"<br>
<br>
-SRC_URI[md5sum] = "<wbr>89265d0289a436e99cad54491eb21e<wbr>f4"<br>
-SRC_URI[sha256sum] = "<wbr>25ee7635a7c0fcd4ec91cbc3ae07c7<wbr>f8f5ce621d8183511f414ded09e7e4<wbr>e128"<br>
+SRC_URI[md5sum] = "<wbr>fad7444e5c03c9bd174140fdd5c460<wbr>f8"<br>
+SRC_URI[sha256sum] = "<wbr>028efbf6df4d88d7725314456524b9<wbr>23169f4d4f8503347194b2baf2222f<wbr>3e33"<br>
diff --git a/meta/recipes-core/glib-2.0/<wbr>glib.inc b/meta/recipes-core/glib-2.0/<wbr>glib.inc<br>
index 8434b7dae3..48d3dc5b43 100644<br>
--- a/meta/recipes-core/glib-2.0/<wbr>glib.inc<br>
+++ b/meta/recipes-core/glib-2.0/<wbr>glib.inc<br>
@@ -5,10 +5,10 @@ HOMEPAGE = "<a href="https://developer.gnome.org/glib/" rel="noreferrer" target="_blank">https://developer.gnome.org/<wbr>glib/</a>"<br>
# pcre is under BSD;<br>
# docs/reference/COPYING is with a 'public domai'-like license!<br>
LICENSE = "LGPLv2+ & BSD & PD"<br>
-LIC_FILES_CHKSUM = "file://COPYING;md5=<wbr>3bf50002aefd002f49e7bb854063f7<wbr>e7 \<br>
- file://glib/glib.h;beginline=<wbr>4;endline=17;md5=<wbr>b4f0f4a399c19e5ebb20c31b79d6bc<wbr>32 \<br>
- file://gmodule/COPYING;md5=<wbr>3bf50002aefd002f49e7bb854063f7<wbr>e7 \<br>
- file://gmodule/gmodule.h;<wbr>beginline=4;endline=17;md5=<wbr>b4f0f4a399c19e5ebb20c31b79d6bc<wbr>32 \<br>
+LIC_FILES_CHKSUM = "file://COPYING;md5=<wbr>4fbd65380cdd255951079008b36451<wbr>6c \<br>
+ file://glib/glib.h;beginline=<wbr>4;endline=17;md5=<wbr>b88abb7f3ad09607e71cb9d5301559<wbr>06 \<br>
+ file://gmodule/COPYING;md5=<wbr>4fbd65380cdd255951079008b36451<wbr>6c \<br>
+ file://gmodule/gmodule.h;<wbr>beginline=4;endline=17;md5=<wbr>b88abb7f3ad09607e71cb9d5301559<wbr>06 \<br>
file://glib/pcre/COPYING;md5=<wbr>266ebc3ff74ee9ce6fad65577667c0<wbr>f4 \<br>
file://glib/pcre/pcre.h;<wbr>beginline=11;endline=35;md5=<wbr>de27f2bf633d20a2b7af0b19834232<wbr>83 \<br>
file://docs/reference/COPYING;<wbr>md5=<wbr>f51a5100c17af6bae00735cd791e1f<wbr>cc"<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.11.0<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div>