From cd8c2a0cb860c1228369fa9d246963515cdb4899 Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 12 Apr 2016 21:27:25 +0000 Subject: 2.48.1: Build: * MacOS X: Add alternative #ifdefed code when thread_local is not supported by the compiler. * Replace most typedefs with the C++11 using keyword. --- devel/glibmm/Makefile | 6 +-- devel/glibmm/PLIST | 61 +++++++++++++--------- devel/glibmm/distinfo | 13 +++-- .../patches/patch-gio_giomm_dbussubtreevtable.cc | 21 -------- devel/glibmm/patches/patch-glib_glibmm_ustring.cc | 24 ++++----- 5 files changed, 58 insertions(+), 67 deletions(-) delete mode 100644 devel/glibmm/patches/patch-gio_giomm_dbussubtreevtable.cc diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile index 01443dc0d75..72895f2cd7d 100644 --- a/devel/glibmm/Makefile +++ b/devel/glibmm/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.66 2015/10/15 14:19:54 tnn Exp $ +# $NetBSD: Makefile,v 1.67 2016/04/12 21:27:25 adam Exp $ -DISTNAME= glibmm-2.44.0 +DISTNAME= glibmm-2.48.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glibmm/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz @@ -30,7 +30,7 @@ post-install: ${DESTDIR}${PREFIX}/share/glibmm-2.4/doctool/${tool} .endfor -BUILDLINK_API_DEPENDS.glib2+= glib2>=2.44.0 +BUILDLINK_API_DEPENDS.glib2+= glib2>=2.48.0 .include "../../devel/glib2/buildlink3.mk" BUILDLINK_API_DEPENDS.libsigcpp+= libsigc++>=2.2.10 .include "../../devel/libsigc++/buildlink3.mk" diff --git a/devel/glibmm/PLIST b/devel/glibmm/PLIST index f0c718a9219..9e7d21ba582 100644 --- a/devel/glibmm/PLIST +++ b/devel/glibmm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.35 2015/06/14 16:13:14 wiz Exp $ +@comment $NetBSD: PLIST,v 1.36 2016/04/12 21:27:25 adam Exp $ include/giomm-2.4/giomm.h include/giomm-2.4/giomm/action.h include/giomm-2.4/giomm/actiongroup.h @@ -174,8 +174,12 @@ include/giomm-2.4/giomm/private/resolver_p.h include/giomm-2.4/giomm/private/resource_p.h include/giomm-2.4/giomm/private/seekable_p.h include/giomm-2.4/giomm/private/settings_p.h +include/giomm-2.4/giomm/private/settingsschema_p.h +include/giomm-2.4/giomm/private/settingsschemakey_p.h +include/giomm-2.4/giomm/private/settingsschemasource_p.h include/giomm-2.4/giomm/private/simpleaction_p.h include/giomm-2.4/giomm/private/simpleactiongroup_p.h +include/giomm-2.4/giomm/private/simpleiostream_p.h include/giomm-2.4/giomm/private/simplepermission_p.h include/giomm-2.4/giomm/private/socket_p.h include/giomm-2.4/giomm/private/socketaddress_p.h @@ -217,8 +221,12 @@ include/giomm-2.4/giomm/resolver.h include/giomm-2.4/giomm/resource.h include/giomm-2.4/giomm/seekable.h include/giomm-2.4/giomm/settings.h +include/giomm-2.4/giomm/settingsschema.h +include/giomm-2.4/giomm/settingsschemakey.h +include/giomm-2.4/giomm/settingsschemasource.h include/giomm-2.4/giomm/simpleaction.h include/giomm-2.4/giomm/simpleactiongroup.h +include/giomm-2.4/giomm/simpleiostream.h include/giomm-2.4/giomm/simplepermission.h include/giomm-2.4/giomm/socket.h include/giomm-2.4/giomm/socketaddress.h @@ -307,6 +315,7 @@ include/glibmm-2.4/glibmm/private/interface_p.h include/glibmm-2.4/glibmm/private/iochannel_p.h include/glibmm-2.4/glibmm/private/keyfile_p.h include/glibmm-2.4/glibmm/private/markup_p.h +include/glibmm-2.4/glibmm/private/miscutils_p.h include/glibmm-2.4/glibmm/private/module_p.h include/glibmm-2.4/glibmm/private/nodetree_p.h include/glibmm-2.4/glibmm/private/object_p.h @@ -361,6 +370,7 @@ include/glibmm-2.4/glibmm/variantdict.h include/glibmm-2.4/glibmm/variantiter.h include/glibmm-2.4/glibmm/varianttype.h include/glibmm-2.4/glibmm/vectorutils.h +include/glibmm-2.4/glibmm/weakref.h include/glibmm-2.4/glibmm/wrap.h include/glibmm-2.4/glibmm/wrap_init.h include/glibmm-2.4/glibmm_generate_extra_defs/generate_extra_defs.h @@ -392,7 +402,6 @@ lib/glibmm-2.4/proc/m4/initialize_base.m4 lib/glibmm-2.4/proc/m4/initialize_gio.m4 lib/glibmm-2.4/proc/m4/initialize_glib.m4 lib/glibmm-2.4/proc/m4/initialize_glibmm.m4 -lib/glibmm-2.4/proc/m4/list.m4 lib/glibmm-2.4/proc/m4/member.m4 lib/glibmm-2.4/proc/m4/method.m4 lib/glibmm-2.4/proc/m4/property.m4 @@ -687,6 +696,12 @@ share/doc/glibmm-2.4/reference/html/classGio_1_1Seekable.html share/doc/glibmm-2.4/reference/html/classGio_1_1Seekable__inherit__graph.png share/doc/glibmm-2.4/reference/html/classGio_1_1Settings-members.html share/doc/glibmm-2.4/reference/html/classGio_1_1Settings.html +share/doc/glibmm-2.4/reference/html/classGio_1_1SettingsSchema-members.html +share/doc/glibmm-2.4/reference/html/classGio_1_1SettingsSchema.html +share/doc/glibmm-2.4/reference/html/classGio_1_1SettingsSchemaKey-members.html +share/doc/glibmm-2.4/reference/html/classGio_1_1SettingsSchemaKey.html +share/doc/glibmm-2.4/reference/html/classGio_1_1SettingsSchemaSource-members.html +share/doc/glibmm-2.4/reference/html/classGio_1_1SettingsSchemaSource.html share/doc/glibmm-2.4/reference/html/classGio_1_1Settings__inherit__graph.png share/doc/glibmm-2.4/reference/html/classGio_1_1SignalSocket-members.html share/doc/glibmm-2.4/reference/html/classGio_1_1SignalSocket.html @@ -696,6 +711,9 @@ share/doc/glibmm-2.4/reference/html/classGio_1_1SimpleActionGroup-members.html share/doc/glibmm-2.4/reference/html/classGio_1_1SimpleActionGroup.html share/doc/glibmm-2.4/reference/html/classGio_1_1SimpleActionGroup__inherit__graph.png share/doc/glibmm-2.4/reference/html/classGio_1_1SimpleAction__inherit__graph.png +share/doc/glibmm-2.4/reference/html/classGio_1_1SimpleIOStream-members.html +share/doc/glibmm-2.4/reference/html/classGio_1_1SimpleIOStream.html +share/doc/glibmm-2.4/reference/html/classGio_1_1SimpleIOStream__inherit__graph.png share/doc/glibmm-2.4/reference/html/classGio_1_1SimplePermission-members.html share/doc/glibmm-2.4/reference/html/classGio_1_1SimplePermission.html share/doc/glibmm-2.4/reference/html/classGio_1_1SimplePermission__inherit__graph.png @@ -993,36 +1011,24 @@ share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalIO-members.html share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalIO.html share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalIdle-members.html share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalIdle.html -share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy0-members.html -share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy0.html -share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy0__inherit__graph.png -share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy1-members.html -share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy1.html -share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy1__inherit__graph.png -share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy2-members.html -share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy2.html -share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy2__inherit__graph.png -share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy3-members.html -share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy3.html -share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy3__inherit__graph.png -share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy4-members.html -share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy4.html -share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy4__inherit__graph.png -share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy5-members.html -share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy5.html -share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy5__inherit__graph.png -share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy6-members.html -share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy6.html -share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy6__inherit__graph.png +share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy-members.html +share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy.html share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxyBase-members.html share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxyBase.html share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxyBase__inherit__graph.png +share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxyDetailed-members.html +share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxyDetailed.html +share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxyDetailedAnyType-members.html +share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxyDetailedAnyType.html +share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxyDetailedAnyType__inherit__graph.png +share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxyDetailed__inherit__graph.png share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxyNormal-members.html share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxyNormal.html share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxyNormal__inherit__graph.png share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxyProperty-members.html share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxyProperty.html share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxyProperty__inherit__graph.png +share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalProxy__inherit__graph.png share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalTimeout-members.html share/doc/glibmm-2.4/reference/html/classGlib_1_1SignalTimeout.html share/doc/glibmm-2.4/reference/html/classGlib_1_1Source-members.html @@ -1237,6 +1243,8 @@ share/doc/glibmm-2.4/reference/html/classGlib_1_1Variant_3_01unsigned_01char_01_ share/doc/glibmm-2.4/reference/html/classGlib_1_1Variant_3_01unsigned_01char_01_4.html share/doc/glibmm-2.4/reference/html/classGlib_1_1Variant_3_01unsigned_01char_01_4__inherit__graph.png share/doc/glibmm-2.4/reference/html/classGlib_1_1Variant__inherit__graph.png +share/doc/glibmm-2.4/reference/html/classGlib_1_1WeakRef-members.html +share/doc/glibmm-2.4/reference/html/classGlib_1_1WeakRef.html share/doc/glibmm-2.4/reference/html/classGlib_1_1ustring-members.html share/doc/glibmm-2.4/reference/html/classGlib_1_1ustring.html share/doc/glibmm-2.4/reference/html/classGlib_1_1ustring__Iterator-members.html @@ -1393,6 +1401,10 @@ share/doc/glibmm-2.4/reference/html/inherit_graph_108.png share/doc/glibmm-2.4/reference/html/inherit_graph_109.png share/doc/glibmm-2.4/reference/html/inherit_graph_11.png share/doc/glibmm-2.4/reference/html/inherit_graph_110.png +share/doc/glibmm-2.4/reference/html/inherit_graph_111.png +share/doc/glibmm-2.4/reference/html/inherit_graph_112.png +share/doc/glibmm-2.4/reference/html/inherit_graph_113.png +share/doc/glibmm-2.4/reference/html/inherit_graph_114.png share/doc/glibmm-2.4/reference/html/inherit_graph_12.png share/doc/glibmm-2.4/reference/html/inherit_graph_13.png share/doc/glibmm-2.4/reference/html/inherit_graph_14.png @@ -1589,8 +1601,9 @@ share/doc/glibmm-2.4/reference/html/since_2_4.html share/doc/glibmm-2.4/reference/html/since_2_40.html share/doc/glibmm-2.4/reference/html/since_2_42.html share/doc/glibmm-2.4/reference/html/since_2_44.html +share/doc/glibmm-2.4/reference/html/since_2_46.html +share/doc/glibmm-2.4/reference/html/since_2_48.html share/doc/glibmm-2.4/reference/html/since_2_6.html -share/doc/glibmm-2.4/reference/html/since_3_2.html share/doc/glibmm-2.4/reference/html/splitbar.png share/doc/glibmm-2.4/reference/html/structGlib_1_1Container__Helpers_1_1TypeTraits-members.html share/doc/glibmm-2.4/reference/html/structGlib_1_1Container__Helpers_1_1TypeTraits.html diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo index d952182a3f3..23d86c1ac10 100644 --- a/devel/glibmm/distinfo +++ b/devel/glibmm/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.48 2015/11/03 03:27:28 agc Exp $ +$NetBSD: distinfo,v 1.49 2016/04/12 21:27:25 adam Exp $ -SHA1 (glibmm-2.44.0.tar.xz) = aa152d6f19bde44cd528b88f089c53913d0cd0ea -RMD160 (glibmm-2.44.0.tar.xz) = bdfa028a5451b4cfffdc824d3f5515a976151e19 -SHA512 (glibmm-2.44.0.tar.xz) = 4a932b127ce0ed0798cef3555fdd1ca1632fc10720b74f9a39626989c216542807d76ae67ebc980049b65b1c163d236fc9875506ca2d80584c724394bbb8bfd7 -Size (glibmm-2.44.0.tar.xz) = 6102664 bytes -SHA1 (patch-gio_giomm_dbussubtreevtable.cc) = 0e6d961d1a5b354912dbf067ae364b5cb5b29e60 -SHA1 (patch-glib_glibmm_ustring.cc) = b4201eaf58f5efa3ceb69a44aeb978dd3c5a140e +SHA1 (glibmm-2.48.1.tar.xz) = 41e4d148da88e458889044421e31b1eaa35d8b0b +RMD160 (glibmm-2.48.1.tar.xz) = 297bf029a55b880feb2a448e8240ad50385f5e85 +SHA512 (glibmm-2.48.1.tar.xz) = 280949315e592ff8f3f7cfa6376d129211ffb6832146578d6533c4792aafef8b4ea5354943d5623ebf34ce31b8c71b6055a51de2b8ae8cfb419e6e033d9f98fa +Size (glibmm-2.48.1.tar.xz) = 6235724 bytes +SHA1 (patch-glib_glibmm_ustring.cc) = b4fc8965bc5fc1bcc5ea1ac377a13b22659557ee diff --git a/devel/glibmm/patches/patch-gio_giomm_dbussubtreevtable.cc b/devel/glibmm/patches/patch-gio_giomm_dbussubtreevtable.cc deleted file mode 100644 index 4be86618d07..00000000000 --- a/devel/glibmm/patches/patch-gio_giomm_dbussubtreevtable.cc +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-gio_giomm_dbussubtreevtable.cc,v 1.1 2012/11/16 00:45:25 joerg Exp $ - ---- gio/giomm/dbussubtreevtable.cc.orig 2012-11-13 21:31:09.000000000 +0000 -+++ gio/giomm/dbussubtreevtable.cc -@@ -122,13 +122,13 @@ static const GDBusInterfaceVTable* DBusS - - try - { -- const Gio::DBus::InterfaceVTable* vtable = -+ const Gio::DBus::InterfaceVTable* vtable2 = - (*the_slot)(Glib::wrap(connection, true), sender, object_path, - interface_name, (node ? node : "")); - -- *out_user_data = const_cast(vtable); -+ *out_user_data = const_cast(vtable2); - -- return vtable->gobj(); -+ return vtable2->gobj(); - } - catch(...) - { diff --git a/devel/glibmm/patches/patch-glib_glibmm_ustring.cc b/devel/glibmm/patches/patch-glib_glibmm_ustring.cc index 33a14e57702..15fb8615a9f 100644 --- a/devel/glibmm/patches/patch-glib_glibmm_ustring.cc +++ b/devel/glibmm/patches/patch-glib_glibmm_ustring.cc @@ -1,19 +1,19 @@ -$NetBSD: patch-glib_glibmm_ustring.cc,v 1.1 2015/02/03 11:50:43 adam Exp $ +$NetBSD: patch-glib_glibmm_ustring.cc,v 1.2 2016/04/12 21:27:25 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.orig 2016-02-29 09:31:32.000000000 +0000 +++ glib/glibmm/ustring.cc -@@ -1265,7 +1265,7 @@ ustring ustring::FormatStream::to_string +@@ -1353,7 +1353,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__) && 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 buf (g_ucs4_to_utf8(reinterpret_cast(str.data()), -@@ -1349,7 +1349,7 @@ std::wistream& operator>>(std::wistream& + const auto buf = make_unique_ptr_gfree(g_ucs4_to_utf8( +@@ -1441,7 +1441,7 @@ operator>>(std::wistream& is, ustring& u std::wstring wstr; is >> wstr; @@ -21,13 +21,13 @@ Work-around NetBSD's native iconv lacking support for WCHAR_T. +#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 buf (g_ucs4_to_utf8(reinterpret_cast(wstr.data()), -@@ -1380,7 +1380,7 @@ std::wostream& operator<<(std::wostream& + const auto buf = make_unique_ptr_gfree(g_ucs4_to_utf8( +@@ -1472,7 +1472,7 @@ operator<<(std::wostream& os, const ustr { - GError* error = 0; + GError* error = nullptr; -#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 buf (g_utf8_to_ucs4(utf8_string.raw().data(), - utf8_string.raw().size(), 0, 0, &error)); + const auto buf = make_unique_ptr_gfree( + g_utf8_to_ucs4(utf8_string.raw().data(), utf8_string.raw().size(), nullptr, nullptr, &error)); -- cgit v1.2.3