Doesn't look scary. https://mesonbuild.com/Release-notes-for-1-8-0.html
* Forward patches, slight offset adjustments. Applies cleanly. Signed-off-by: Christian Melki <[email protected]> --- ...n-t-add-rpaths-for-build-directories-when-cross-co.patch | 6 +++--- .../0002-HACK-enable-NEON-only-for-ARMv7.patch | 0 .../0003-HACK-don-t-fail-if-lrelease-is-missing.patch | 0 .../0004-HACK-don-t-fail-if-uic-is-missing.patch | 0 ...CK-dependencies-trust-pkgconfig-when-looking-for-z.patch | 4 ++-- patches/{meson-1.7.0 => meson-1.8.2}/series | 0 rules/host-meson.make | 4 ++-- 7 files changed, 7 insertions(+), 7 deletions(-) rename patches/{meson-1.7.0 => meson-1.8.2}/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch (90%) rename patches/{meson-1.7.0 => meson-1.8.2}/0002-HACK-enable-NEON-only-for-ARMv7.patch (100%) rename patches/{meson-1.7.0 => meson-1.8.2}/0003-HACK-don-t-fail-if-lrelease-is-missing.patch (100%) rename patches/{meson-1.7.0 => meson-1.8.2}/0004-HACK-don-t-fail-if-uic-is-missing.patch (100%) rename patches/{meson-1.7.0 => meson-1.8.2}/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch (88%) rename patches/{meson-1.7.0 => meson-1.8.2}/series (100%) diff --git a/patches/meson-1.7.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch b/patches/meson-1.8.2/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch similarity index 90% rename from patches/meson-1.7.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch rename to patches/meson-1.8.2/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch index 1376f3feb..01b52df8e 100644 --- a/patches/meson-1.7.0/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch +++ b/patches/meson-1.8.2/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 176fb3348204..a1f1e0c2d87b 100644 +index 59f60e03a19c..37b1e41bb33e 100644 --- a/mesonbuild/linkers/linkers.py +++ b/mesonbuild/linkers/linkers.py -@@ -698,7 +698,10 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase): +@@ -717,7 +717,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 176fb3348204..a1f1e0c2d87b 100644 rpath_dirs_to_remove: T.Set[bytes] = set() for p in all_paths: rpath_dirs_to_remove.add(p.encode('utf8')) -@@ -728,7 +731,8 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase): +@@ -747,7 +750,8 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase): paths = padding else: paths = paths + ':' + padding diff --git a/patches/meson-1.7.0/0002-HACK-enable-NEON-only-for-ARMv7.patch b/patches/meson-1.8.2/0002-HACK-enable-NEON-only-for-ARMv7.patch similarity index 100% rename from patches/meson-1.7.0/0002-HACK-enable-NEON-only-for-ARMv7.patch rename to patches/meson-1.8.2/0002-HACK-enable-NEON-only-for-ARMv7.patch diff --git a/patches/meson-1.7.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch b/patches/meson-1.8.2/0003-HACK-don-t-fail-if-lrelease-is-missing.patch similarity index 100% rename from patches/meson-1.7.0/0003-HACK-don-t-fail-if-lrelease-is-missing.patch rename to patches/meson-1.8.2/0003-HACK-don-t-fail-if-lrelease-is-missing.patch diff --git a/patches/meson-1.7.0/0004-HACK-don-t-fail-if-uic-is-missing.patch b/patches/meson-1.8.2/0004-HACK-don-t-fail-if-uic-is-missing.patch similarity index 100% rename from patches/meson-1.7.0/0004-HACK-don-t-fail-if-uic-is-missing.patch rename to patches/meson-1.8.2/0004-HACK-don-t-fail-if-uic-is-missing.patch diff --git a/patches/meson-1.7.0/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch b/patches/meson-1.8.2/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch similarity index 88% rename from patches/meson-1.7.0/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch rename to patches/meson-1.8.2/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch index 87490efa8..23977eff8 100644 --- a/patches/meson-1.7.0/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch +++ b/patches/meson-1.8.2/0005-HACK-dependencies-trust-pkgconfig-when-looking-for-z.patch @@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py -index 94f51ff69b12..29e3e752882f 100644 +index 8f0f1baae323..fd9ca9be0d3f 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py -@@ -825,7 +825,7 @@ packages['gmock'] = gmock_factory = DependencyFactory( +@@ -827,7 +827,7 @@ packages['gmock'] = gmock_factory = DependencyFactory( packages['zlib'] = zlib_factory = DependencyFactory( 'zlib', diff --git a/patches/meson-1.7.0/series b/patches/meson-1.8.2/series similarity index 100% rename from patches/meson-1.7.0/series rename to patches/meson-1.8.2/series diff --git a/rules/host-meson.make b/rules/host-meson.make index ca7649b00..2c76d9695 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.7.0 -HOST_MESON_MD5 := c20f3e5ebbb007352d22f4fd6ceb925c +HOST_MESON_VERSION := 1.8.2 +HOST_MESON_MD5 := 677d8dfec2a8c25bcc4de4227403fe0a 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) -- 2.34.1
