SHA256
3
0
forked from pool/meson

Accepting request 447003 from devel:tools:building

OBS-URL: https://build.opensuse.org/request/show/447003
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/meson?expand=0&rev=13
This commit is contained in:
Ludwig Nussel 2016-12-29 21:44:21 +00:00 committed by Git OBS Bridge
commit 0cd270c4fb
7 changed files with 47 additions and 48 deletions

View File

@ -1,25 +0,0 @@
--- "a/test cases/common/51 pkgconfig-gen/meson.build"
+++ "b/test cases/common/51 pkgconfig-gen/meson.build"
@@ -19,11 +19,17 @@ pkgg.generate(
)
pkgconfig = find_program('pkg-config', required: false)
-if pkgconfig.found() and build_machine.system() != 'windows'
- test('pkgconfig-validation', pkgconfig,
- args: ['--validate', 'simple'],
- env: ['PKG_CONFIG_PATH=' + meson.current_build_dir() + '/meson-private' ],
- )
+if pkgconfig.found()
+ v = run_command(pkgconfig, '--version').stdout().strip()
+ if v.version_compare('>=0.29')
+ test('pkgconfig-validation', pkgconfig,
+ args: ['--validate', 'simple'],
+ env: ['PKG_CONFIG_PATH=' + meson.current_build_dir() + '/meson-private' ])
+ else
+ message('pkg-config version \'' + v + '\' too old, skipping validate test')
+ endif
+else
+ message('pkg-config not found, skipping validate test')
endif
# Test that name_prefix='' and name='libfoo' results in '-lfoo'

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dc087ec40dacb5e256e6ee6467f2d004faf4ef284d3c1ce5e89faa1e16540950
size 458992

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAlgqBdsACgkQO/RpO/7r
lChzmw/+NVV/qdpP+Xy9+xgf0COwgXxD+u7HQDeuJ26N3I8pV+bloK3lft5W17D3
fiYmrO64Wed64/FERiwt0fiyldXyUNcmtfAiWZHGAAe0S4SDsuQW8MQkwE7eMqRg
k/uwjJ1EvQOwIDJL5vD4xBhusHL1KRxT2KN5rzu7ZdnbgLxJZLonVdzW/ER53532
F/UOnr1/AGnFVokNHsMhhq6Ex8v0xvNXWGA09jkDiNltVIcaF0EcMNmyIrRp7Uvb
L1McVF9wePl0F84Eq5OYVGmWFnxUqW1ERZrkAViMDYu7Yp2ZHUo2rcU9Ij4XKnmB
Vn7K9uFVcaQJhP2jDTNiLu9Tn8O0HfnJoRwTrpAw4Nvqf03zPfd/xq3mJCf4ym7Y
IQoBgkytorTAmE1qYxt1ZMnk2i9f9R7aXWol8mC53r/EfJaopNcg7eJe/mkZt2f8
Jc0L2Av3FG43MLAlxIsUl/FHveiQbrJQDZE57y71aMk+HgBMnbE0A4j0wBbKMhEY
xXVurUhwkY2BG1MDlLKKyhjGi4I4FDj3AImuyyKPTGLk8jZaqJ5YPlZTspq69PwR
MkaeEbyxBfrBX0sozjbL/cWm3r9ojKchqcacIc9PJ/xypmpHtTYZ38dvA7k6pzbu
dru5y6ihjUEOL01ARrRDvARA2EgU5W5xp0XV2yJ2qJ4GGpqql5M=
=GWJD
-----END PGP SIGNATURE-----

3
meson-0.37.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:80ed86b582f5bae8e5e9f780b538e12aebdfb0eb4ac04ad348e0a58b560ed9de
size 486256

