Thanks, applied as bd2db52ad0366f5ba8390616a1a1ca312b7d2d12.

Michael

[sent from post-receive hook]

On Fri, 11 Oct 2024 12:24:47 +0200, Philipp Zabel <[email protected]> 
wrote:
> Signed-off-by: Philipp Zabel <[email protected]>
> Message-Id: <[email protected]>
> Signed-off-by: Michael Olbrich <[email protected]>
> 
> diff --git 
> a/patches/meson-1.5.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
>  
> b/patches/meson-1.5.2/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> similarity index 97%
> rename from 
> patches/meson-1.5.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> rename to 
> patches/meson-1.5.2/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> index 80b7f8e38a96..ab2020e23783 100644
> --- 
> a/patches/meson-1.5.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> +++ 
> b/patches/meson-1.5.2/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
> @@ -11,7 +11,7 @@ Signed-off-by: Michael Olbrich <[email protected]>
>   1 file changed, 6 insertions(+), 2 deletions(-)
>  
>  diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py
> -index c3750ccc372f..5f37eaac68ed 100644
> +index 4eec82edd177..92ef9669cfeb 100644
>  --- a/mesonbuild/linkers/linkers.py
>  +++ b/mesonbuild/linkers/linkers.py
>  @@ -674,7 +674,10 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase):
> diff --git a/patches/meson-1.5.1/0002-HACK-enable-NEON-only-for-ARMv7.patch 
> b/patches/meson-1.5.2/0002-HACK-enable-NEON-only-for-ARMv7.patch
> similarity index 100%
> rename from patches/meson-1.5.1/0002-HACK-enable-NEON-only-for-ARMv7.patch
> rename to patches/meson-1.5.2/0002-HACK-enable-NEON-only-for-ARMv7.patch
> diff --git 
> a/patches/meson-1.5.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch 
> b/patches/meson-1.5.2/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
> similarity index 100%
> rename from 
> patches/meson-1.5.1/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
> rename to 
> patches/meson-1.5.2/0003-HACK-don-t-fail-if-lrelease-is-missing.patch
> diff --git a/patches/meson-1.5.1/0004-HACK-don-t-fail-if-uic-is-missing.patch 
> b/patches/meson-1.5.2/0004-HACK-don-t-fail-if-uic-is-missing.patch
> similarity index 100%
> rename from patches/meson-1.5.1/0004-HACK-don-t-fail-if-uic-is-missing.patch
> rename to patches/meson-1.5.2/0004-HACK-don-t-fail-if-uic-is-missing.patch
> diff --git a/patches/meson-1.5.1/series b/patches/meson-1.5.2/series
> similarity index 100%
> rename from patches/meson-1.5.1/series
> rename to patches/meson-1.5.2/series
> diff --git a/rules/host-meson.make b/rules/host-meson.make
> index 1f8700443bd6..8835367be758 100644
> --- a/rules/host-meson.make
> +++ b/rules/host-meson.make
> @@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESON) += host-meson
>  #
>  # Paths and names
>  #
> -HOST_MESON_VERSION   := 1.5.1
> -HOST_MESON_MD5               := c4f2b3e5ea632685f61ba1b833c4905c
> +HOST_MESON_VERSION   := 1.5.2
> +HOST_MESON_MD5               := 682f75ef96c2e7542b0148e70068ea09
>  HOST_MESON           := meson-$(HOST_MESON_VERSION)
>  HOST_MESON_SUFFIX    := tar.gz
>  HOST_MESON_URL               := 
> https://github.com/mesonbuild/meson/releases/download/$(HOST_MESON_VERSION)/$(HOST_MESON).$(HOST_MESON_SUFFIX)

Reply via email to