View | Details | Raw Unified | Return to bug 215393 | Differences between
and this patch

Collapse All | Expand All

(-)b/devel/boost-libs/Makefile (+1 lines)
Lines 2-7 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	boost-libs
4
PORTNAME=	boost-libs
5
PORTREVISION=	1
5
6
6
COMMENT=	Free portable C++ libraries (without Boost.Python)
7
COMMENT=	Free portable C++ libraries (without Boost.Python)
7
8
(-)b/devel/boost-libs/files/patch-libs_locale_src_encoding_codepage.cpp (+58 lines)
Added Link Here
1
Prefer ICU for better skip conversion policy
2
3
--- libs/locale/src/encoding/codepage.cpp.orig	2017-09-02 09:56:14 UTC
4
+++ libs/locale/src/encoding/codepage.cpp
5
@@ -40,13 +40,13 @@ namespace boost {
6
                                             method_type how)
7
                 {
8
                     std::auto_ptr<converter_between> cvt;
9
-                    #ifdef BOOST_LOCALE_WITH_ICONV
10
-                    cvt.reset(new iconv_between());
11
+                    #ifdef BOOST_LOCALE_WITH_ICU
12
+                    cvt.reset(new uconv_between());
13
                     if(cvt->open(to_charset,from_charset,how))
14
                         return cvt->convert(begin,end);
15
                     #endif
16
-                    #ifdef BOOST_LOCALE_WITH_ICU
17
-                    cvt.reset(new uconv_between());
18
+                    #ifdef BOOST_LOCALE_WITH_ICONV
19
+                    cvt.reset(new iconv_between());
20
                     if(cvt->open(to_charset,from_charset,how))
21
                         return cvt->convert(begin,end);
22
                     #endif
23
@@ -66,13 +66,13 @@ namespace boost {
24
                                         method_type how)
25
                 {
26
                     std::auto_ptr<converter_to_utf<CharType> > cvt;
27
-                    #ifdef BOOST_LOCALE_WITH_ICONV
28
-                    cvt.reset(new iconv_to_utf<CharType>());
29
+                    #ifdef BOOST_LOCALE_WITH_ICU
30
+                    cvt.reset(new uconv_to_utf<CharType>());
31
                     if(cvt->open(charset,how))
32
                         return cvt->convert(begin,end);
33
                     #endif
34
-                    #ifdef BOOST_LOCALE_WITH_ICU
35
-                    cvt.reset(new uconv_to_utf<CharType>());
36
+                    #ifdef BOOST_LOCALE_WITH_ICONV
37
+                    cvt.reset(new iconv_to_utf<CharType>());
38
                     if(cvt->open(charset,how))
39
                         return cvt->convert(begin,end);
40
                     #endif
41
@@ -92,13 +92,13 @@ namespace boost {
42
                                         method_type how)
43
                 {
44
                     std::auto_ptr<converter_from_utf<CharType> > cvt;
45
-                    #ifdef BOOST_LOCALE_WITH_ICONV
46
-                    cvt.reset(new iconv_from_utf<CharType>());
47
+                    #ifdef BOOST_LOCALE_WITH_ICU
48
+                    cvt.reset(new uconv_from_utf<CharType>());
49
                     if(cvt->open(charset,how))
50
                         return cvt->convert(begin,end);
51
                     #endif
52
-                    #ifdef BOOST_LOCALE_WITH_ICU
53
-                    cvt.reset(new uconv_from_utf<CharType>());
54
+                    #ifdef BOOST_LOCALE_WITH_ICONV
55
+                    cvt.reset(new iconv_from_utf<CharType>());
56
                     if(cvt->open(charset,how))
57
                         return cvt->convert(begin,end);
58
                     #endif

Return to bug 215393