Thanks, applied as 1f10cc770b5f4987ff0f27926ccfba25c2cc6865.

Michael

[sent from post-receive hook]

On Fri, 10 Feb 2023 15:17:14 +0100, Christian Melki 
<christian.me...@t2data.com> wrote:
> Minor bugfix release.
> https://gitlab.gnome.org/GNOME/glib/-/releases/2.74.5
> 
> * Remove patches, as it is now fixed in the release.
> 
> Signed-off-by: Christian Melki <christian.me...@t2data.com>
> Message-Id: <20230205171744.3128715-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbr...@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
> deleted file mode 100644
> index 916d54903b58..000000000000
> --- a/patches/glib-2.74.4/0001-gthread-posix-need-to-include-errno.h.patch
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -From: Michael Catanzaro <mcatanz...@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
> deleted file mode 100644
> index 73c35dbc7c92..000000000000
> --- a/patches/glib-2.74.4/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# 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 9226cc7fafe0..1a368268ded9 100644
> --- a/rules/glib.make
> +++ b/rules/glib.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GLIB) += glib
>  #
>  # Paths and names
>  #
> -GLIB_VERSION := 2.74.4
> -GLIB_MD5     := a854964bbf295dcfa98afd210d7fbc39
> +GLIB_VERSION := 2.74.5
> +GLIB_MD5     := 7561501d9f63f3418ddb23d2903cc968
>  GLIB         := glib-$(GLIB_VERSION)
>  GLIB_SUFFIX  := tar.xz
>  GLIB_URL     := $(call ptx/mirror, GNOME, glib/$(basename 
> $(GLIB_VERSION))/$(GLIB).$(GLIB_SUFFIX))

Reply via email to