From c594eb0172590eebb224a82c9030ef0b0428d79e Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 7 Feb 2024 18:39:47 +0000 Subject: [PATCH] glibmm2.68: update to 2.78.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2.78.1 (stable): Glib: * Dispatcher: Allow destroy during emit (Kjell Ahlstedt) Issue #116 (PBS) gmmproc: * h2def.py: Make return types that are unsigned work. Required by gtkmm4, GdkDmabufTextureBuilder (Kjell Ahlstedt) Build: * Meson build: Don't fail if warning_level=everything (Daniel Boles, Kjell Ahlstedt) Merge request gtkmm!87 * MSVC, NMake: Make dep paths configurable (Chun-wei Fan) 2.78.0 (stable): Glib: * ustring: Add a std::hash<> specialization Not included by #include . Activate with #include . (Kjell Ahlstedt) Issue #16 (Murray Cumming), merge request !61 2.77.0 (unstable): Glib, Gio: * Use callback functions with C linkage (Kjell Ahlstedt) Issue #1 (Murray Cumming) Glib: * Add create_variant() (Kjell Ahlstedt) Issue #109 (ilya-fedin) * Add VariantBase::get_dynamic() (Kjell Ahlstedt) Issue #110 (ilya-fedin) * Variant: Provide Variant whenever possible (Kjell Ahlstedt) Issue #111 (ilya-fedin) * VariantContainerBase: Add a const version of get_child() and deprecate the non-const version (Kjell Ahlstedt) Issue #112 (ilya-fedin) * Add DBusHandle and Variant (Kjell Ahlstedt) Issue #113 (ilya-fedin) * ustring: Add truncate_middle() (Kjell Ahlstedt) Gio: * Add Subprocess and SubprocessLauncher (Kjell Ahlstedt) Issue #106 (ilya-fedin) * Resolver: Add set/get/property_timeout() (Kjell Ahlstedt) Documentation: * Gio::File: Fix various spelling errors (Daniel Boles) * Remove AUTHORS and README.SUN; add info to README.md (Kjell Ahlstedt) Issue gtkmm#140 gmmproc: * Generate callback functions with C linkage (Kjell Ahlstedt) Issue #1 (Murray Cumming) Examples: * Add subprocess example (Kjell Ahlstedt) Issue #106 (ilya-fedin) Tests: * Giomm tests: Test for /etc/passwd instead of /etc/fstab (Jeremy Bicha) Merge request !60 Build: * Require glib-2.0 >= 2.77.0 * Autotools build: Don't include config.h in ustring.cc (Kjell Ahlstedt) 2.76.0 (stable): Glib: * Dispatcher: Don't warn when a Dispatcher is deleted while messages are pending. (Kjell Ahlstedt) Issue #108 (PBS) * Dispatcher: Add const versions of emit() and operator()() and deprecate the non-const versions. (Kjell Ahlstedt) Issue #103 (PBS) Gio: * ListModel: Add get_typed_object() (Kjell Ahlstedt) See issue gtkmm#132 2.75.0 (unstable): Glib: * Module: Deprecate build_path() * Binding: Fix the bind_property() with two transformation functions * Add the GLIBMM_CHECK_VERSION() preprocessor macro (Kjell Ahlstedt) Gio: * NetworkMonitor::get_default(): Add refreturn (Kjell Ahlstedt) Issue #104 (ilya-fedin) * AppInfo: Add get_[recommended|fallback]_for_type() (Kjell Ahlstedt) Issue #105 (ilya-fedin) * Add BytesIcon (Kjell Ahlstedt) Issue #107 (ilya-fedin) * ListStore: Rename a local variable (Chun-wei Fan) Merge request !59 * Settings: Add bind() with mapping functions and unbind() (Kjell Ahlstedt) Documentation: * Glib::Binding::unbind(): Fix documentation (Kjell Ahlstedt) gmmproc: * generate_wrap_init.pl.in: Disable warning C4273 on Visual Studio (Chun-wei Fan) Merge request !57 Tests: * Fix giomm_simple test on Windows (Chun-wei Fan) Merge request !58 Meson build: * Detect if we build from a git subtree (William Roy) Merge request gtkmm!72 (Kjell Ahlstedt) Issue gtkmm#131 (William Roy) * Don't copy files with configure_file() (Kjell Ahlstedt) 2.74.0 (stable): Gio: * ListStore: Add find() * File: Add create_tmp() (Kjell Ahlstedt) Documentation: * File: Document create_for_parse_name() (Kjell Ahlstedt) 2.73.2 (unstable): Glib: * ustring: Add release() (Kjell Ahlstedt) Issue #101 (PBS) Gio: * ListStore: Don't derive a gtkmm__GListStore GType (Kjell Ahlstedt) Issue glib#2661 * DBus::Proxy: get_connection(), get_interface_info(): Add refreturn (Kjell Ahlstedt) Issue #102 (우정모) * AppInfo: Add get_default_for_type_async/finish(), get_default_for_uri_scheme_async/finish() * File: Add make_symbolic_link_async/finish() * ListStore: Add property_n_items() * Resolver: Add lookup_by_name_with_flags(), lookup_by_name_with_flags_async/finish() (Kjell Ahlstedt) Documentation: * Glib::RefPtr: Improve the documentation (Kjell Ahlstedt) Issue gtkmm#119 (David Marceau) * Gio::Action: Improve the documentation (Kjell Ahlstedt) Issue #100 (Diederik van Lierop) gmmproc: * Improved handling of final types (Kjell Ahlstedt) Issue glib#2661 * Improve handling of gi-docgen syntax in C documentation (Kjell Ahlstedt) Build: * Meson build: Avoid unnecessary configuration warnings (Kjell Ahlstedt) * Meson/MSVC: Add more warnings to ignore (Chun-wei Fan) * NMake Makefiles: Ensure g[lib|io]mm[config.h|.rc] are created (Chun-wei Fan) Issue #99 (Martin Ammermüller) * Require glib-2.0 >= 2.73.2 (Kjell Ahlstedt) 2.72.1 (stable): Glib: * ustring_Iterator: Don't declare copy constructor =default. A fix in the 2.72.0 release broke ABI. (Kjell Ahlstedt) Issue #98 (Scotty Trees) 2.72.0 (stable): Glib: * MainContext: Add create(MainContextFlags flags) (Kjell Ahlstedt) Gio: * Add AppInfoMonitor (Kjell Ahlstedt, technic93) Issue #97 * DBus::Proxy: signal_signal() accepts a signal name * File: Add move_async() and move_finish() * SocketClient: Deprecate set/get/property_tls_validation_flags() * TlsCertificate: Add properties private_key, private_key_pem, pkcs11_uri, private_key_pkcs11_uri. Fix the create*() methods. * TlsClientConnection.hg: Deprecate set/get/property_validation_flags() (Kjell Ahlstedt) gmmproc: * Add "ignore_deprecations" argument in _WRAP_METHOD() (Kjell Ahlstedt) Build: * Require glib-2.0 >= 2.71.2 (Kjell Ahlstedt) * MSVC build: Support VS2022 builds (Chun-wei Fan) * Meson build: Specify 'check' option in run_command() Require Meson >= 0.55.0 (Kjell Ahlstedt) 2.70.0 (stable): Glib: * Timer: Add resume() and is_active() (Kjell Ahlstedt) Issue #87 (chamignoom) * Add the Environ class (Kjell Ahlstedt) Issue #89 (Alexander Shaduri) * Binding: Add dup_source(), dup_target(). Deprecate get_source(), get_target(). TimeZone: Add operator bool(), create_identifier(). Deprecate create(). (Kjell Ahlstedt) Gio: * FileInfo: Add get/set_access_date(), get/set_creation_date(). Notification: Add set_category(). TlsCertificate: Add property/get_not_valid_before(), property/get_not_valid_after(), property/get_subject_name(), property/get_issuer_name(). TlsConnection: Add property/get_protocol_version(), property/get_ciphersuite_name(). (Kjell Ahlstedt) Tests: * Add test of Glib::Environ (Kjell Ahlstedt) Issue #89 (Alexander Shaduri) gmmproc: * Handle gi-docgen syntax in C documentation (Kjell Ahlstedt) Build: * Require glib-2.0 >= 2.69.1 (Kjell Ahlstedt) 2.68.2 (stable): Glib: * Replace all g_quark_from_static_string() by g_quark_from_string() (Kjell Ahlstedt) Issue #96 (小太) Gio: * FileEnumerator: Remove refreturn to avoid memory leak (talisein) Merge request !53 * ListModel::get_object(): Make it work for interface classes (Kjell Ahlstedt) Issue #93 (pumkinpal) * AppInfo::get_all(): Avoid a crash on Windows (Kjell Ahlstedt) Issue #94 (Lawrence37) Build: * MSVC build: Remove extraneous GLIBMM_API in Glib::ustring (Kjell Ahlstedt) Issue #92 (Christoph Reiter) --- devel/glibmm2.68/Makefile | 7 ++-- devel/glibmm2.68/PLIST | 13 +++++++- devel/glibmm2.68/distinfo | 9 +++-- .../patches/patch-glib_glibmm_ustring.cc | 33 ------------------- 4 files changed, 19 insertions(+), 43 deletions(-) delete mode 100644 devel/glibmm2.68/patches/patch-glib_glibmm_ustring.cc 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));