diff --git a/devel/glibmm2.68/Makefile b/devel/glibmm2.68/Makefile index 42345b0eb63c..ba61862da6c8 100644 --- a/devel/glibmm2.68/Makefile +++ b/devel/glibmm2.68/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2023/08/14 05:24:08 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2024/02/07 18:39:47 wiz Exp $ -DISTNAME= glibmm-2.68.2 +DISTNAME= glibmm-2.78.1 PKGNAME= ${DISTNAME:S/glibmm/glibmm2.68/} -PKGREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glibmm/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz @@ -38,7 +37,7 @@ PLIST_VARS+= notmac PLIST.notmac= yes .endif -BUILDLINK_API_DEPENDS.glib2+= glib2>=2.66.0 +BUILDLINK_API_DEPENDS.glib2+= glib2>=2.77.0 .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libsigc++3/buildlink3.mk" .include "../../devel/meson/build.mk" diff --git a/devel/glibmm2.68/PLIST b/devel/glibmm2.68/PLIST index 0b0d2d319fcf..fa5f0a547bd1 100644 --- a/devel/glibmm2.68/PLIST +++ b/devel/glibmm2.68/PLIST @@ -1,9 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1 2021/05/31 22:26:08 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2024/02/07 18:39:47 wiz Exp $ include/giomm-2.68/giomm.h include/giomm-2.68/giomm/action.h include/giomm-2.68/giomm/actiongroup.h include/giomm-2.68/giomm/actionmap.h include/giomm-2.68/giomm/appinfo.h +include/giomm-2.68/giomm/appinfomonitor.h include/giomm-2.68/giomm/applaunchcontext.h include/giomm-2.68/giomm/application.h include/giomm-2.68/giomm/applicationcommandline.h @@ -11,6 +12,7 @@ include/giomm-2.68/giomm/asyncinitable.h include/giomm-2.68/giomm/asyncresult.h include/giomm-2.68/giomm/bufferedinputstream.h include/giomm-2.68/giomm/bufferedoutputstream.h +include/giomm-2.68/giomm/bytesicon.h include/giomm-2.68/giomm/cancellable.h include/giomm-2.68/giomm/charsetconverter.h include/giomm-2.68/giomm/contenttype.h @@ -96,6 +98,7 @@ include/giomm-2.68/giomm/private/action_p.h include/giomm-2.68/giomm/private/actiongroup_p.h include/giomm-2.68/giomm/private/actionmap_p.h include/giomm-2.68/giomm/private/appinfo_p.h +include/giomm-2.68/giomm/private/appinfomonitor_p.h include/giomm-2.68/giomm/private/applaunchcontext_p.h include/giomm-2.68/giomm/private/application_p.h include/giomm-2.68/giomm/private/applicationcommandline_p.h @@ -103,6 +106,7 @@ include/giomm-2.68/giomm/private/asyncinitable_p.h include/giomm-2.68/giomm/private/asyncresult_p.h include/giomm-2.68/giomm/private/bufferedinputstream_p.h include/giomm-2.68/giomm/private/bufferedoutputstream_p.h +include/giomm-2.68/giomm/private/bytesicon_p.h include/giomm-2.68/giomm/private/cancellable_p.h include/giomm-2.68/giomm/private/charsetconverter_p.h include/giomm-2.68/giomm/private/converter_p.h @@ -208,6 +212,8 @@ include/giomm-2.68/giomm/private/socketcontrolmessage_p.h include/giomm-2.68/giomm/private/socketlistener_p.h include/giomm-2.68/giomm/private/socketservice_p.h include/giomm-2.68/giomm/private/srvtarget_p.h +include/giomm-2.68/giomm/private/subprocess_p.h +include/giomm-2.68/giomm/private/subprocesslauncher_p.h include/giomm-2.68/giomm/private/tcpconnection_p.h include/giomm-2.68/giomm/private/tcpwrapperconnection_p.h include/giomm-2.68/giomm/private/themedicon_p.h @@ -258,6 +264,8 @@ include/giomm-2.68/giomm/socketlistener.h include/giomm-2.68/giomm/socketservice.h include/giomm-2.68/giomm/socketsource.h include/giomm-2.68/giomm/srvtarget.h +include/giomm-2.68/giomm/subprocess.h +include/giomm-2.68/giomm/subprocesslauncher.h include/giomm-2.68/giomm/tcpconnection.h include/giomm-2.68/giomm/tcpwrapperconnection.h include/giomm-2.68/giomm/themedicon.h @@ -297,6 +305,7 @@ include/glibmm-2.68/glibmm/datetime.h include/glibmm-2.68/glibmm/debug.h include/glibmm-2.68/glibmm/dispatcher.h include/glibmm-2.68/glibmm/enums.h +include/glibmm-2.68/glibmm/environ.h include/glibmm-2.68/glibmm/error.h include/glibmm-2.68/glibmm/exceptionhandler.h include/glibmm-2.68/glibmm/extraclassinit.h @@ -366,6 +375,7 @@ include/glibmm-2.68/glibmm/timezone.h include/glibmm-2.68/glibmm/unicode.h include/glibmm-2.68/glibmm/uriutils.h include/glibmm-2.68/glibmm/ustring.h +include/glibmm-2.68/glibmm/ustring_hash.h include/glibmm-2.68/glibmm/utility.h include/glibmm-2.68/glibmm/value.h include/glibmm-2.68/glibmm/value_basictypes.h @@ -377,6 +387,7 @@ include/glibmm-2.68/glibmm/variantdict.h include/glibmm-2.68/glibmm/variantiter.h include/glibmm-2.68/glibmm/varianttype.h include/glibmm-2.68/glibmm/vectorutils.h +include/glibmm-2.68/glibmm/version.h include/glibmm-2.68/glibmm/wrap.h include/glibmm-2.68/glibmm/wrap_init.h include/glibmm-2.68/glibmm_generate_extra_defs/generate_extra_defs.h diff --git a/devel/glibmm2.68/distinfo b/devel/glibmm2.68/distinfo index 8b0dcaa3231a..98e2c89236b6 100644 --- a/devel/glibmm2.68/distinfo +++ b/devel/glibmm2.68/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.5 2022/05/27 12:27:54 adam Exp $ +$NetBSD: distinfo,v 1.6 2024/02/07 18:39:47 wiz Exp $ -BLAKE2s (glibmm-2.68.2.tar.xz) = d1c05abf0c8a50c78f4a344e9b19c77809acf37b0a958333756988a15bac3ddc -SHA512 (glibmm-2.68.2.tar.xz) = 96b2970ac47e6a8de2d4352412f0107fbdcb61942d27f20a2f533f9704304e5f55c52829567457e7c925f830a69c739bf00676882741ed2969e52caf3e135c46 -Size (glibmm-2.68.2.tar.xz) = 7844508 bytes -SHA1 (patch-glib_glibmm_ustring.cc) = 626bedb16baa7664eade41afd585f0db339f99af +BLAKE2s (glibmm-2.78.1.tar.xz) = 569e759e1f526b6c261ea887217dd5fa54be16e35350c09df8d90a92f7ad56db +SHA512 (glibmm-2.78.1.tar.xz) = 5ace15c492be553e2c6abd8d0699197239261feaa2b45ff77181f59bb98b584dc822bdd46dbdee35691cc5a955a3b88e03f58532459236fd780823354c35d0a6 +Size (glibmm-2.78.1.tar.xz) = 9486784 bytes diff --git a/devel/glibmm2.68/patches/patch-glib_glibmm_ustring.cc b/devel/glibmm2.68/patches/patch-glib_glibmm_ustring.cc deleted file mode 100644 index 842631336b29..000000000000 --- a/devel/glibmm2.68/patches/patch-glib_glibmm_ustring.cc +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-glib_glibmm_ustring.cc,v 1.1 2021/05/31 22:26:08 wiz 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 -@@ -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__) || 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( -@@ -1452,7 +1452,7 @@ operator>>(std::wistream& is, ustring& u - std::wstring wstr; - is >> wstr; - --#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( -@@ -1483,7 +1483,7 @@ operator<<(std::wostream& os, const ustr - { - GError* error = nullptr; - --#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));