Apply patch to fix FTBFS
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
This commit is contained in:
parent
acff2f2548
commit
d0cd5e3eb5
41
0001-Add-missing-dependency-in-gnome.mkenums-test.patch
Normal file
41
0001-Add-missing-dependency-in-gnome.mkenums-test.patch
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
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
|
||||||
|
|
@ -2,12 +2,14 @@
|
|||||||
|
|
||||||
Name: meson
|
Name: meson
|
||||||
Version: 0.35.0
|
Version: 0.35.0
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: High productivity build system
|
Summary: High productivity build system
|
||||||
|
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: http://mesonbuild.com/
|
URL: http://mesonbuild.com/
|
||||||
Source0: https://github.com/mesonbuild/meson/archive/%{version}/%{name}-%{version}.tar.gz
|
Source0: https://github.com/mesonbuild/meson/archive/%{version}/%{name}-%{version}.tar.gz
|
||||||
|
# https://github.com/mesonbuild/meson/commit/71eddecdc7e82b16c5e454137d641f2a5f7c9c94
|
||||||
|
Patch0001: 0001-Add-missing-dependency-in-gnome.mkenums-test.patch
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
Obsoletes: %{name}-gui < 0.31.0-3
|
Obsoletes: %{name}-gui < 0.31.0-3
|
||||||
|
|
||||||
@ -79,6 +81,9 @@ MESON_PRINT_TEST_OUTPUT=1 ./run_tests.py
|
|||||||
%{_rpmconfigdir}/macros.d/macros.%{name}
|
%{_rpmconfigdir}/macros.d/macros.%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 05 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.35.0-2
|
||||||
|
- Apply patch to fix FTBFS
|
||||||
|
|
||||||
* Mon Oct 03 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.35.0-1
|
* Mon Oct 03 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.35.0-1
|
||||||
- Update to 0.35.0
|
- Update to 0.35.0
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user