From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Christian Melki <christian.melki@t2data.com>
Subject: Re: [ptxdist] [APPLIED] glib: Version bump. 2.74.3 -> 2.74.4.
Date: Wed, 8 Feb 2023 12:49:25 +0100 [thread overview]
Message-ID: <20230208114925.2007682-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20230110131246.3400750-1-christian.melki@t2data.com>
Thanks, applied as 30a67b37f04322093324f85d06adf88429d1143f.
Michael
[sent from post-receive hook]
On Wed, 08 Feb 2023 12:49:25 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Minor version bump. Bugs and security fixes.
> https://gitlab.gnome.org/GNOME/glib/-/releases/2.74.4
>
> * Add patchset. Unfortunately, glib-2.74.4 managed
> to break bulding in some situations by missing to include errno.h.
> This will be removed in the next stable release, be it a minor
> or a major one.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20230110131246.3400750-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/glib-2.74.4/0001-gthread-posix-need-to-include-errno.h.patch b/patches/glib-2.74.4/0001-gthread-posix-need-to-include-errno.h.patch
> new file mode 100644
> index 000000000000..916d54903b58
> --- /dev/null
> +++ b/patches/glib-2.74.4/0001-gthread-posix-need-to-include-errno.h.patch
> @@ -0,0 +1,24 @@
> +From: Michael Catanzaro <mcatanzaro@redhat.com>
> +Date: Tue, 20 Dec 2022 17:10:41 -0600
> +Subject: [PATCH] gthread-posix: need to #include <errno.h>
> +
> +a79c6af23eff5ee978db62e048828c9a992a1261 uses errno without the required
> +header.
> +
> +(cherry picked from commit 03cb4261e00cf505790f4fd4e69f97b2ef4fcccd)
> +---
> + glib/gthreadprivate.h | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/glib/gthreadprivate.h b/glib/gthreadprivate.h
> +index 6eaf422753ba..f34368a7c20a 100644
> +--- a/glib/gthreadprivate.h
> ++++ b/glib/gthreadprivate.h
> +@@ -41,6 +41,7 @@ struct _GRealThread
> + /* system thread implementation (gthread-posix.c, gthread-win32.c) */
> +
> + #if defined(HAVE_FUTEX) || defined(HAVE_FUTEX_TIME64)
> ++#include <errno.h>
> + #include <linux/futex.h>
> + #include <sys/syscall.h>
> + #include <unistd.h>
> diff --git a/patches/glib-2.74.4/series b/patches/glib-2.74.4/series
> new file mode 100644
> index 000000000000..73c35dbc7c92
> --- /dev/null
> +++ b/patches/glib-2.74.4/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-gthread-posix-need-to-include-errno.h.patch
> +# 2cab62acd9f100167b4b7a5c5967b1a7 - git-ptx-patches magic
> diff --git a/rules/glib.make b/rules/glib.make
> index 6ccf03735490..e6bd151f9b00 100644
> --- a/rules/glib.make
> +++ b/rules/glib.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GLIB) += glib
> #
> # Paths and names
> #
> -GLIB_VERSION := 2.74.3
> -GLIB_MD5 := fb204b89b0004110911dede3441597a1
> +GLIB_VERSION := 2.74.4
> +GLIB_MD5 := a854964bbf295dcfa98afd210d7fbc39
> GLIB := glib-$(GLIB_VERSION)
> GLIB_SUFFIX := tar.xz
> GLIB_URL := $(call ptx/mirror, GNOME, glib/$(basename $(GLIB_VERSION))/$(GLIB).$(GLIB_SUFFIX))
prev parent reply other threads:[~2023-02-08 11:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-10 13:12 [ptxdist] [PATCH] " Christian Melki
2023-02-08 11:49 ` Michael Olbrich [this message]
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=20230208114925.2007682-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=christian.melki@t2data.com \
--cc=ptxdist@pengutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox