From e35975078be56f818c34c29db52e4e1061dc1de4 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 10 Dec 2018 04:09:22 -0200 Subject: [PATCH] meson: update to 0.49.0. --- .../patches/fix-pkg-config-native-not-found.patch | 15 --------------- srcpkgs/meson/template | 4 ++-- 2 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 srcpkgs/meson/patches/fix-pkg-config-native-not-found.patch diff --git a/srcpkgs/meson/patches/fix-pkg-config-native-not-found.patch b/srcpkgs/meson/patches/fix-pkg-config-native-not-found.patch deleted file mode 100644 index c364e9efa30..00000000000 --- a/srcpkgs/meson/patches/fix-pkg-config-native-not-found.patch +++ /dev/null @@ -1,15 +0,0 @@ -Source: https://github.com/mesonbuild/meson/issues/1736 -Upstream: Unknown -Reason: prevents meson from caching a variable with the value of the cross-compile pkg-config that can be later used to fetch the value of a native pkg-config, fixes problems with finding native: true dependencies. - ---- mesonbuild/dependencies/base.py -+++ mesonbuild/dependencies/base.py -@@ -448,7 +448,6 @@ class PkgConfigDependency(ExternalDependency): - potential_pkgbin = ExternalProgram.from_cross_info(environment.cross_info, 'pkgconfig') - if potential_pkgbin.found(): - self.pkgbin = potential_pkgbin -- PkgConfigDependency.class_pkgbin = self.pkgbin - else: - mlog.debug('Cross pkg-config %s not found.' % potential_pkgbin.name) - # Only search for the native pkg-config the first time and - diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template index 46eafed15fc..c7517e8f3c5 100644 --- a/srcpkgs/meson/template +++ b/srcpkgs/meson/template @@ -1,6 +1,6 @@ # Template file for 'meson' pkgname=meson -version=0.48.2 +version=0.49.0 revision=1 noarch=yes build_style=python3-module @@ -15,7 +15,7 @@ license="Apache-2.0" homepage="http://mesonbuild.com" changelog="https://raw.githubusercontent.com/mesonbuild/meson/master/docs/markdown/Release-notes-for-${version%.?}.0.md" distfiles="https://github.com/mesonbuild/meson/archive/${version}.tar.gz" -checksum=1daac2fd3d97f26a28f6f7e9addccc85a526a471dbd836613ce34130f69adcc0 +checksum=11bc959e7173e714e4a4e85dd2bd9d0149b0a51c8ba82d5f44cc63735f603c74 do_check() { # meson depends on trillion of things to perform actual tests