package/meson: bump to version 0.54.0
PATCH 1/1 package/meson: bump to version 0.54.0
Remove patches that are now upstream.
Signed-off-by James Hilliard <[email protected]>
--- ...onfig-add-pkg_config_libdir-property.patch | 102 ------------------ ...ction-determine-g-ir-scanner-and-g-i.patch | 62 ----------- ...es-gnome.py-Fix-giscanner-and-gicomp.patch | 41 ------- package/meson/meson.hash | 6 +- package/meson/meson.mk | 2 +- 5 files changed, 4 insertions(+), 209 deletions(-) delete mode 100644 package/meson/0003-envconfig-add-pkg_config_libdir-property.patch delete mode 100644 package/meson/0004-gobject-introspection-determine-g-ir-scanner-and-g-i.patch delete mode 100644 package/meson/0005-mesonbuild-modules-gnome.py-Fix-giscanner-and-gicomp.patch
package/meson/0003-envconfig-add-pkg_config_libdir-property.patch deleted +0 -102
@@ -1,102 +0,0 @@ -From 3af920cb4a9c272b9b75a4f3eea9da9000520949 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= <[email protected]> -Date: Tue, 14 Jan 2020 11:11:52 +0100 -Subject: [PATCH] envconfig: add pkg_config_libdir property - -In order to unify the use of sysroot in the cross-file, -the pkg_config_libdir can now be passed directly in the file. - -Upstream: 958df63dac810246e84c2b8eaa32d22d19ace0ef -[Arnout: remove documentation changes: we don't extract docs/] -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]> ---- - mesonbuild/dependencies/base.py | 6 ++++++ - mesonbuild/envconfig.py | 6 ++++++ - run_unittests.py | 30 +++++++++++++++++++++++++++++- - 3 files changed, 41 insertions(+), 1 deletion(-) - -diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index 40e304c7..282c314b 100644 ---- a/mesonbuild/dependencies/base.py -+++ b/mesonbuild/dependencies/base.py -@@ -697,6 +697,12 @@ class PkgConfigDependency(ExternalDependency): - mlog.debug('PKG_CONFIG_PATH: ' + new_pkg_config_path) - env['PKG_CONFIG_PATH'] = new_pkg_config_path - -+ pkg_config_libdir_prop = self.env.properties[self.for_machine].get_pkg_config_libdir() -+ if pkg_config_libdir_prop: -+ new_pkg_config_libdir = ':'.join([p for p in pkg_config_libdir_prop]) -+ env['PKG_CONFIG_LIBDIR'] = new_pkg_config_libdir -+ mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir) -+ - fenv = frozenset(env.items()) - targs = tuple(args) - cache = PkgConfigDependency.pkgbin_cache -diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index c8a37f4c..3e5e44b8 100644 ---- a/mesonbuild/envconfig.py -+++ b/mesonbuild/envconfig.py -@@ -143,6 +143,12 @@ class Properties(HasEnvVarFallback): - def get_sys_root(self) -> T.Optional[T.Union[str, T.List[str]]]: - return self.properties.get('sys_root', None) - -+ def get_pkg_config_libdir(self) -> T.Optional[T.List[str]]: -+ p = self.properties.get('pkg_config_libdir', None) -+ if p is None: -+ return p -+ return mesonlib.listify(p) -+ - def __eq__(self, other: T.Any) -> 'T.Union[bool, NotImplemented]': - if isinstance(other, type(self)): - return self.properties == other.properties -diff --git a/run_unittests.py b/run_unittests.py -index 676604f4..382c0964 100755 ---- a/run_unittests.py -+++ b/run_unittests.py -@@ -3629,6 +3629,34 @@ recommended as it is not supported on some platforms''') - self.wipe() - self.init(testdir, extra_args=['-Dstart_native=true'], override_envvars=env) - -+ @skipIfNoPkgconfig -+ @unittest.skipIf(is_windows(), 'Help needed with fixing this test on windows') -+ def test_pkg_config_libdir(self): -+ testdir = os.path.join(self.unit_test_dir, -+ '46 native dep pkgconfig var') -+ with tempfile.NamedTemporaryFile(mode='w', delete=False) as crossfile: -+ crossfile.write(textwrap.dedent( -+ '''[binaries] -+ pkgconfig = 'pkg-config' -+ -+ [properties] -+ pkg_config_libdir = [r'{0}'] -+ -+ [host_machine] -+ system = 'linux' -+ cpu_family = 'arm' -+ cpu = 'armv7' -+ endian = 'little' -+ '''.format(os.path.join(testdir, 'cross_pkgconfig')))) -+ crossfile.flush() -+ self.meson_cross_file = crossfile.name -+ -+ env = {'PKG_CONFIG_LIBDIR': os.path.join(testdir, -+ 'native_pkgconfig')} -+ self.init(testdir, extra_args=['-Dstart_native=false'], override_envvars=env) -+ self.wipe() -+ self.init(testdir, extra_args=['-Dstart_native=true'], override_envvars=env) -+ - def __reconfigure(self, change_minor=False): - # Set an older version to force a reconfigure from scratch - filename = os.path.join(self.privatedir, 'coredata.dat') -@@ -6863,7 +6891,7 @@ class NativeFileTests(BasePlatformTests): - - class CrossFileTests(BasePlatformTests): - -- """Tests for cross file functioality not directly related to -+ """Tests for cross file functionality not directly related to - cross compiling. - - This is mainly aimed to testing overrides from cross files. --- -2.24.1 -
package/meson/0004-gobject-introspection-determine-g-ir-scanner-and-g-i.patch deleted +0 -62
62 lines not on this page · raw message
package/meson/0005-mesonbuild-modules-gnome.py-Fix-giscanner-and-gicomp.patch deleted +0 -41
41 lines not on this page · raw message
package/meson/meson.hash +3 -3
@@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.53.2/meson-0.53.2.tar.gz.asc -sha256 3e8f830f33184397c2eb0b651ec502adb63decb28978bdc84b3558d71284c21f meson-0.53.2.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING +# https://github.com/mesonbuild/meson/releases/download/0.54.0/meson-0.54.0.tar.gz.asc +sha256 dde5726d778112acbd4a67bb3633ab2ee75d33d1e879a6283a7b4a44c3363c27 meson-0.54.0.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING
package/meson/meson.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.53.2 +MESON_VERSION = 0.54.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING
Signature · 1 line
2.20.1
Thomas Petazzoni
AppliedPATCH 1/1 package/meson: bump to version 0.54.0
Quoted 13 lines · On Sun, 29 Mar 2020 18:09:16 -0600 James Hilliard <[email protected]>…
Remove patches that are now upstream.
Signed-off-by James Hilliard <[email protected]>--- ...onfig-add-pkg_config_libdir-property.patch | 102 ------------------ ...ction-determine-g-ir-scanner-and-g-i.patch | 62 ----------- ...es-gnome.py-Fix-giscanner-and-gicomp.patch | 41 ------- package/meson/meson.hash | 6 +- package/meson/meson.mk | 2 +- 5 files changed, 4 insertions(+), 209 deletions(-) delete mode 100644 package/meson/0003-envconfig-add-pkg_config_libdir-property.patch delete mode 100644 package/meson/0004-gobject-introspection-determine-g-ir-scanner-and-g-i.patch delete mode 100644 package/meson/0005-mesonbuild-modules-gnome.py-Fix-giscanner-and-gicomp.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com