rpms
/
opentrep
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream upgrade

This commit is contained in:
Denis Arnaud 2023-05-01 19:15:57 +02:00
parent 9ebe4f1feb
commit 08db290633
3 changed files with 8 additions and 427 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

411
opentrep-0.07.9-boost1_76.patch
View File

@ -1,411 +0,0 @@
From 6eb41cfbeb4d5ce20b0a5e1b523a98da7ad99585 Mon Sep 17 00:00:00 2001
From: Denis Arnaud <denis.arnaud_fedora@m4x.org>
Date: Mon, 16 Aug 2021 01:03:05 +0200
Subject: [PATCH] Fixed the issue with Boost.Spirit on Boost 1.76. There is
still an issue with Boost.Python. And UTF8 may no longer be supported
---
opentrep/bom/PORParserHelper.cpp | 97 ++++++++++++++++----------------
opentrep/bom/PORParserHelper.hpp | 15 ++---
2 files changed, 57 insertions(+), 55 deletions(-)
diff --git a/opentrep/bom/PORParserHelper.cpp b/opentrep/bom/PORParserHelper.cpp
index 5ed3cd43..1f6d6058 100644
--- a/opentrep/bom/PORParserHelper.cpp
+++ b/opentrep/bom/PORParserHelper.cpp
@@ -18,7 +18,8 @@ namespace OPENTREP {
/** Namespaces */
namespace bsq = boost::spirit::qi;
- //namespace bsa = boost::spirit::ascii;
+ namespace bsa = boost::spirit::ascii;
+ namespace bss = boost::spirit::standard;
namespace bsu = boost::spirit::unicode;
namespace bsc = boost::spirit::classic;
@@ -1230,7 +1231,7 @@ namespace OPENTREP {
* Grammar for the Por-Rule parser.
*/
template <typename Iterator>
- struct LocationParser : public bsq::grammar<Iterator, bsu::blank_type> {
+ struct LocationParser : public bsq::grammar<Iterator, bsa::space_type> {
LocationParser (Location& ioPORRule) :
LocationParser::base_type(start), _location(ioPORRule) {
@@ -1238,7 +1239,7 @@ namespace OPENTREP {
start = bsq::eps
>> *(header | por_rule);
- header = bsq::lit("iata_code") >> +(bsu::char_ - bsq::eoi - bsq::eol)
+ header = bsq::lit("iata_code") >> +(bsa::char_ - bsq::eoi - bsq::eol)
>> (bsq::eoi | bsq::eol);
por_rule = por_key
@@ -1304,13 +1305,13 @@ namespace OPENTREP {
;
iata_code =
- bsq::repeat(3)[bsu::char_('A', 'Z')][storeIataCode(_location)];
+ bsq::repeat(3)[bsa::char_('A', 'Z')][storeIataCode(_location)];
icao_code =
- bsq::repeat(4)[bsu::char_("A-Z0-9")][storeIcaoCode(_location)];
+ bsq::repeat(4)[bsa::char_("A-Z0-9")][storeIcaoCode(_location)];
faa_code =
- bsq::repeat(1,4)[bsu::char_("A-Z0-9")][storeFaaCode(_location)];
+ bsq::repeat(1,4)[bsa::char_("A-Z0-9")][storeFaaCode(_location)];
geoname_id = uint1_9_p[storeGeonamesID(_location)];
@@ -1319,26 +1320,26 @@ namespace OPENTREP {
is_geonames = boolean_p;
common_name =
- (bsq::no_skip[+~bsu::char_('^')]
+ (bsq::no_skip[+~bsa::char_('^')]
- (bsq::eoi|bsq::eol))[storeCommonName(_location)]
;
ascii_name =
- (bsq::no_skip[+~bsu::char_('^')]
+ (bsq::no_skip[+~bsa::char_('^')]
- (bsq::eoi|bsq::eol))[storeAsciiName(_location)]
;
alt_name_short_list = alt_name_short % ',';
alt_name_short =
- (bsq::no_skip[+~bsu::char_("^,")]
+ (bsq::no_skip[+~bsa::char_("^,")]
- (bsq::eoi|bsq::eol))[storeAltNameShort(_location)]
;
tvl_por_code_list = tvl_por_code % ',';
tvl_por_code =
- (bsq::no_skip[+~bsu::char_("^,")]
+ (bsq::no_skip[+~bsa::char_("^,")]
- (bsq::eoi|bsq::eol))[storeTvlPORCode(_location)]
;
@@ -1347,11 +1348,11 @@ namespace OPENTREP {
longitude = bsq::double_[storeLongitude(_location)];
feat_class =
- bsq::repeat(1)[bsu::char_("A-Z")][storeFeatureClass(_location)]
+ bsq::repeat(1)[bsa::char_("A-Z")][storeFeatureClass(_location)]
;
feat_code =
- bsq::repeat(2,5)[bsu::char_("A-Z1-5")][storeFeatureCode(_location)]
+ bsq::repeat(2,5)[bsa::char_("A-Z1-5")][storeFeatureCode(_location)]
;
page_rank = bsq::double_[storePageRank(_location)];
@@ -1361,66 +1362,66 @@ namespace OPENTREP {
date_end = date[storeDateEnd(_location)];
comments =
- (bsq::no_skip[+~bsu::char_('^')]
+ (bsq::no_skip[+~bsa::char_('^')]
- (bsq::eoi|bsq::eol))[storeComments(_location)]
;
country_code =
- bsq::repeat(2,3)[bsu::char_("A-Z")][storeCountryCode(_location)]
+ bsq::repeat(2,3)[bsa::char_("A-Z")][storeCountryCode(_location)]
;
country_code2 =
- (bsq::no_skip[+~bsu::char_('^')]
+ (bsq::no_skip[+~bsa::char_('^')]
- (bsq::eoi|bsq::eol))[storeAltCountryCode(_location)]
;
country_name =
- (bsq::no_skip[+~bsu::char_('^')]
+ (bsq::no_skip[+~bsa::char_('^')]
- (bsq::eoi|bsq::eol))[storeCountryName(_location)]
;
continent_name =
- (bsq::no_skip[+~bsu::char_('^')]
+ (bsq::no_skip[+~bsa::char_('^')]
- (bsq::eoi|bsq::eol))[storeContinentName(_location)]
;
adm1_code =
- (bsq::no_skip[+~bsu::char_('^')]
+ (bsq::no_skip[+~bsa::char_('^')]
- (bsq::eoi|bsq::eol))[storeAdm1Code(_location)]
;
adm1_name_utf =
- (bsq::no_skip[+~bsu::char_('^')]
+ (bsq::no_skip[+~bsa::char_('^')]
- (bsq::eoi|bsq::eol))[storeAdm1UtfName(_location)]
;
adm1_name_ascii =
- (bsq::no_skip[+~bsu::char_('^')]
+ (bsq::no_skip[+~bsa::char_('^')]
- (bsq::eoi|bsq::eol))[storeAdm1AsciiName(_location)]
;
adm2_code =
- (bsq::no_skip[+~bsu::char_('^')]
+ (bsq::no_skip[+~bsa::char_('^')]
- (bsq::eoi|bsq::eol))[storeAdm2Code(_location)]
;
adm2_name_utf =
- (bsq::no_skip[+~bsu::char_('^')]
+ (bsq::no_skip[+~bsa::char_('^')]
- (bsq::eoi|bsq::eol))[storeAdm2UtfName(_location)]
;
adm2_name_ascii =
- (bsq::no_skip[+~bsu::char_('^')]
+ (bsq::no_skip[+~bsa::char_('^')]
- (bsq::eoi|bsq::eol))[storeAdm2AsciiName(_location)]
;
adm3_code =
- (bsq::no_skip[+~bsu::char_('^')]
+ (bsq::no_skip[+~bsa::char_('^')]
- (bsq::eoi|bsq::eol))[storeAdm3Code(_location)]
;
adm4_code =
- (bsq::no_skip[+~bsu::char_('^')]
+ (bsq::no_skip[+~bsa::char_('^')]
- (bsq::eoi|bsq::eol))[storeAdm4Code(_location)]
;
@@ -1431,7 +1432,7 @@ namespace OPENTREP {
gtopo30 = int1_5_p[storeGTopo30(_location)];
time_zone =
- (bsq::no_skip[+~bsu::char_('^')]
+ (bsq::no_skip[+~bsa::char_('^')]
- (bsq::eoi|bsq::eol))[storeTimeZone(_location)]
;
@@ -1453,27 +1454,27 @@ namespace OPENTREP {
city_code_list = city_code % ',';
city_code =
- bsq::repeat(3)[bsu::char_('A', 'Z')][storeCityCode(_location)]
+ bsq::repeat(3)[bsa::char_('A', 'Z')][storeCityCode(_location)]
;
city_name_list = city_name_utf % '=';
city_name_utf =
- (bsq::no_skip[+~bsu::char_("^|=")]
+ (bsq::no_skip[+~bsa::char_("^|=")]
- (bsq::eoi|bsq::eol))[storeCityUtfName(_location)]
;
city_name_ascii =
- (bsq::no_skip[+~bsu::char_("^|=")]
+ (bsq::no_skip[+~bsa::char_("^|=")]
- (bsq::eoi|bsq::eol))[storeCityAsciiName(_location)]
;
city_country_code =
- bsq::repeat(2,3)[bsu::char_("A-Z")][storeCityCountryCode(_location)]
+ bsq::repeat(2,3)[bsa::char_("A-Z")][storeCityCountryCode(_location)]
;
city_state_code =
- (bsq::no_skip[+~bsu::char_('^')]
+ (bsq::no_skip[+~bsa::char_('^')]
- (bsq::eoi|bsq::eol))[storeCityStateCode(_location)]
;
@@ -1491,19 +1492,19 @@ namespace OPENTREP {
city_geoname_id = uint1_9_p[storeCityGeonamesID(_location)];
state_code =
- (bsq::no_skip[+~bsu::char_('^')]
+ (bsq::no_skip[+~bsa::char_('^')]
- (bsq::eoi|bsq::eol))[storeStateCode(_location)]
;
wac = uint1_4_p[storeWAC(_location)];
wac_name =
- (bsq::no_skip[+~bsu::char_('^')]
+ (bsq::no_skip[+~bsa::char_('^')]
- (bsq::eoi|bsq::eol))[storeWACName(_location)]
;
ccy_code =
- (bsq::no_skip[+~bsu::char_('^')]
+ (bsq::no_skip[+~bsa::char_('^')]
- (bsq::eoi|bsq::eol))[storeCurrencyCode(_location)]
;
@@ -1514,10 +1515,10 @@ namespace OPENTREP {
;
unlocode_code =
- bsq::repeat(5)[bsu::char_("A-Z0-9")][storeUNLOCode(_location)];
+ bsq::repeat(5)[bsa::char_("A-Z0-9")][storeUNLOCode(_location)];
unlc_qualifiers =
- bsq::repeat(1,2)[bsu::char_("hp")]
+ bsq::repeat(1,2)[bsa::char_("hp")]
;
uic_section = uic_details % '=';
@@ -1529,7 +1530,7 @@ namespace OPENTREP {
uic_code = uint1_9_p[storeUICCode(_location)];
uic_qualifiers =
- bsq::repeat(1,2)[bsu::char_("hp")]
+ bsq::repeat(1,2)[bsa::char_("hp")]
;
geoname_lat = bsq::double_[storeGeonameLatitude(_location)];
@@ -1537,11 +1538,11 @@ namespace OPENTREP {
geoname_lon = bsq::double_[storeGeonameLongitude(_location)];
por_type =
- bsq::repeat(1,3)[bsu::char_("ABCGHOPRZ")][storePORType(_location)]
+ bsq::repeat(1,3)[bsa::char_("ABCGHOPRZ")][storePORType(_location)]
;
wiki_link =
- (bsq::no_skip[+~bsu::char_('^')]
+ (bsq::no_skip[+~bsa::char_('^')]
- (bsq::eoi|bsq::eol))[storeWikiLink(_location)]
;
@@ -1554,7 +1555,7 @@ namespace OPENTREP {
;
alt_lang_code =
- (+~bsu::char_("|=")
+ (+~bsa::char_("|=")
- (bsq::eoi|bsq::eol))[storeAltLangCodeFull(_location)]
;
@@ -1563,22 +1564,22 @@ namespace OPENTREP {
lang_code_opt = -(lang_code_ext | lang_code_hist);
lang_code_2char =
- bsq::repeat(2,4)[bsu::char_("a-z")][storeAltLangCode2Char(_location)]
+ bsq::repeat(2,4)[bsa::char_("a-z")][storeAltLangCode2Char(_location)]
;
lang_code_ext =
- '-' >> bsq::repeat(1,4)[bsu::char_('A', 'Z')][storeAltLangCodeExt(_location)];
+ '-' >> bsq::repeat(1,4)[bsa::char_('A', 'Z')][storeAltLangCodeExt(_location)];
lang_code_hist =
- '_' >> bsq::repeat(1,4)[bsu::char_("a-z0-9")][storeAltLangCodeHist(_location)];
+ '_' >> bsq::repeat(1,4)[bsa::char_("a-z0-9")][storeAltLangCodeHist(_location)];
alt_name =
- (bsq::no_skip[+~bsu::char_("|=")]
+ (bsq::no_skip[+~bsa::char_("|=")]
- (bsq::eoi|bsq::eol))[storeAltName(_location)]
;
alt_name_qualifiers =
- bsq::repeat(1,4)[bsu::char_("shpc")]
+ bsq::repeat(1,4)[bsa::char_("shpc")]
;
//BOOST_SPIRIT_DEBUG_NODE (LocationParser);
@@ -1671,7 +1672,7 @@ namespace OPENTREP {
}
// Instantiation of rules
- bsq::rule<Iterator, bsu::blank_type>
+ bsq::rule<Iterator, bsa::space_type>
start, header, por_rule, por_rule_end, por_key, por_details,
iata_code, icao_code, faa_code, geoname_id, envelope_id, is_geonames,
common_name, ascii_name,
@@ -1755,7 +1756,7 @@ namespace OPENTREP {
try {
hasParsingBeenSuccesful = bsq::phrase_parse (fwd_start, fwd_end,
- lPORParser, bsu::blank);
+ lPORParser, bsa::space);
} catch (const bsq::expectation_failure<pos_iterator_t>& e) {
const bsc::file_position_base<std::string>& pos = e.first.get_position();
@@ -1842,7 +1843,7 @@ namespace OPENTREP {
// Launch the parsing of the file and, thanks to the doEndPor
// call-back structure, the building of the whole BomRoot BOM
const bool hasParsingBeenSuccesful =
- bsq::phrase_parse (start, end, lPORParser, bsu::blank);
+ bsq::phrase_parse (start, end, lPORParser, bsa::space);
if (hasParsingBeenSuccesful == false) {
OPENTREP_LOG_ERROR ("Parsing of POR input file ('" << _filename
diff --git a/opentrep/bom/PORParserHelper.hpp b/opentrep/bom/PORParserHelper.hpp
index 986fa088..48f0c408 100644
--- a/opentrep/bom/PORParserHelper.hpp
+++ b/opentrep/bom/PORParserHelper.hpp
@@ -18,8 +18,9 @@ namespace OPENTREP {
namespace PorParserHelper {
/** Unicode character. */
- //typedef char uchar_t;
- typedef boost::uint32_t uchar_t;
+ typedef char uchar_t;
+ //typedef boost::uint8_t uchar_t;
+ //typedef boost::uint32_t uchar_t;
// ///////////////////////////////////////////////////////////////////
@@ -600,7 +601,7 @@ namespace OPENTREP {
/** Actor Constructor. */
storeAltLangCodeFull (Location&);
/** Actor Function (functor). */
- void operator() (std::vector<boost::uint32_t>,
+ void operator() (std::vector<uchar_t>,
boost::spirit::qi::unused_type,
boost::spirit::qi::unused_type) const;
};
@@ -612,7 +613,7 @@ namespace OPENTREP {
/** Actor Constructor. */
storeAltLangCode2Char (Location&);
/** Actor Function (functor). */
- void operator() (std::vector<boost::uint32_t>,
+ void operator() (std::vector<uchar_t>,
boost::spirit::qi::unused_type,
boost::spirit::qi::unused_type) const;
};
@@ -624,7 +625,7 @@ namespace OPENTREP {
/** Actor Constructor. */
storeAltLangCodeExt (Location&);
/** Actor Function (functor). */
- void operator() (std::vector<boost::uint32_t>,
+ void operator() (std::vector<uchar_t>,
boost::spirit::qi::unused_type,
boost::spirit::qi::unused_type) const;
};
@@ -634,7 +635,7 @@ namespace OPENTREP {
/** Actor Constructor. */
storeAltLangCodeHist (Location&);
/** Actor Function (functor). */
- void operator() (std::vector<boost::uint32_t>,
+ void operator() (std::vector<uchar_t>,
boost::spirit::qi::unused_type,
boost::spirit::qi::unused_type) const;
};
@@ -644,7 +645,7 @@ namespace OPENTREP {
/** Actor Constructor. */
storeAltName (Location&);
/** Actor Function (functor). */
- void operator() (std::vector<boost::uint32_t>,
+ void operator() (std::vector<uchar_t>,
boost::spirit::qi::unused_type,
boost::spirit::qi::unused_type) const;
};

22
opentrep.spec
View File

@ -3,8 +3,8 @@
#
Name: opentrep
Version: 0.07.11
Release: 6%{?dist}
Version: 0.07.13
Release: 1%{?dist}
Summary: C++ library providing a clean API for parsing travel-focused requests
@ -115,7 +115,7 @@ package is usually corrupted: it depends on the building conditions,
and it is therefore not reliable.
%prep
%setup -q -n %{name}-%{version}
%setup -q -n %{name}-%{name}-%{version}
%build
%cmake
@ -197,19 +197,11 @@ rm -f %{_bindir}/py%{name}
%endif
%changelog
* Mon May 01 2023 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 0.07.13-1
- Upstream upgrade
* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 0.07.11-6
- Rebuilt for Boost 1.81
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.07.11-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 0.07.11-4
- Rebuild for ICU 72
* Mon Aug 01 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 0.07.11-3
- Rebuilt for ICU 71.1
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.07.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
%autochangelog

2
sources
View File

@ -1 +1 @@
SHA512 (opentrep-0.07.11.tar.gz) = cc7868c760db695623315f69c861286e4f956d19ccd03d3bcb6e575d56bfaf1131b202a931a7e1269d70930691c5dc8a98bc78fb159f7f780d4c265a8cb30926
SHA512 (opentrep-0.07.13.tar.gz) = 48d282a2b7d1a72cdc6c1d444b5870df9c46cc949a0a2a2f10ea16db53ce14175483cf4d19fbc3f36074dc4bf8dfd8eead4afa91dbfa4a0cdc9d5dde9d06c4bf