Source: ncmpcpp
Source-Version: 0.8.1-1
Severity: important
Tags: patch
Usertags: icu63
Dear Maintainer,
ICU 63.1 recently released, packaged and uploaded to experimental.
Its transition is going to start soon. However your package fails to
build with this version. I attach a patch which fixes the problem.
Please check if it works with the version in Sid and upload the
package when it's feasible for you.
Thanks,
Laszlo/GCS
Description: fix FTBFS with ICU 63.1
Add icu namespace.
Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
Last-Update: 2018-11-07
---
--- ncmpcpp-0.8.1.orig/src/regex_filter.h
+++ ncmpcpp-0.8.1/src/regex_filter.h
@@ -42,12 +42,12 @@ namespace {
struct StripDiacritics
{
- static void convert(UnicodeString &s)
+ static void convert(icu::UnicodeString &s)
{
if (m_converter == nullptr)
{
- ErrorCode result;
- m_converter = Transliterator::createInstance(
+ icu::ErrorCode result;
+ m_converter = icu::Transliterator::createInstance(
"NFD; [:M:] Remove; NFC", UTRANS_FORWARD, result);
if (result.isFailure())
throw std::runtime_error(
@@ -58,10 +58,10 @@ struct StripDiacritics
}
private:
- static Transliterator *m_converter;
+ static icu::Transliterator *m_converter;
};
-Transliterator *StripDiacritics::m_converter;
+icu::Transliterator *StripDiacritics::m_converter;
#endif // BOOST_REGEX_ICU
@@ -99,8 +99,8 @@ inline bool search(const std::basic_stri
#ifdef BOOST_REGEX_ICU
if (ignore_diacritics)
{
- auto us = UnicodeString::fromUTF8(
- StringPiece(convertString<char, CharT>::apply(s)));
+ auto us = icu::UnicodeString::fromUTF8(
+ icu::StringPiece(convertString<char, CharT>::apply(s)));
StripDiacritics::convert(us);
return boost::u32regex_search(us, rx);
}
