From: "Burton, Ross" <ross.burton@intel.com>
To: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Cc: OE-core <openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH 07/22] glib-2.0: update to 2.56.0
Date: Fri, 20 Apr 2018 14:05:25 +0100 [thread overview]
Message-ID: <CAJTo0LZNhoSzuVypcWe68YCiSLXCUrrN36wcaQjAyGwVCV5OJA@mail.gmail.com> (raw)
In-Reply-To: <20180404111321.10824-7-alexander.kanavin@linux.intel.com>
This breaks when building for mingw, but 2.56.1 has the fixes so should work.
Ross
On 4 April 2018 at 12:13, Alexander Kanavin
<alexander.kanavin@linux.intel.com> wrote:
> Remove upstreamed ptest-paths.patch
>
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
> .../0001-Do-not-ignore-return-value-of-write.patch | 17 +++++-------
> .../glib-2.0/glib-2.0/ptest-paths.patch | 30 ----------------------
> .../glib-2.0/glib-2.0/relocate-modules.patch | 13 ++++++----
> .../{glib-2.0_2.54.3.bb => glib-2.0_2.56.0.bb} | 5 ++--
> 4 files changed, 17 insertions(+), 48 deletions(-)
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch
> rename meta/recipes-core/glib-2.0/{glib-2.0_2.54.3.bb => glib-2.0_2.56.0.bb} (82%)
>
> 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 aee96aaa6e7..0ebf138d60a 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 @@
> -From d6501b107940e9f548c89236d773c6d33c15a5c9 Mon Sep 17 00:00:00 2001
> +From d250652782b65b071b7cc8f01f2db833df104e0e Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> Date: Sat, 16 Apr 2016 13:28:59 -0700
> -Subject: [PATCH 1/2] Do not ignore return value of write()
> +Subject: [PATCH] Do not ignore return value of write()
>
> gcc warns about ignoring return value when compiling
> with fortify turned on.
>
> assert when write() fails
>
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> Upstream-Status: Submitted
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
>
> +---
> glib/tests/unix.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/glib/tests/unix.c b/glib/tests/unix.c
> -index 3543458..4e7ed85 100644
> +index 9d55a6c..a07f945 100644
> --- a/glib/tests/unix.c
> +++ b/glib/tests/unix.c
> @@ -32,14 +32,15 @@ test_pipe (void)
> GError *error = NULL;
> int pipefd[2];
> char buf[1024];
> -- ssize_t bytes_read;
> -+ ssize_t bytes_read, bytes_written;
> +- gssize bytes_read;
> ++ gssize bytes_read, bytes_written;
> gboolean res;
>
> res = g_unix_open_pipe (pipefd, FD_CLOEXEC, &error);
> @@ -37,6 +37,3 @@ index 3543458..4e7ed85 100644
> memset (buf, 0, sizeof (buf));
> bytes_read = read (pipefd[0], buf, sizeof(buf) - 1);
> g_assert_cmpint (bytes_read, >, 0);
> ---
> -2.8.0
> -
> 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 f3be02770cb..00000000000
> --- a/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -Instead of writing the temporary mapping files in the mappedfile test to the
> -user runtime directory, write them to $TMP. The runtime directory may not
> -currently exist if the test is executed on a non-desktop system and the test
> -doesn't attempt to create the directory structure.
> -
> -Upstream-Status: Pending
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> -
> -diff --git a/glib/tests/mappedfile.c b/glib/tests/mappedfile.c
> -index 40e0e60..27a24be 100644
> ---- a/glib/tests/mappedfile.c
> -+++ b/glib/tests/mappedfile.c
> -@@ -81,7 +81,7 @@ test_writable (void)
> - const gchar *new = "abcdefghijklmnopqrstuvxyz";
> - gchar *tmp_copy_path;
> -
> -- tmp_copy_path = g_build_filename (g_get_user_runtime_dir (), "glib-test-4096-random-bytes", NULL);
> -+ tmp_copy_path = g_build_filename (g_get_tmp_dir (), "glib-test-4096-random-bytes", NULL);
> -
> - g_file_get_contents (g_test_get_filename (G_TEST_DIST, "4096-random-bytes", NULL), &contents, &len, &error);
> - g_assert_no_error (error);
> -@@ -125,7 +125,7 @@ test_writable_fd (void)
> - int fd;
> - gchar *tmp_copy_path;
> -
> -- tmp_copy_path = g_build_filename (g_get_user_runtime_dir (), "glib-test-4096-random-bytes", NULL);
> -+ tmp_copy_path = g_build_filename (g_get_tmp_dir (), "glib-test-4096-random-bytes", NULL);
> -
> - g_file_get_contents (g_test_get_filename (G_TEST_DIST, "4096-random-bytes", NULL), &contents, &len, &error);
> - 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 65d5b43f9b6..d3d63b2cd15 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 @@
> +From 3edc9a063ceaf27129e0dd96a8be3942e3dd5e96 Mon Sep 17 00:00:00 2001
> +From: Ross Burton <ross.burton@intel.com>
> +Date: Fri, 11 Mar 2016 15:35:55 +0000
> +Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
> +
> Instead of hard-coding GIO_MODULE_PATH when glib is built, use dladdr() to
> determine where libglib.so is and use that path to calculate GIO_MODULES_DIR.
>
> @@ -8,12 +13,13 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
>
> Port patch to 2.48
> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> +
> ---
> gio/giomodule.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/gio/giomodule.c b/gio/giomodule.c
> -index da7c167..cc0bc7c 100644
> +index 6937932..66852e6 100644
> --- a/gio/giomodule.c
> +++ b/gio/giomodule.c
> @@ -40,6 +40,8 @@
> @@ -25,7 +31,7 @@ index da7c167..cc0bc7c 100644
> #endif
> #include <glib/gstdio.h>
>
> -@@ -1036,7 +1038,15 @@ get_gio_module_dir (void)
> +@@ -1050,7 +1052,15 @@ get_gio_module_dir (void)
> #endif
> g_free (install_dir);
> #else
> @@ -42,6 +48,3 @@ index da7c167..cc0bc7c 100644
> #endif
> }
>
> ---
> -2.1.4
> -
> 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.0.bb
> similarity index 82%
> rename from meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb
> rename to meta/recipes-core/glib-2.0/glib-2.0_2.56.0.bb
> index faf594569d6..81d207c5963 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.0.bb
> @@ -7,7 +7,6 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
> SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
> file://configure-libtool.patch \
> file://run-ptest \
> - file://ptest-paths.patch \
> file://uclibc_musl_translation.patch \
> file://allow-run-media-sdX-drive-mount-if-username-root.patch \
> file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \
> @@ -20,5 +19,5 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
>
> SRC_URI_append_class-native = " file://relocate-modules.patch"
>
> -SRC_URI[md5sum] = "16e886ad677bf07b7d48eb8188bcf759"
> -SRC_URI[sha256sum] = "963fdc6685dc3da8e5381dfb9f15ca4b5709b28be84d9d05a9bb8e446abac0a8"
> +SRC_URI[md5sum] = "f2b59392f2fb514bbe7791dda0c36da5"
> +SRC_URI[sha256sum] = "ecef6e17e97b8d9150d0e8a4b3edee1ac37331213b8a2a87a083deea408a0fc7"
> --
> 2.16.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
next prev parent reply other threads:[~2018-04-20 13:05 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-04 11:13 [PATCH 01/22] lighttpd: upgrade 1.4.48 -> 1.4.49 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 02/22] gcr: upgrade 3.20.0 -> 3.28.0 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 03/22] sysprof: add RECIPE_NO_UPDATE_REASON Alexander Kanavin
2018-04-04 11:13 ` [PATCH 04/22] vala: update to 0.40.2 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 05/22] gobject-introspection: do not hardcode the current version in the tarball path Alexander Kanavin
2018-04-04 11:13 ` [PATCH 06/22] gobject-introspection: update to 1.56.0 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 07/22] glib-2.0: update to 2.56.0 Alexander Kanavin
2018-04-20 13:05 ` Burton, Ross [this message]
2018-04-04 11:13 ` [PATCH 08/22] bash-completion: update to 2.8 Alexander Kanavin
2018-04-05 0:18 ` Khem Raj
2018-04-05 9:27 ` Alexander Kanavin
2018-04-05 16:53 ` Khem Raj
2018-04-04 11:13 ` [PATCH 09/22] webkitgtk: update to 2.20.0 Alexander Kanavin
2018-04-30 0:43 ` Khem Raj
2018-04-30 13:07 ` Alexander Kanavin
2018-04-30 15:39 ` Khem Raj
2018-05-04 11:55 ` Alexander Kanavin
2018-04-04 11:13 ` [PATCH 10/22] gsettings-desktop-schemas: update to 3.28.0 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 11/22] gnome-desktop3: " Alexander Kanavin
2018-04-04 11:13 ` [PATCH 12/22] epiphany: update to 3.28.0.1 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 13/22] gtk-doc: update to 1.28 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 14/22] icu: update to 61.1 Alexander Kanavin
2018-04-05 0:20 ` Khem Raj
2018-04-05 9:32 ` Alexander Kanavin
2018-04-05 16:51 ` Khem Raj
2018-04-04 11:13 ` [PATCH 15/22] babeltrace: update to 1.5.5 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 16/22] libaio: update to 0.3.111 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 17/22] meson: update to 0.45.1 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 18/22] btrfs-tools: update to 4.15.1 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 19/22] libidn: update to 1.34 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 20/22] procps: update to 3.3.13 Alexander Kanavin
2018-04-05 16:43 ` Richard Purdie
2018-04-06 8:24 ` Alexander Kanavin
2018-04-04 11:13 ` [PATCH 21/22] libsecret: update to 0.18.6 Alexander Kanavin
2018-04-04 11:13 ` [PATCH 22/22] oeqa/runtime/cases/python: use python 3 rather than python 2 Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAJTo0LZNhoSzuVypcWe68YCiSLXCUrrN36wcaQjAyGwVCV5OJA@mail.gmail.com \
--to=ross.burton@intel.com \
--cc=alexander.kanavin@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.