From ba86d9815a0692c44ebd067f9c7a0a07f4cc7e16 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 13 Jul 2020 12:34:56 +0200 Subject: [PATCH] meson: update to 0.55.0. --- .../dont-use-native-pkgconfig-for-gir.patch | 25 ++++++++----------- srcpkgs/meson/template | 6 ++--- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch index 42a8a9c6ca..27253a71bc 100644 --- a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch +++ b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch @@ -1,14 +1,11 @@ -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index bf49770..42473cb 100644 ---- mesonbuild/modules/gnome.py -+++ mesonbuild/modules/gnome.py -@@ -429,7 +429,7 @@ class GnomeModule(ExtensionModule): - try: - gir_dep = self.gir_dep or PkgConfigDependency('gobject-introspection-1.0', - state.environment, -- {'native': True}) -+ {'native': False}) - pkgargs = gir_dep.get_compile_args() - except Exception: - raise MesonException('gobject-introspection dependency was not found, gir cannot be generated.') - +--- mesonbuild/modules/gnome.py 2020-06-29 19:00:15.000000000 +0200 ++++ - 2020-07-13 12:48:58.087313471 +0200 +@@ -403,7 +403,7 @@ + + def _get_gir_dep(self, state): + if not self.gir_dep: +- kwargs = {'native': True, 'required': True} ++ kwargs = {'native': False, 'required': True} + holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs) + self.gir_dep = holder.held_object + giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner') diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template index 0e42cfa861..8f02d6ba33 100644 --- a/srcpkgs/meson/template +++ b/srcpkgs/meson/template @@ -1,20 +1,20 @@ # Template file for 'meson' pkgname=meson -version=0.54.3 +version=0.55.0 revision=1 archs=noarch build_style=python3-module hostmakedepends="python3-devel python3-setuptools" depends="ninja python3-setuptools" checkdepends="glib-devel gobject-introspection libsanitizer-devel ninja - pkg-config vala python-devel" + gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python-devel" short_desc="Super fast build system" maintainer="John " license="Apache-2.0" homepage="https://mesonbuild.com" changelog="https://github.com/mesonbuild/$pkgname/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md" distfiles="https://github.com/mesonbuild/$pkgname/releases/download/$version/$pkgname-$version.tar.gz" -checksum=f2bdf4cf0694e696b48261cdd14380fb1d0fe33d24744d8b2df0c12f33ebb662 +checksum=0a1ae2bfe2ae14ac47593537f93290fb79e9b775c55b4c53c282bc3ca3745b35 do_check() { # meson depends on trillion of things to perform actual tests