summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-04-30 15:48:41 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:05 +0100
commite6f9ef2aa9fe4152d265977ac480d9b70f9e58a9 (patch)
tree7df53deb5c0911e1c4ef1b7e9c83ead861b09d67 /meta
parent73206c91d3f5496b31e68e869946c33540ec3bd3 (diff)
downloadpoky-e6f9ef2aa9fe4152d265977ac480d9b70f9e58a9.tar.gz
glib-2.0: update to 2.56.1
Remove upstreamed ptest-paths.patch (From OE-Core rev: 772e6c566b1ba1d27895d78db1d082b3458f41fe) 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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch17
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch30
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch13
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.56.1.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb)5
4 files changed, 17 insertions, 48 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch
index aee96aaa6e..0ebf138d60 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch
@@ -1,30 +1,30 @@
1From d6501b107940e9f548c89236d773c6d33c15a5c9 Mon Sep 17 00:00:00 2001 1From d250652782b65b071b7cc8f01f2db833df104e0e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 16 Apr 2016 13:28:59 -0700 3Date: Sat, 16 Apr 2016 13:28:59 -0700
4Subject: [PATCH 1/2] Do not ignore return value of write() 4Subject: [PATCH] Do not ignore return value of write()
5 5
6gcc warns about ignoring return value when compiling 6gcc warns about ignoring return value when compiling
7with fortify turned on. 7with fortify turned on.
8 8
9assert when write() fails 9assert when write() fails
10 10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13Upstream-Status: Submitted 11Upstream-Status: Submitted
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 13
14---
15 glib/tests/unix.c | 5 +++-- 15 glib/tests/unix.c | 5 +++--
16 1 file changed, 3 insertions(+), 2 deletions(-) 16 1 file changed, 3 insertions(+), 2 deletions(-)
17 17
18diff --git a/glib/tests/unix.c b/glib/tests/unix.c 18diff --git a/glib/tests/unix.c b/glib/tests/unix.c
19index 3543458..4e7ed85 100644 19index 9d55a6c..a07f945 100644
20--- a/glib/tests/unix.c 20--- a/glib/tests/unix.c
21+++ b/glib/tests/unix.c 21+++ b/glib/tests/unix.c
22@@ -32,14 +32,15 @@ test_pipe (void) 22@@ -32,14 +32,15 @@ test_pipe (void)
23 GError *error = NULL; 23 GError *error = NULL;
24 int pipefd[2]; 24 int pipefd[2];
25 char buf[1024]; 25 char buf[1024];
26- ssize_t bytes_read; 26- gssize bytes_read;
27+ ssize_t bytes_read, bytes_written; 27+ gssize bytes_read, bytes_written;
28 gboolean res; 28 gboolean res;
29 29
30 res = g_unix_open_pipe (pipefd, FD_CLOEXEC, &error); 30 res = g_unix_open_pipe (pipefd, FD_CLOEXEC, &error);
@@ -37,6 +37,3 @@ index 3543458..4e7ed85 100644
37 memset (buf, 0, sizeof (buf)); 37 memset (buf, 0, sizeof (buf));
38 bytes_read = read (pipefd[0], buf, sizeof(buf) - 1); 38 bytes_read = read (pipefd[0], buf, sizeof(buf) - 1);
39 g_assert_cmpint (bytes_read, >, 0); 39 g_assert_cmpint (bytes_read, >, 0);
40--
412.8.0
42
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch b/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch
deleted file mode 100644
index f3be02770c..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1Instead of writing the temporary mapping files in the mappedfile test to the
2user runtime directory, write them to $TMP. The runtime directory may not
3currently exist if the test is executed on a non-desktop system and the test
4doesn't attempt to create the directory structure.
5
6Upstream-Status: Pending
7Signed-off-by: Ross Burton <ross.burton@intel.com>
8
9diff --git a/glib/tests/mappedfile.c b/glib/tests/mappedfile.c
10index 40e0e60..27a24be 100644
11--- a/glib/tests/mappedfile.c
12+++ b/glib/tests/mappedfile.c
13@@ -81,7 +81,7 @@ test_writable (void)
14 const gchar *new = "abcdefghijklmnopqrstuvxyz";
15 gchar *tmp_copy_path;
16
17- tmp_copy_path = g_build_filename (g_get_user_runtime_dir (), "glib-test-4096-random-bytes", NULL);
18+ tmp_copy_path = g_build_filename (g_get_tmp_dir (), "glib-test-4096-random-bytes", NULL);
19
20 g_file_get_contents (g_test_get_filename (G_TEST_DIST, "4096-random-bytes", NULL), &contents, &len, &error);
21 g_assert_no_error (error);
22@@ -125,7 +125,7 @@ test_writable_fd (void)
23 int fd;
24 gchar *tmp_copy_path;
25
26- tmp_copy_path = g_build_filename (g_get_user_runtime_dir (), "glib-test-4096-random-bytes", NULL);
27+ tmp_copy_path = g_build_filename (g_get_tmp_dir (), "glib-test-4096-random-bytes", NULL);
28
29 g_file_get_contents (g_test_get_filename (G_TEST_DIST, "4096-random-bytes", NULL), &contents, &len, &error);
30 g_assert_no_error (error);
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 65d5b43f9b..0c8cbd731b 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,3 +1,8 @@
1From c8fa58dc2e9322727ba21eafbe9a69a5f68ffd35 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Fri, 11 Mar 2016 15:35:55 +0000
4Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
5
1Instead of hard-coding GIO_MODULE_PATH when glib is built, use dladdr() to 6Instead of hard-coding GIO_MODULE_PATH when glib is built, use dladdr() to
2determine where libglib.so is and use that path to calculate GIO_MODULES_DIR. 7determine where libglib.so is and use that path to calculate GIO_MODULES_DIR.
3 8
@@ -8,12 +13,13 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
8 13
9Port patch to 2.48 14Port patch to 2.48
10Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 15Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
16
11--- 17---
12 gio/giomodule.c | 12 +++++++++++- 18 gio/giomodule.c | 12 +++++++++++-
13 1 file changed, 11 insertions(+), 1 deletion(-) 19 1 file changed, 11 insertions(+), 1 deletion(-)
14 20
15diff --git a/gio/giomodule.c b/gio/giomodule.c 21diff --git a/gio/giomodule.c b/gio/giomodule.c
16index da7c167..cc0bc7c 100644 22index 1ead84c..f744aa2 100644
17--- a/gio/giomodule.c 23--- a/gio/giomodule.c
18+++ b/gio/giomodule.c 24+++ b/gio/giomodule.c
19@@ -40,6 +40,8 @@ 25@@ -40,6 +40,8 @@
@@ -25,7 +31,7 @@ index da7c167..cc0bc7c 100644
25 #endif 31 #endif
26 #include <glib/gstdio.h> 32 #include <glib/gstdio.h>
27 33
28@@ -1036,7 +1038,15 @@ get_gio_module_dir (void) 34@@ -1083,7 +1085,15 @@ get_gio_module_dir (void)
29 #endif 35 #endif
30 g_free (install_dir); 36 g_free (install_dir);
31 #else 37 #else
@@ -42,6 +48,3 @@ index da7c167..cc0bc7c 100644
42 #endif 48 #endif
43 } 49 }
44 50
45--
462.1.4
47
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.56.1.bb
index 53fa07e74c..7bc437d47f 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.56.1.bb
@@ -7,7 +7,6 @@ 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://run-ptest \ 9 file://run-ptest \
10 file://ptest-paths.patch \
11 file://uclibc_musl_translation.patch \ 10 file://uclibc_musl_translation.patch \
12 file://allow-run-media-sdX-drive-mount-if-username-root.patch \ 11 file://allow-run-media-sdX-drive-mount-if-username-root.patch \
13 file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ 12 file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
@@ -21,5 +20,5 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
21 20
22SRC_URI_append_class-native = " file://relocate-modules.patch" 21SRC_URI_append_class-native = " file://relocate-modules.patch"
23 22
24SRC_URI[md5sum] = "16e886ad677bf07b7d48eb8188bcf759" 23SRC_URI[md5sum] = "988af38524804ea1ae6bc9a2bad181ff"
25SRC_URI[sha256sum] = "963fdc6685dc3da8e5381dfb9f15ca4b5709b28be84d9d05a9bb8e446abac0a8" 24SRC_URI[sha256sum] = "40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d"