mirror of
https://abf.rosa.ru/djam/meson.git
synced 2025-02-23 17:32:50 +00:00
Update to 0.38.0
This commit is contained in:
tremod
parent
499b1aca3f
commit
d011f9e0bc
4 changed files with 10 additions and 67 deletions
3
.abf.yml
3
.abf.yml
|
|
@ -1,2 +1,3 @@
|
|||
sources:
|
||||
"meson-0.35.0.tar.gz": c1d69d0de3f57a1e8f6500011c3970a44132edca
|
||||
meson-0.38.0.tar.gz.asc: ae4ef3b21815a83421fc2a528bf159c0ce906434
|
||||
meson-0.38.0.tar.gz: d1d9ceb2fb27e82143e04b3e8a92b7fc1d4f3735
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
From 71eddecdc7e82b16c5e454137d641f2a5f7c9c94 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Mon, 3 Oct 2016 17:52:26 -0400
|
||||
Subject: [PATCH] Add missing dependency in gnome.mkenums test.
|
||||
|
||||
---
|
||||
test cases/frameworks/7 gnome/mkenums/meson.build | 13 +++++++------
|
||||
1 file changed, 7 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/test cases/frameworks/7 gnome/mkenums/meson.build b/test cases/frameworks/7 gnome/mkenums/meson.build
|
||||
index f0989cf..efd6b04 100644
|
||||
--- a/test cases/frameworks/7 gnome/mkenums/meson.build
|
||||
+++ b/test cases/frameworks/7 gnome/mkenums/meson.build
|
||||
@@ -23,17 +23,18 @@ test('enum test 1', enumexe1)
|
||||
|
||||
# Generate both header and source via template individually and overriding.
|
||||
|
||||
-enums_c2 = gnome.mkenums('abc2',
|
||||
+enums_h2 = gnome.mkenums('abc2',
|
||||
sources : 'meson-sample.h',
|
||||
- c_template : 'enums2.c.in',
|
||||
- ftail : '/* trailing source file info */',
|
||||
+ h_template : 'enums2.h.in',
|
||||
+ ftail : '/* trailing header file info */',
|
||||
install_header : true,
|
||||
install_dir : get_option('includedir'))
|
||||
|
||||
-enums_h2 = gnome.mkenums('abc2',
|
||||
+enums_c2 = gnome.mkenums('abc2',
|
||||
sources : 'meson-sample.h',
|
||||
- h_template : 'enums2.h.in',
|
||||
- ftail : '/* trailing header file info */',
|
||||
+ depends : enums_h2,
|
||||
+ c_template : 'enums2.c.in',
|
||||
+ ftail : '/* trailing source file info */',
|
||||
install_header : true,
|
||||
install_dir : get_option('includedir'))
|
||||
|
||||
--
|
||||
2.10.0
|
||||
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIcBAABCAAGBQJX8rsQAAoJEDv0aTv+65QoI3kQALFHlw0HHF8U2mSFAfeFRQGa
|
||||
dNFRZcgiMH0jXiIWbeU0iFKFiwkkYjRscf1O2gBzPZRU3U4EL0Like2e6D+VqT9Z
|
||||
tNb7usxuBmfNp/kS8bnGTJ4tbqDReGEQUVE6dupjuHxNT6WoJb1UFeLu5ITRb6e2
|
||||
dp9fpnDfckbwdlujgqRXcHMP2T7YN0VG9VfryJ9PzamFbhtx8pUbCOFSiHembYQF
|
||||
Pd6fbdTMuueO4VrQSAYYx+/74ONO8DZBb6Y0yzpEwri6ShJotPMsRxaLbPbPzfjF
|
||||
sByJADPrk9sxATfv5MjSZdLro6vaAM0DjFhpvrCixPqXuZDn/ou4T8uG8N9MjPVI
|
||||
z+/Kzn2mhDiFVvsN3KvV1Di1VBvGdkGPr1SxEcTnOZ0yE77/uNv0XmDfXl3t0uLv
|
||||
wPoiYehwzE/ejMj7Q7iIXDV0lWN+b5LA6xK7nVQgMlRDqGPdTdDiIi1PX3eh/v4+
|
||||
UMEo4CUoZvQKQOTwiKh6LwXD8Yqw5QzaRUglPOYt1O4ZNRDmF6sBgglLSLhuAa4x
|
||||
S8FYfbiylKnjz6GxTQcJmIWghfvzUNFHLFMWb0g9oUvhffUzLUcNlvY9NzShX87M
|
||||
SeE5D9RUt/QygZWq//zsSfAJ7Bhy/9eR0Njvq78n09iLpn0BNHaVM/I/g8IBU2j9
|
||||
fB2D4HesX99qkw6XV0KC
|
||||
=ZTMG
|
||||
-----END PGP SIGNATURE-----
|
||||
17
meson.spec
17
meson.spec
|
|
@ -1,16 +1,15 @@
|
|||
Summary: High productivity build system
|
||||
Name: meson
|
||||
Version: 0.35.0
|
||||
Release: 2
|
||||
Version: 0.38.0
|
||||
Release: 1
|
||||
License: ASL 2.0
|
||||
Group: Development/Tools
|
||||
Url: http://mesonbuild.com/
|
||||
Source0: https://github.com/mesonbuild/meson/releases/download/%{version}/%{name}-%{version}.tar.gz
|
||||
Source1: https://github.com/mesonbuild/meson/releases/download/%{version}/%{name}-%{version}.tar.gz.asc
|
||||
# https://github.com/mesonbuild/meson/commit/71eddec
|
||||
Patch0: 0001-Add-missing-dependency-in-gnome.mkenums-test.patch
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: itstool
|
||||
BuildRequires: ninja
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: pkgconfig(python3)
|
||||
|
|
@ -33,9 +32,12 @@ BuildRequires: gettext
|
|||
BuildRequires: git
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: vala
|
||||
BuildRequires: vala-tools
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: gtest-devel
|
||||
BuildRequires: wxgtku3.0-devel
|
||||
BuildRequires: pkgconfig(vapigen)
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||
BuildRequires: pkgconfig(protobuf)
|
||||
|
|
@ -59,10 +61,12 @@ coverage reports, Valgrind, CCache and the like.
|
|||
%{_bindir}/%{name}
|
||||
%{_bindir}/%{name}conf
|
||||
%{_bindir}/%{name}introspect
|
||||
%{_bindir}/%{name}test
|
||||
%{_bindir}/wraptool
|
||||
%{_mandir}/man1/%{name}.1.*
|
||||
%{_mandir}/man1/%{name}conf.1.*
|
||||
%{_mandir}/man1/%{name}introspect.1.*
|
||||
%{_mandir}/man1/%{name}test.1.*
|
||||
%{_mandir}/man1/wraptool.1.*
|
||||
%{py3_puresitedir}/mesonbuild/
|
||||
%{py3_puresitedir}/%{name}-%{version}-py*.egg-info/
|
||||
|
|
@ -72,7 +76,6 @@ coverage reports, Valgrind, CCache and the like.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%py3_build
|
||||
|
|
@ -80,10 +83,6 @@ coverage reports, Valgrind, CCache and the like.
|
|||
%install
|
||||
%py3_install
|
||||
|
||||
for f in %{buildroot}%{_bindir}/*.py; do
|
||||
mv ${f} ${f%%.py}
|
||||
done
|
||||
|
||||
# install meson rpm macro helper
|
||||
install -D -m 0644 data/macros.%{name} %{buildroot}%{_sysconfdir}/rpm/macros.d/macros.%{name}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue