summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-05-16 16:22:38 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-17 21:18:44 +0100
commit93e7f386bc463d80f491902a1cad2a5e730cd5a8 (patch)
treef7716c8843493b631c030cdf99c5c01ba9eda7a8 /meta/recipes-core
parent6bbe4fe48c93d1e2b67a36aa82d2ea5e289a219c (diff)
downloadpoky-93e7f386bc463d80f491902a1cad2a5e730cd5a8.tar.gz
glib-2.0: Upgrade 2.46.2 -> 2.48.1
* Remove now unnecessary readlink patches and ignore-format-nonliteral-warning.patch * Port relocate-modules.patch * Add ${datadir}/gettext/its to FILES_${PN}-dev: this could be done in gettext.bbclass but so far glib is the first and only ITS rule installer (From OE-Core rev: c99e920a344b29e053781008faa0328f416fdcc4) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch31
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch29
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/ignore-format-nonliteral-warning.patch39
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch66
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.48.1.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb)7
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc3
6 files changed, 36 insertions, 139 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch
deleted file mode 100644
index 0be36316b9..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1commit 9b38d507ec37b3d7d4df6095fa7ed16b47d399f7
2Author: Drew Moseley <drew_moseley@mentor.com>
3Date: Sat Mar 29 21:10:43 2014 -0400
4
5 configure.ac: Do not use readlink when cross compiling.
6
7 Do not use readlink to set ABS_GLIB_RUNTIME_LIBDIR when cross
8 compiling. Doing so causes host paths to potentially pollute
9 the target.
10
11 Note that in this case the path is not converted to absolute if
12 it contains any ".." references so it's not completely correct.
13
14 Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=727575]
15 Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
16
17diff -rub glib-2.38.2.orig/configure.ac glib-2.38.2/configure.ac
18--- glib-2.38.2.orig/configure.ac 2014-04-03 20:17:13.035567143 -0400
19+++ glib-2.38.2/configure.ac 2014-04-03 20:19:07.071566057 -0400
20@@ -275,7 +275,11 @@
21 [],
22 [with_runtime_libdir=""])
23 GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
24+AS_IF([ test $cross_compiling = yes ], [
25+ABS_GLIB_RUNTIME_LIBDIR="$libdir/$with_runtime_libdir"
26+], [
27 ABS_GLIB_RUNTIME_LIBDIR="`readlink -m $libdir/$with_runtime_libdir`"
28+])
29 AC_SUBST(GLIB_RUNTIME_LIBDIR)
30 AC_SUBST(ABS_GLIB_RUNTIME_LIBDIR)
31 AM_CONDITIONAL(HAVE_GLIB_RUNTIME_LIBDIR, [test "x$with_runtime_libdir" != "x"])
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch b/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch
deleted file mode 100644
index 9759d11e3c..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0-configure-readlink.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1configure.ac: change readlink -f to -m
2
3Change "readlink -f" to "readlink -m" since $libdir/$with_runtime_libdir
4may not exist.
5
6This patch should go to the upstream, I will send it sooner.
7
8Upstream-Status: Pending
9
10Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
11---
12 configure.ac | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/configure.ac b/configure.ac
16--- a/configure.ac
17+++ b/configure.ac
18@@ -271,7 +271,7 @@ AC_ARG_WITH(runtime-libdir,
19 [],
20 [with_runtime_libdir=""])
21 GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
22-ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`"
23+ABS_GLIB_RUNTIME_LIBDIR="`readlink -m $libdir/$with_runtime_libdir`"
24 AC_SUBST(GLIB_RUNTIME_LIBDIR)
25 AC_SUBST(ABS_GLIB_RUNTIME_LIBDIR)
26 AM_CONDITIONAL(HAVE_GLIB_RUNTIME_LIBDIR, [test "x$with_runtime_libdir" != "x"])
27--
281.8.1.2
29
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/ignore-format-nonliteral-warning.patch b/meta/recipes-core/glib-2.0/glib-2.0/ignore-format-nonliteral-warning.patch
deleted file mode 100644
index d533975100..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/ignore-format-nonliteral-warning.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 8cdbc7fb2c8c876902e457abe46ee18a0b134486 Mon Sep 17 00:00:00 2001
2From: coypu <coypu@sdf.org>
3Date: Wed, 2 Mar 2016 19:38:48 +0200
4Subject: gdate: Move warning pragma outside of function
5
6Commit 0817af40e8c74c721c30f6ef482b1f53d12044c7 breaks the build on
7older versions of GCC, which don't allow pragma inside functions.
8
9https://bugzilla.gnome.org/761550
10---
11Upstream-Status: Backport
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
14 glib/gdate.c | 8 +++++---
15 1 file changed, 5 insertions(+), 3 deletions(-)
16
17diff --git a/glib/gdate.c b/glib/gdate.c
18index cdc735c..92c34d2 100644
19--- a/glib/gdate.c
20+++ b/glib/gdate.c
21@@ -2439,6 +2439,9 @@ win32_strftime_helper (const GDate *d,
22 *
23 * Returns: number of characters written to the buffer, or 0 the buffer was too small
24 */
25+#pragma GCC diagnostic push
26+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
27+
28 gsize
29 g_date_strftime (gchar *s,
30 gsize slen,
31@@ -2552,3 +2552,5 @@ g_date_strftime (gchar *s,
32 return retval;
33 #endif
34 }
35+
36+#pragma GCC diagnostic pop
37--
38cgit v0.12
39
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 f9e3f3dbaa..65d5b43f9b 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
@@ -6,44 +6,42 @@ This solves relocation problems with GIOModule for native builds of glib.
6Upstream-Status: Inappropriate 6Upstream-Status: Inappropriate
7Signed-off-by: Ross Burton <ross.burton@intel.com> 7Signed-off-by: Ross Burton <ross.burton@intel.com>
8 8
9Port patch to 2.48
10Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
11---
12 gio/giomodule.c | 12 +++++++++++-
13 1 file changed, 11 insertions(+), 1 deletion(-)
14
9diff --git a/gio/giomodule.c b/gio/giomodule.c 15diff --git a/gio/giomodule.c b/gio/giomodule.c
10index 56c498c..a2e32b7 100644 16index da7c167..cc0bc7c 100644
11--- a/gio/giomodule.c 17--- a/gio/giomodule.c
12+++ b/gio/giomodule.c 18+++ b/gio/giomodule.c
13@@ -47,6 +47,27 @@ 19@@ -40,6 +40,8 @@
14 #include "gdesktopappinfo.h" 20 #include "gnetworkmonitor.h"
21 #ifdef G_OS_WIN32
22 #include "gregistrysettingsbackend.h"
23+#else
24+#include <dlfcn.h>
15 #endif 25 #endif
26 #include <glib/gstdio.h>
16 27
17+#include <dlfcn.h> 28@@ -1036,7 +1038,15 @@ get_gio_module_dir (void)
18+ 29 #endif
19+/* 30 g_free (install_dir);
20+ * Generate a GIO module directory based on where glib is installed 31 #else
21+ */ 32- module_dir = g_strdup (GIO_MODULE_DIR);
22+static const char * 33+ Dl_info info;
23+_get_gio_module_dir (void)
24+{
25+ Dl_info info;
26+
27+ if (dladdr (g_io_module_new, &info)) {
28+ char *libdir = g_path_get_dirname (info.dli_fname);
29+ char *dir = g_build_filename (libdir, "gio", "modules", NULL);
30+ g_free (libdir);
31+ return dir;
32+ } else {
33+ return GIO_MODULE_DIR;
34+ }
35+}
36+
37+ 34+
38 /** 35+ if (dladdr (g_io_module_new, &info)) {
39 * SECTION:giomodule 36+ char *libdir = g_path_get_dirname (info.dli_fname);
40 * @short_description: Loadable GIO Modules 37+ module_dir = g_build_filename (libdir, "gio", "modules", NULL);
41@@ -1057,7 +1078,7 @@ _g_io_modules_ensure_loaded (void) 38+ g_free (libdir);
42 /* Then load the compiled in path */ 39+ } else {
43 module_dir = g_getenv ("GIO_MODULE_DIR"); 40+ module_dir = g_strdup (GIO_MODULE_DIR);
44 if (module_dir == NULL) 41+ }
45- module_dir = GIO_MODULE_DIR; 42 #endif
46+ module_dir = _get_gio_module_dir (); 43 }
47
48 g_io_modules_scan_all_in_directory_with_scope (module_dir, scope);
49 44
45--
462.1.4
47
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.48.1.bb
index 9e9514962e..ef96ca14e4 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.46.2.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.48.1.bb
@@ -7,17 +7,14 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
7SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ 7SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
8 file://configure-libtool.patch \ 8 file://configure-libtool.patch \
9 file://fix-conflicting-rand.patch \ 9 file://fix-conflicting-rand.patch \
10 file://glib-2.0-configure-readlink.patch \
11 file://run-ptest \ 10 file://run-ptest \
12 file://ptest-paths.patch \ 11 file://ptest-paths.patch \
13 file://uclibc_musl_translation.patch \ 12 file://uclibc_musl_translation.patch \
14 file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \
15 file://allow-run-media-sdX-drive-mount-if-username-root.patch \ 13 file://allow-run-media-sdX-drive-mount-if-username-root.patch \
16 file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ 14 file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
17 file://Enable-more-tests-while-cross-compiling.patch \ 15 file://Enable-more-tests-while-cross-compiling.patch \
18 file://gi-exclude.patch \ 16 file://gi-exclude.patch \
19 file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ 17 file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \
20 file://ignore-format-nonliteral-warning.patch \
21 file://0001-Do-not-ignore-return-value-of-write.patch \ 18 file://0001-Do-not-ignore-return-value-of-write.patch \
22 file://0002-tests-Ignore-y2k-warnings.patch \ 19 file://0002-tests-Ignore-y2k-warnings.patch \
23 " 20 "
@@ -25,5 +22,5 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
25SRC_URI_append_class-native = " file://glib-gettextize-dir.patch \ 22SRC_URI_append_class-native = " file://glib-gettextize-dir.patch \
26 file://relocate-modules.patch" 23 file://relocate-modules.patch"
27 24
28SRC_URI[md5sum] = "7f815d6e46df68e070cb421ed7f1139e" 25SRC_URI[md5sum] = "67bd3b75c9f6d5587b457dc01cdcd5bb"
29SRC_URI[sha256sum] = "5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db" 26SRC_URI[sha256sum] = "74411bff489cb2a3527bac743a51018841a56a4d896cc1e0d0d54f8166a14612"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index e764fad13a..ddf5e40b9f 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -59,7 +59,8 @@ FILES_${PN}-dev += "${libdir}/glib-2.0/include \
59 ${bindir}/glib-mkenums \ 59 ${bindir}/glib-mkenums \
60 ${bindir}/glib-compile-resources \ 60 ${bindir}/glib-compile-resources \
61 ${datadir}/glib-2.0/gettext/po/Makefile.in.in \ 61 ${datadir}/glib-2.0/gettext/po/Makefile.in.in \
62 ${datadir}/glib-2.0/schemas/gschema.dtd" 62 ${datadir}/glib-2.0/schemas/gschema.dtd \
63 ${datadir}/gettext/its"
63FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb" 64FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb"
64FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py \ 65FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py \
65 ${bindir}/gdbus-codegen" 66 ${bindir}/gdbus-codegen"