meson: update to 0.55.0.

This commit is contained in:
John 2020-07-13 12:34:56 +02:00
parent 49dffbb268
commit ba86d9815a
2 changed files with 14 additions and 17 deletions

View File

@ -1,14 +1,11 @@
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py --- mesonbuild/modules/gnome.py 2020-06-29 19:00:15.000000000 +0200
index bf49770..42473cb 100644 +++ - 2020-07-13 12:48:58.087313471 +0200
--- mesonbuild/modules/gnome.py @@ -403,7 +403,7 @@
+++ mesonbuild/modules/gnome.py
@@ -429,7 +429,7 @@ class GnomeModule(ExtensionModule): def _get_gir_dep(self, state):
try: if not self.gir_dep:
gir_dep = self.gir_dep or PkgConfigDependency('gobject-introspection-1.0', - kwargs = {'native': True, 'required': True}
state.environment, + kwargs = {'native': False, 'required': True}
- {'native': True}) holder = self.interpreter.func_dependency(state.current_node, ['gobject-introspection-1.0'], kwargs)
+ {'native': False}) self.gir_dep = holder.held_object
pkgargs = gir_dep.get_compile_args() giscanner = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-scanner')
except Exception:
raise MesonException('gobject-introspection dependency was not found, gir cannot be generated.')

View File

@ -1,20 +1,20 @@
# Template file for 'meson' # Template file for 'meson'
pkgname=meson pkgname=meson
version=0.54.3 version=0.55.0
revision=1 revision=1
archs=noarch archs=noarch
build_style=python3-module build_style=python3-module
hostmakedepends="python3-devel python3-setuptools" hostmakedepends="python3-devel python3-setuptools"
depends="ninja python3-setuptools" depends="ninja python3-setuptools"
checkdepends="glib-devel gobject-introspection libsanitizer-devel ninja 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" short_desc="Super fast build system"
maintainer="John <me@johnnynator.dev>" maintainer="John <me@johnnynator.dev>"
license="Apache-2.0" license="Apache-2.0"
homepage="https://mesonbuild.com" homepage="https://mesonbuild.com"
changelog="https://github.com/mesonbuild/$pkgname/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md" 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" distfiles="https://github.com/mesonbuild/$pkgname/releases/download/$version/$pkgname-$version.tar.gz"
checksum=f2bdf4cf0694e696b48261cdd14380fb1d0fe33d24744d8b2df0c12f33ebb662 checksum=0a1ae2bfe2ae14ac47593537f93290fb79e9b775c55b4c53c282bc3ca3745b35
do_check() { do_check() {
# meson depends on trillion of things to perform actual tests # meson depends on trillion of things to perform actual tests