16
meson-0.37.0.tar.gz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEElRgfTu0U/fTkG1GNO/RpO/7rlCgFAlhW5/oACgkQO/RpO/7r
lCgKYhAAjLXFfWf82zXiT9FtgHzCLi5zJ8ovKtsO7NFL7WZJquaxL6CC8YqEIH8A
LLOJzGg09zL1IaTwh1n4VrLmXUg9CV9VfYj84RDsXqR2tFXtTxSc3nzgZ5XW1mr2
aYuhbyF0GsUwfylnv+CSc4gRwA5URpqA8uT5FNdnU2PKwAs6P59/+NTZIZ5JYL9C
piu0hRHUkliyFjM7hs08pCfiRrFzXW5jW8rpR5c37kkHnaMD4qWn5lJh/PYBuq4I
31fWgku0IQflbtpSt7AKH1HYoVuA28qLZJs91XPuRWr0jvcx42mVmGy78swyrGNo
M2iewlS+OB5LeEIvFr8LCYmRsDhp95gysK3R1rTLDYS5m9ErB2wLXLYuoa+E9XCg
jFAhNYIejP1UYbTORJcTGSyNH8R0jydnCRMYSss7R2EO8vaKwqEF/hBYTTbDG1c8
9U3ELRGyfe9ojlzFPki03GuGrN6OzBnSE/zmJNMiJEA0/nfj2UWVCt+taJBrDfKn
yec/W0ToA9UZJJFEczQvKhccGap+MSBk0MdGL+TJBiyCIh9MwjbqmH82lxRXZb84
wMKMQiWgLe9jLfvNgsj6ctSvZpKj3u8JO3/bTjvOMp7YdtUeL+LMNp9ApRnSW+3P
HdTisVYahdHfYgWEcpezsVdMxiUa5BzdysiSISCchRHWWJpBr3k=
=Fn0J
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Mon Dec 19 05:55:00 UTC 2016 - dev@antergos.com
- Update to version 0.37.0:
* Mesontest: a new testing tool that allows you to run your
tests in many different ways.
* New shared_module function allows shared modules creation.
* GNOME module now detects required programs and prints useful
errors if any are missing.
* GNOME module uses depfile support available in GLib >= 2.52.0.
* i18n module has a new merge_file() function for creating
translated files.
* LLVM IR compilation is now supported.
* .wrap files for subprojects can now include a separate push
URL to allow developers to push changes directly from a
subproject git checkout.
* Multiple version restrictions while searching for pkg-config
dependencies is now supported.
* Support for localstatedir has been added.
* You can now pass arguments to install scripts added with
meson.add_install_script().
* Added new options sbindir and infodir that can be used for
installation.
- Remove meson-0.36.0-fix-old-pkgconfig-test.patch.
-------------------------------------------------------------------
Sat Dec 10 20:38:23 UTC 2016 - sor.alexei@meowr.ru

View File

@ -18,7 +18,7 @@
%define _name mesonbuild
Name: meson
Version: 0.36.0
Version: 0.37.0
Release: 0
Summary: High productivity build system
License: Apache-2.0
@ -27,8 +27,6 @@ Url: http://mesonbuild.com/
Source: https://github.com/%{_name}/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
Source1: https://github.com/%{_name}/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz.asc
Source2: %{name}.keyring
# PATCH-FIX-UPSTREAM meson-0.36.0-fix-old-pkgconfig-test.patch nirbheek.chauhan@gmail.com -- tests/common/51: Skip validate if pkg-config is too old (commit 2f804e9).
Patch0: %{name}-0.36.0-fix-old-pkgconfig-test.patch
BuildRequires: bison
BuildRequires: boost-devel
BuildRequires: flex
@ -54,6 +52,7 @@ BuildRequires: vala
BuildRequires: wxWidgets-devel >= 3.0.0
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(protobuf)
BuildRequires: pkgconfig(zlib)
Requires: ninja
@ -71,7 +70,6 @@ and the like.
%prep
%setup -q
%patch0 -p1
# Lack of gtest, gmock, gnustep.
rm -rf "test cases/frameworks/2 gtest" \
@ -99,6 +97,7 @@ python3 run_tests.py
%{_bindir}/%{name}
%{_bindir}/%{name}conf
%{_bindir}/%{name}introspect
%{_bindir}/%{name}test
%{_bindir}/wraptool
%{python3_sitelib}/%{_name}/
%{python3_sitelib}/%{name}-*