cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to glib2mm-2.56.1.

Browse Source
This commit is contained in:
ajacoutot 2018-11-01 08:04:45 +00:00
parent 612a77302c
commit 2192f811eb
3 changed files with 4 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/glib2mm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.95 2018/07/11 12:03:57 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.96 2018/11/01 08:04:45 ajacoutot Exp $
# g++3 chokes on the code
NOT_FOR_ARCHS= ${GCC3_ARCHS}
@ -6,9 +6,8 @@ NOT_FOR_ARCHS= ${GCC3_ARCHS}
COMMENT= C++ interface for glib2
GNOME_PROJECT= glibmm
GNOME_VERSION= 2.56.0
GNOME_VERSION= 2.56.1
PKGNAME= glib2mm-${GNOME_VERSION}
REVISION= 1
V= 2.4
SUBST_VARS= V

4
devel/glib2mm/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (glibmm-2.56.0.tar.xz) = bnT8ug0kVFHFj8ihlunRA3ibxRDh7uGpsegWxSCeeak=
SIZE (glibmm-2.56.0.tar.xz) = 6859520
SHA256 (glibmm-2.56.1.tar.xz) = 2saHIFit3iY7frC+8HJjumWrtavH/UyjN+gcxdX5yoc=
SIZE (glibmm-2.56.1.tar.xz) = 6841240

37
devel/glib2mm/patches/patch-glib_glibmm_ustring_cc
View File

@ -1,37 +0,0 @@
$OpenBSD: patch-glib_glibmm_ustring_cc,v 1.1 2018/06/01 07:23:48 ajacoutot Exp $
From e798fa7b20847c875435a8a8884987e29e7ddf9b Mon Sep 17 00:00:00 2001
From: Clemens Lang <cal@macports.org>
Date: Thu, 26 Apr 2018 15:25:44 +0200
Subject: [PATCH] ustring: Fix wchar conversion on macOS with libc++
Index: glib/glibmm/ustring.cc
--- glib/glibmm/ustring.cc.orig
+++ glib/glibmm/ustring.cc
@@ -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(_LIBCPP_VERSION)) && 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(
@@ -1452,7 +1452,7 @@ operator>>(std::wistream& is, ustring& utf8_string)
std::wstring wstr;
is >> wstr;
-#if defined(__STDC_ISO_10646__) && SIZEOF_WCHAR_T == 4
+#if (defined(__STDC_ISO_10646__) || defined(_LIBCPP_VERSION)) && 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(
@@ -1483,7 +1483,7 @@ operator<<(std::wostream& os, const ustring& utf8_stri
{
GError* error = nullptr;
-#if defined(__STDC_ISO_10646__) && SIZEOF_WCHAR_T == 4
+#if (defined(__STDC_ISO_10646__) || defined(_LIBCPP_VERSION)) && 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));