[jhbuild] core-deps-latest: Update meson to 0.57.1



commit 46730bb0cfdcc10fc18b8807726c9071067858d1
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Sun Feb 21 12:14:05 2021 +0100

    core-deps-latest: Update meson to 0.57.1

 modulesets/gnome-suites-core-deps-latest.modules              | 4 ++--
 patches/meson-revert-change-pkgconfig-directory-freebsd.patch | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-latest.modules 
b/modulesets/gnome-suites-core-deps-latest.modules
index 916e5da2..c3e57b2c 100644
--- a/modulesets/gnome-suites-core-deps-latest.modules
+++ b/modulesets/gnome-suites-core-deps-latest.modules
@@ -1795,10 +1795,10 @@
 
   <distutils id="meson" python3="1">
     <branch repo="github-tar"
-            version="0.56.2"
+            version="0.57.1"
             module="mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz"
             checkoutdir="meson-${version}"
-            hash="sha256:3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4">
+            hash="sha256:72e1c782ba9bda204f4a1ed57f98d027d7b6eb9414c723eebbd6ec7f1955c8a6">
       <patch file="meson-dont-use-rpath-on-pkg-config-deps.patch" strip="1"/>
       <patch file="meson-revert-change-pkgconfig-directory-freebsd.patch" strip="1"/>
     </branch>
diff --git a/patches/meson-revert-change-pkgconfig-directory-freebsd.patch 
b/patches/meson-revert-change-pkgconfig-directory-freebsd.patch
index 8869635d..bd7a86f6 100644
--- a/patches/meson-revert-change-pkgconfig-directory-freebsd.patch
+++ b/patches/meson-revert-change-pkgconfig-directory-freebsd.patch
@@ -25,10 +25,10 @@ index a37dd4f6..cf86785a 100644
          pkgroot = kwargs.get('install_dir', default_install_dir)
          if pkgroot is None:
 -            if mesonlib.is_freebsd():
--                pkgroot = os.path.join(state.environment.coredata.get_builtin_option('prefix'), 'libdata', 
'pkgconfig')
+-                pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('prefix')), 
'libdata', 'pkgconfig')
 -            else:
--                pkgroot = os.path.join(state.environment.coredata.get_builtin_option('libdir'), 'pkgconfig')
-+            pkgroot = os.path.join(state.environment.coredata.get_builtin_option('libdir'), 'pkgconfig')
+-                pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('libdir')), 
'pkgconfig')
++            pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('libdir')), 
'pkgconfig')
          if not isinstance(pkgroot, str):
              raise mesonlib.MesonException('Install_dir must be a string.')
          self.generate_pkgconfig_file(state, deps, subdirs, name, description, url,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]