[jhbuild/wip/lantw/core-deps-latest-Update-meson-to-0.53.0: 4/4] core-deps-latest: Update meson to 0.53.0

[Ting-Wei Lan <lantw src gnome org>]

commit 4270389cdd2fcdb49a9bfa5fdd91e83e8bba1389
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Tue Jan 14 21:27:49 2020 +0800

    core-deps-latest: Update meson to 0.53.0
    
    Meson 0.53 is now able to use PKG_CONFIG_PATH to sort library paths.
    Therefore, the local patch included in JHBuild can be dropped.
    
    https://github.com/mesonbuild/meson/issues/4271
    https://github.com/mesonbuild/meson/pull/4325
    
    Meson 0.53 changes the installation path of .pc files from lib/pkgconfig
    to libdata/pkgconfig on FreeBSD without providing any way to override
    the behavior. While it can be an improvement of usability on FreeBSD
    because FreeBSD configures its pkgconf to use libdata/pkgconfig instead
    of the upstream default lib/pkgconfig and share/pkgconfig, it can also
    be a problem for JHBuild. JHBuild does not change the directory layout
    depending on the platform, and doing so can confuse the user and make
    the environment messy. Therefore, revert the change until there is a
    better way to choose the default installation path.
    
    https://github.com/mesonbuild/meson/pull/4410
    https://github.com/mesonbuild/meson/pull/6343

 modulesets/gnome-suites-core-deps-latest.modules   |   6 +-
 ...revert-change-pkgconfig-directory-freebsd.patch |  37 +++++
 .../meson-sort-libpaths-with-pkg-config-path.patch | 155 ---------------------
 3 files changed, 40 insertions(+), 158 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-latest.modules 
b/modulesets/gnome-suites-core-deps-latest.modules
index 96d8d799..40dd7d44 100644
--- a/modulesets/gnome-suites-core-deps-latest.modules
+++ b/modulesets/gnome-suites-core-deps-latest.modules
@@ -1737,12 +1737,12 @@
 
   <distutils id="meson" python3="1">
     <branch repo="github-tar"
-            version="0.52.1"
+            version="0.53.0"
             module="mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz"
             checkoutdir="meson-${version}"
-            hash="sha256:0c277472e49950a5537e3de3e60c57b80dbf425788470a1a8ed27446128fc035">
+            hash="sha256:035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6">
       <patch file="meson-dont-use-rpath-on-pkg-config-deps.patch" strip="1"/>
-      <patch file="meson-sort-libpaths-with-pkg-config-path.patch" strip="1"/>
+      <patch file="meson-revert-change-pkgconfig-directory-freebsd.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="ninja"/>
diff --git a/patches/meson-revert-change-pkgconfig-directory-freebsd.patch 
b/patches/meson-revert-change-pkgconfig-directory-freebsd.patch
new file mode 100644
index 00000000..8869635d
--- /dev/null
+++ b/patches/meson-revert-change-pkgconfig-directory-freebsd.patch
@@ -0,0 +1,37 @@
+From 08e37a624c7d938a0401b216c22542ee6b59dffb Mon Sep 17 00:00:00 2001
+From: Ting-Wei Lan <lantw src gnome org>
+Date: Tue, 14 Jan 2020 21:05:08 +0800
+Subject: [PATCH] Revert "Change default pkgconfig directory on FreeBSD"
+
+This reverts commit aba8792b6657e3aa380586764a8b3ec567895a28.
+
+The commit aba8792b6657e3aa380586764a8b3ec567895a28 changes the
+installation path of pkg-config files from lib/pkgconfig to
+libdata/pkgconfig on FreeBSD. Since JHBuild does not change the
+directory layout depending on the platform, revert it for now to keep
+the current PKG_CONFIG_PATH working.
+
+Works around https://github.com/mesonbuild/meson/pull/4410.
+---
+ mesonbuild/modules/pkgconfig.py | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
+index a37dd4f6..cf86785a 100644
+--- a/mesonbuild/modules/pkgconfig.py
++++ b/mesonbuild/modules/pkgconfig.py
+@@ -437,10 +437,7 @@ class PkgConfigModule(ExtensionModule):
+         pcfile = filebase + '.pc'
+         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')
+-            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')
+         if not isinstance(pkgroot, str):
+             raise mesonlib.MesonException('Install_dir must be a string.')
+         self.generate_pkgconfig_file(state, deps, subdirs, name, description, url,
+-- 
+2.24.1
+