diff options
| author | adam <adam> | 2015-02-03 11:50:43 +0000 |
|---|---|---|
| committer | adam <adam> | 2015-02-03 11:50:43 +0000 |
| commit | 5baf527c6d30af7725b6da21253baf7ca0f719f6 (patch) | |
| tree | b4e9b6af0594c02d069cab77b0e0653c17eb5b1b /devel/glibmm | |
| parent | 66786d7403c91aaed265964f6937e01c929a132e (diff) | |
| download | pkgsrc-5baf527c6d30af7725b6da21253baf7ca0f719f6.tar.gz | |
Work-around NetBSD's native iconv lacking support for WCHAR_T.
See also PR 39765.
Need for graphics/inkscape 0.91.
Diffstat (limited to 'devel/glibmm')
| -rw-r--r-- | devel/glibmm/distinfo | 3 | ||||
| -rw-r--r-- | devel/glibmm/patches/patch-glib_glibmm_ustring.cc | 33 |
2 files changed, 35 insertions, 1 deletions
diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo index c44c0c79ee4..3a54179e6c2 100644 --- a/devel/glibmm/distinfo +++ b/devel/glibmm/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.45 2014/10/08 22:12:55 wiz Exp $ +$NetBSD: distinfo,v 1.46 2015/02/03 11:50:43 adam Exp $ SHA1 (glibmm-2.42.0.tar.xz) = 8f316a4dfdaf49366028087085f04c0ba29cb5c2 RMD160 (glibmm-2.42.0.tar.xz) = f859f463fd4acce435a62f9c69b9560087787754 Size (glibmm-2.42.0.tar.xz) = 6031860 bytes SHA1 (patch-gio_giomm_dbussubtreevtable.cc) = 0e6d961d1a5b354912dbf067ae364b5cb5b29e60 +SHA1 (patch-glib_glibmm_ustring.cc) = b4201eaf58f5efa3ceb69a44aeb978dd3c5a140e diff --git a/devel/glibmm/patches/patch-glib_glibmm_ustring.cc b/devel/glibmm/patches/patch-glib_glibmm_ustring.cc new file mode 100644 index 00000000000..33a14e57702 --- /dev/null +++ b/devel/glibmm/patches/patch-glib_glibmm_ustring.cc @@ -0,0 +1,33 @@ +$NetBSD: patch-glib_glibmm_ustring.cc,v 1.1 2015/02/03 11:50:43 adam Exp $ + +Work-around NetBSD's native iconv lacking support for WCHAR_T. + +--- glib/glibmm/ustring.cc.orig 2015-02-03 11:32:45.000000000 +0000 ++++ glib/glibmm/ustring.cc +@@ -1265,7 +1265,7 @@ ustring ustring::FormatStream::to_string + #ifdef GLIBMM_HAVE_WIDE_STREAM + const std::wstring str = stream_.str(); + +-# if defined(__STDC_ISO_10646__) && SIZEOF_WCHAR_T == 4 ++# if (defined(__STDC_ISO_10646__) || defined(__NetBSD__)) && SIZEOF_WCHAR_T == 4 + // Avoid going through iconv if wchar_t always contains UCS-4. + glong n_bytes = 0; + const ScopedPtr<char> buf (g_ucs4_to_utf8(reinterpret_cast<const gunichar*>(str.data()), +@@ -1349,7 +1349,7 @@ std::wistream& operator>>(std::wistream& + std::wstring wstr; + is >> wstr; + +-#if defined(__STDC_ISO_10646__) && SIZEOF_WCHAR_T == 4 ++#if (defined(__STDC_ISO_10646__) || defined(__NetBSD__)) && SIZEOF_WCHAR_T == 4 + // Avoid going through iconv if wchar_t always contains UCS-4. + glong n_bytes = 0; + const ScopedPtr<char> buf (g_ucs4_to_utf8(reinterpret_cast<const gunichar*>(wstr.data()), +@@ -1380,7 +1380,7 @@ std::wostream& operator<<(std::wostream& + { + GError* error = 0; + +-#if defined(__STDC_ISO_10646__) && SIZEOF_WCHAR_T == 4 ++#if (defined(__STDC_ISO_10646__) || defined(__NetBSD__)) && SIZEOF_WCHAR_T == 4 + // Avoid going through iconv if wchar_t always contains UCS-4. + const ScopedPtr<gunichar> buf (g_utf8_to_ucs4(utf8_string.raw().data(), + utf8_string.raw().size(), 0, 0, &error)); |