CVS commit: pkgsrc/devel/glibmm

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Fri Apr 26 15:12:20 UTC 2019

Modified Files:
        pkgsrc/devel/glibmm: Makefile distinfo
        pkgsrc/devel/glibmm/patches: patch-glib_glibmm_ustring.cc

Log Message:
Update glibmm to 2.56.1.

>From Clement Bouvier via pkgsrc-users.

2.56.1 (stable):

Glib:
* ustring: Fix wchar conversion on macOS with libc++
  (Clemens Lang) Bug #795338


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/devel/glibmm/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/devel/glibmm/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/glibmm/patches/patch-glib_glibmm_ustring.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/glibmm/Makefile
diff -u pkgsrc/devel/glibmm/Makefile:1.78 pkgsrc/devel/glibmm/Makefile:1.79
--- pkgsrc/devel/glibmm/Makefile:1.78   Wed Aug 22 09:43:31 2018
+++ pkgsrc/devel/glibmm/Makefile        Fri Apr 26 15:12:20 2019
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.78 2018/08/22 09:43:31 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2019/04/26 15:12:20 bsiegert Exp $
 
-DISTNAME=      glibmm-2.56.0
-PKGREVISION=   1
+DISTNAME=      glibmm-2.56.1
 CATEGORIES=    devel gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/glibmm/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/devel/glibmm/distinfo
diff -u pkgsrc/devel/glibmm/distinfo:1.54 pkgsrc/devel/glibmm/distinfo:1.55
--- pkgsrc/devel/glibmm/distinfo:1.54   Tue Apr 17 08:35:25 2018
+++ pkgsrc/devel/glibmm/distinfo        Fri Apr 26 15:12:20 2019
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.54 2018/04/17 08:35:25 wiz Exp $
+$NetBSD: distinfo,v 1.55 2019/04/26 15:12:20 bsiegert Exp $
 
-SHA1 (glibmm-2.56.0.tar.xz) = d733d9206d706d53058749f92dfb319bb189c289
-RMD160 (glibmm-2.56.0.tar.xz) = 83d0d3fe5c468883449bc082f5561d99329f1c4f
-SHA512 (glibmm-2.56.0.tar.xz) = 65e577009019e30e340ae5fe6e4c854e5a75551b2eb83ad85403d73eb4e77879783162d4c3c354bc37be0be842f0ddffc1977021a5e0c32985fb596d86929c08
-Size (glibmm-2.56.0.tar.xz) = 6859520 bytes
+SHA1 (glibmm-2.56.1.tar.xz) = 992c7510e489a98475fcf40e50415d6ba48402de
+RMD160 (glibmm-2.56.1.tar.xz) = d0424eea980619901ded384b1b9f70f66e481ad0
+SHA512 (glibmm-2.56.1.tar.xz) = fd5ad19c5dcba484573520e1d00b5bbb600ee805ab8cd9c0d985880cc1bcbe67ad31fa9f2b5789b5892eddd6be345e3f308593e5ef021e1cfda132e4235fb735
+Size (glibmm-2.56.1.tar.xz) = 6841240 bytes
 SHA1 (patch-glib_glibmm_date.h) = 50ae17f3ee1fd4d6d519cb2c5446749ec08d0761
-SHA1 (patch-glib_glibmm_ustring.cc) = b4fc8965bc5fc1bcc5ea1ac377a13b22659557ee
+SHA1 (patch-glib_glibmm_ustring.cc) = 626bedb16baa7664eade41afd585f0db339f99af

Index: pkgsrc/devel/glibmm/patches/patch-glib_glibmm_ustring.cc
diff -u pkgsrc/devel/glibmm/patches/patch-glib_glibmm_ustring.cc:1.2 pkgsrc/devel/glibmm/patches/patch-glib_glibmm_ustring.cc:1.3
--- pkgsrc/devel/glibmm/patches/patch-glib_glibmm_ustring.cc:1.2        Tue Apr 12 21:27:25 2016
+++ pkgsrc/devel/glibmm/patches/patch-glib_glibmm_ustring.cc    Fri Apr 26 15:12:20 2019
@@ -1,33 +1,33 @@
-$NetBSD: patch-glib_glibmm_ustring.cc,v 1.2 2016/04/12 21:27:25 adam Exp $
+$NetBSD: patch-glib_glibmm_ustring.cc,v 1.3 2019/04/26 15:12:20 bsiegert Exp $
 
 Work-around NetBSD's native iconv lacking support for WCHAR_T.
 
 --- glib/glibmm/ustring.cc.orig        2016-02-29 09:31:32.000000000 +0000
 +++ glib/glibmm/ustring.cc
-@@ -1353,7 +1353,7 @@ ustring::FormatStream::to_string() const
+@@ -1364,7 +1364,7 @@ ustring::FormatStream::to_string() const
  #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
+-#if (defined(__STDC_ISO_10646__) || defined(_LIBCPP_VERSION)) && SIZEOF_WCHAR_T == 4
++#if (defined(__STDC_ISO_10646__) || defined(_LIBCPP_VERSION) || defined(__NetBSD__)) && SIZEOF_WCHAR_T == 4
    // Avoid going through iconv if wchar_t always contains UCS-4.
    glong n_bytes = 0;
    const auto buf = make_unique_ptr_gfree(g_ucs4_to_utf8(
-@@ -1441,7 +1441,7 @@ operator>>(std::wistream& is, ustring& u
+@@ -1452,7 +1452,7 @@ operator>>(std::wistream& is, ustring& u
    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
+-#if (defined(__STDC_ISO_10646__) || defined(_LIBCPP_VERSION)) && SIZEOF_WCHAR_T == 4
++#if (defined(__STDC_ISO_10646__) || defined(_LIBCPP_VERSION) || defined(__NetBSD__)) && SIZEOF_WCHAR_T == 4
    // Avoid going through iconv if wchar_t always contains UCS-4.
    glong n_bytes = 0;
    const auto buf = make_unique_ptr_gfree(g_ucs4_to_utf8(
-@@ -1472,7 +1472,7 @@ operator<<(std::wostream& os, const ustr
+@@ -1483,7 +1483,7 @@ operator<<(std::wostream& os, const ustr
  {
    GError* error = nullptr;
  
--#if defined(__STDC_ISO_10646__) && SIZEOF_WCHAR_T == 4
-+#if (defined(__STDC_ISO_10646__) || defined(__NetBSD__)) && SIZEOF_WCHAR_T == 4
+-#if (defined(__STDC_ISO_10646__) || defined(_LIBCPP_VERSION)) && SIZEOF_WCHAR_T == 4
++#if (defined(__STDC_ISO_10646__) || defined(_LIBCPP_VERSION) || defined(__NetBSD__)) && SIZEOF_WCHAR_T == 4
    // Avoid going through iconv if wchar_t always contains UCS-4.
    const auto buf = make_unique_ptr_gfree(
      g_utf8_to_ucs4(utf8_string.raw().data(), utf8_string.raw().size(), nullptr, nullptr, &error));