Patched and rebuilt for Boost 1.59

This commit is contained in:
Jonathan Wakely 2015-08-29 13:26:49 +01:00
parent 2cb353da24
commit b657a8366b
2 changed files with 32 additions and 1 deletions

View File

@ -0,0 +1,26 @@
From b1c46d45d7589f05dcfbf02f3e402e318a559495 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <github@kayari.org>
Date: Sat, 29 Aug 2015 13:38:07 +0100
Subject: [PATCH] Fix for Boost 1.59.0 compatibility.
Boost.Test has major changes in 1.59.0 including renaming the XML enumerator to OF_XML.
---
test/stdair/StandardAirlineITTestSuite.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/test/stdair/StandardAirlineITTestSuite.cpp b/test/stdair/StandardAirlineITTestSuite.cpp
index ce04aa5..309e9c1 100644
--- a/test/stdair/StandardAirlineITTestSuite.cpp
+++ b/test/stdair/StandardAirlineITTestSuite.cpp
@@ -61,7 +61,11 @@ struct UnitTestConfig {
/** Constructor. */
UnitTestConfig() {
boost_utf::unit_test_log.set_stream (utfReportStream);
+#if BOOST_VERSION >= 103900
+ boost_utf::unit_test_log.set_format (boost_utf::OF_XML);
+#else
boost_utf::unit_test_log.set_format (boost_utf::XML);
+#endif
boost_utf::unit_test_log.set_threshold_level (boost_utf::log_test_units);
// boost_utf::unit_test_log.set_threshold_level (boost_utf::log_successful_tests);
}

View File

@ -3,7 +3,7 @@
#
Name: stdair
Version: 1.00.2
Release: 4%{?dist}
Release: 5%{?dist}
Summary: C++ Standard Airline IT Object Library
@ -11,6 +11,7 @@ Group: System Environment/Libraries
License: LGPLv2+
URL: http://%{name}.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0: stdair-boost-1.59-log-format.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: cmake, python-devel
@ -59,6 +60,7 @@ online (http://%{name}.org).
%prep
%setup -q
%patch0 -p1
%build
@ -145,6 +147,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sat Aug 29 2015 Jonathan Wakely <jwakely@redhat.com> 1.00.2-5
- Patched and rebuilt for Boost 1.59
* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.00.2-4
- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159