meson: bump version.

* remove upstreamed patch.
This commit is contained in:
Jerome Duval
2017-10-13 19:06:49 +02:00
parent 1f06446ab6
commit be88e1d689
2 changed files with 1 additions and 38 deletions

View File

@@ -6,8 +6,7 @@ COPYRIGHT="2013-2017 The Meson development team"
LICENSE="Apache v2"
REVISION="1"
SOURCE_URI="https://github.com/mesonbuild/meson/releases/download/$portVersion/meson-$portVersion.tar.gz"
CHECKSUM_SHA256="30bdded6fefc48211d30818d96dd34aae56ee86ce9710476f501bd7695469c4b"
PATCHES="meson-$portVersion.patchset"
CHECKSUM_SHA256="c513eca90e0d70bf14cd1eaafea2fa91cf40a73326a7ff61f08a005048057340"
PYTHON_VERSION="3.6"
ARCHITECTURES="any"

View File

@@ -1,36 +0,0 @@
From 88b4446f1a7b13dd3c40924b1e172e56e18f8f51 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 16 Apr 2017 13:57:03 +0200
Subject: Haiku patch
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py
index 0263768..f67ae52 100644
--- a/mesonbuild/mesonlib.py
+++ b/mesonbuild/mesonlib.py
@@ -218,6 +218,9 @@ def is_osx():
def is_linux():
return platform.system().lower() == 'linux'
+def is_haiku():
+ return platform.system().lower() == 'haiku'
+
def is_windows():
platname = platform.system().lower()
return platname == 'windows' or 'mingw' in platname
diff --git a/run_tests.py b/run_tests.py
index d0a67e8..5d0f77e 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -125,7 +125,7 @@ if __name__ == '__main__':
backend = Backend.xcode
break
# Running on a developer machine? Be nice!
- if not mesonlib.is_windows() and 'TRAVIS' not in os.environ:
+ if not mesonlib.is_windows() and not mesonlib.is_haiku() and 'TRAVIS' not in os.environ:
os.nice(20)
# Appveyor sets the `platform` environment variable which completely messes
# up building with the vs2010 and vs2015 backends.
--
2.12.2