Thanks, applied as 441975d8e06dff234fd3337bea4a30aa72d5b220. Michael
[sent from post-receive hook] On Mon, 10 Jun 2024 21:41:24 +0200, Philipp Zabel <[email protected]> wrote: > https://mesonbuild.com/Release-notes-for-1-4-0.html > > Signed-off-by: Philipp Zabel <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/meson-1.3.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > > b/patches/meson-1.4.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > similarity index 90% > rename from > patches/meson-1.3.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > rename to > patches/meson-1.4.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > index 6a4772ac571e..2f8fb33ec671 100644 > --- > a/patches/meson-1.3.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > +++ > b/patches/meson-1.4.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch > @@ -11,10 +11,10 @@ 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 dbb5e57aa585..3d321cc24413 100644 > +index 2048268193a5..49d6ee2f2d81 100644 > --- a/mesonbuild/linkers/linkers.py > +++ b/mesonbuild/linkers/linkers.py > -@@ -684,7 +684,10 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase): > +@@ -671,7 +671,10 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase): > # Need to deduplicate rpaths, as macOS's install_name_tool > # is *very* allergic to duplicate -delete_rpath arguments > # when calling depfixer on installation. > @@ -26,7 +26,7 @@ index dbb5e57aa585..3d321cc24413 100644 > rpath_dirs_to_remove: T.Set[bytes] = set() > for p in all_paths: > rpath_dirs_to_remove.add(p.encode('utf8')) > -@@ -712,7 +715,8 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase): > +@@ -699,7 +702,8 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase): > paths = padding > else: > paths = paths + ':' + padding > diff --git a/patches/meson-1.3.0/0002-HACK-enable-NEON-only-for-ARMv7.patch > b/patches/meson-1.4.0/0002-HACK-enable-NEON-only-for-ARMv7.patch > similarity index 90% > rename from patches/meson-1.3.0/0002-HACK-enable-NEON-only-for-ARMv7.patch > rename to patches/meson-1.4.0/0002-HACK-enable-NEON-only-for-ARMv7.patch > index 7be876034262..e22d33249acc 100644 > --- a/patches/meson-1.3.0/0002-HACK-enable-NEON-only-for-ARMv7.patch > +++ b/patches/meson-1.4.0/0002-HACK-enable-NEON-only-for-ARMv7.patch > @@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <[email protected]> > 1 file changed, 3 insertions(+) > > diff --git a/mesonbuild/modules/simd.py b/mesonbuild/modules/simd.py > -index b8baf39ef34a..2ce09b20d2f9 100644 > +index bfdc0c2dfc2d..5b9de7a3fd96 100644 > --- a/mesonbuild/modules/simd.py > +++ b/mesonbuild/modules/simd.py > -@@ -94,6 +94,9 @@ class SimdModule(ExtensionModule): > +@@ -84,6 +84,9 @@ class SimdModule(ExtensionModule): > continue > > compile_args = compiler.get_instruction_set_args(iset) > diff --git > a/patches/meson-1.3.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch > b/patches/meson-1.4.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch > similarity index 90% > rename from > patches/meson-1.3.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch > rename to > patches/meson-1.4.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch > index 28e6b90846c7..c6654d3e5c65 100644 > --- a/patches/meson-1.3.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch > +++ b/patches/meson-1.4.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch > @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <[email protected]> > 1 file changed, 3 insertions(+) > > diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py > -index 83dcf31bdfb3..b3242ceaf167 100644 > +index 7effa1f58401..c16d8c603ce7 100644 > --- a/mesonbuild/modules/qt.py > +++ b/mesonbuild/modules/qt.py > -@@ -278,6 +278,9 @@ class QtBaseModule(ExtensionModule): > +@@ -271,6 +271,9 @@ class QtBaseModule(ExtensionModule): > self._detect_tools(state, method, required=False) > for tool in self.tools.values(): > if not tool.found(): > diff --git a/patches/meson-1.3.0/0004-HACK-don-t-fail-if-uic-is-missing.patch > b/patches/meson-1.4.0/0004-HACK-don-t-fail-if-uic-is-missing.patch > similarity index 90% > rename from patches/meson-1.3.0/0004-HACK-don-t-fail-if-uic-is-missing.patch > rename to patches/meson-1.4.0/0004-HACK-don-t-fail-if-uic-is-missing.patch > index c404d3149d4c..008f602a061e 100644 > --- a/patches/meson-1.3.0/0004-HACK-don-t-fail-if-uic-is-missing.patch > +++ b/patches/meson-1.4.0/0004-HACK-don-t-fail-if-uic-is-missing.patch > @@ -14,10 +14,10 @@ Signed-off-by: Michael Tretter <[email protected]> > 1 file changed, 3 insertions(+) > > diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py > -index b3242ceaf167..26b5dbc9fc0d 100644 > +index c16d8c603ce7..20ca4810edc5 100644 > --- a/mesonbuild/modules/qt.py > +++ b/mesonbuild/modules/qt.py > -@@ -281,6 +281,9 @@ class QtBaseModule(ExtensionModule): > +@@ -274,6 +274,9 @@ class QtBaseModule(ExtensionModule): > if tool.name == 'lrelease': > mlog.warning('Ignoring missing lrelease') > continue > diff --git a/patches/meson-1.3.0/series b/patches/meson-1.4.0/series > similarity index 100% > rename from patches/meson-1.3.0/series > rename to patches/meson-1.4.0/series > diff --git a/rules/host-meson.make b/rules/host-meson.make > index aec7a539f03b..d03a350cb3c3 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.3.0 > -HOST_MESON_MD5 := 35dc15e4f94ca5fd30dbe2d88a672254 > +HOST_MESON_VERSION := 1.4.0 > +HOST_MESON_MD5 := a5cddd4299ead830106242c53ea7f10f > 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)
