Received: by mail.netbsd.org (Postfix, from userid 605) id CE08684E9B; Mon, 11 Oct 2021 10:03:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1350B84D31 for ; Mon, 11 Oct 2021 10:03:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id NUJd2drElgCP for ; Mon, 11 Oct 2021 10:03:47 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 9963384CFD for ; Mon, 11 Oct 2021 10:03:47 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8C90FFA97; Mon, 11 Oct 2021 10:03:47 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_163394662718760" MIME-Version: 1.0 Date: Mon, 11 Oct 2021 10:03:47 +0000 From: "Dan Cirnat" Subject: CVS commit: pkgsrc/devel/glib2 To: pkgsrc-changes@NetBSD.org Reply-To: cirnatdan@netbsd.org X-Mailer: log_accum Message-Id: <20211011100347.8C90FFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_163394662718760 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: cirnatdan Date: Mon Oct 11 10:03:47 UTC 2021 Modified Files: pkgsrc/devel/glib2: Makefile Makefile.common PLIST distinfo pkgsrc/devel/glib2/patches: patch-gio_giomodule.c patch-gmodule_gmodule-dl.c patch-meson.build Log Message: glib: Update devel/glib2 to 2.70.0 Overview of changes in GLib 2.70.0 ================================== * Bugs fixed: - !2248 ci: Replace FreeBSD 11 with FreeBSD 13 * Translation updates: - Croatian - Danish - English (United Kingdom) - French - German - Hungarian - Polish - Swedish - Turkish Overview of changes in GLib 2.69.3 ==================================   * Bugs fixed: - #2425 g_settings_schema_key_range_check() misbehaves for int versus bool - #2472 Compiling anything with GCC <4.6 spews deprecation warnings - #2477 `g_invoke_closure` bindings API break. - #2481 GPowerProfileMonitorPortal does not notice initial power-saver-enabled status - !2219 doc: Explicitly said, that no null term. is needed - !2238 ci: Use C.UTF-8 locale on FreeBSD 12 - !2240 gio: Fix conditions in memory-monitor test * Translation updates: - Basque - Catalan - Chinese (China) - Galician - Kazakh - Korean - Lithuanian - Romanian Overview of changes in GLib 2.69.2 ================================== * The `DBUS_SESSION_BUS_ADDRESS` environment variable is once more not used if the process is `AT_SECURE` (setuid/setgid/setcap); this change was previously applied and then reverted because it broke gnome-keyring (#2316) * Add `g_test_fail_printf()`, `g_test_skip_printf()`, `g_test_incomplete_printf()` helper functions for printing messages when tests end prematurely (work by Simon McVittie) (!2215) * Add portal implementation of `GPowerProfileMonitor` (work by Bastien Nocera) (!2222) * Bugs fixed: - #2316 Re-harden DBUS_SESSION_BUS_ADDRESS for AT_SECURE processes in GLib 2.70 - #2343 Document explicitly refcount mgmt of source-object during GAsyncReadyCallbacks - #2454 Read past the end of buffer in g_win32_package_parser_enum_packages - #2456 Frequent test failure on FreeBSD: glib/tests/thread-pool.c:197:test_thread_pool_full: 'free_func_called' should be TRUE - !2157 tests: Add missing wakeup calls to gdbus-names test - !2165 docs: Mention the stable/unstable support version in README.md - !2211 Improve documentation of various TLS stuff - !2215 gtestutils: Add more convenience functions - !2216 tests: Fix error handling when testing gtestutils - !2222 gio: Add portal version of GPowerProfileMonitor - !2224 Docs: Mention that G_VA_COPY() must be followed by `va_end()` - !2225 build: Fix implicit declaration of function errors - !2226 Annotate the GString constructors * Translation updates: - Czech - Hebrew - Slovenian - Spanish - Swedish Overview of changes in GLib 2.69.1 ================================== * Support categories in desktop notifications (`GNotification`) (work by Guido Günther) (#2446) * Add `GPowerProfileMonitor` for monitoring when to use less power (due to being on battery power, electricity being expensive or high-carbon, etc.) (work by Patrick Griffis, Bastien Nocera) (#2444) * Allow static names to be set for `GSource`s to avoid unnecessary string copies (work by Matthias Clasen) (!2196) * Bugs fixed: - #203 API: need g_module_open() variant with GError - #2058 win32: GPrivate can leak some objects - #2321 Add a GTypeFlag for final types - #2429 safe_fdwalk/safe_closefrom for Solaris 11.3/11.4 - #2439 gio trash doesn't recognize existing trash directory in non-fs-root mount - #2446 Support `categories` for notifications - #2452 g_string_replace() loops 2**32 times when replacing empty string - !2177 gio/tests/g-file-info: don't assume million-in-one events don't happen - !2178 Clarify GValue documentation - !2179 Update GValue doc: How to use GBoxed with GValue - !2180 correctly use 3 parameters for close_range - !2181 gclosure: Fix the invoke() return_value annotation - !2182 glocalfileinfo: Fix usec/nsec confusion with filetimes on Windows - !2184 gspawn: Use CLOSE_RANGE_CLOEXEC if available - !2188 g_boxed_type_register_static, G_DEFINE_BOXED_TYPE: added correlating information - !2192 Fix more warnings - !2193 glib.supp: Expand match kinds for g_get_language_names() suppressions - !2194 Add GPowerProfileMonitor - !2195 Fix some test suite memory leaks - !2196 mainloop: Add g_source_set_static_name - !2197 GResource compiler: Prefix static [con|de]strutors with c_name - !2198 Port internal uses to use g_source_set_static_name() - !2200 Fix doc stanzas for GDataInputStream properties - !2201 Fix a Unicode typo - !2202 Document the stance on ID-based mainloop APIs - !2204 tests: Add a test for Unicode normalization - !2205 GWin32RegistryKey / GWin32AppInfo registry watch fixes - !2206 Adapt documentation to gi-docgen - !2210 GWin32AppInfo: Fix missing initialization * Translation updates: - Indonesian - Portuguese - Portuguese (Brazil) - Russian - Ukrainian Overview of changes in GLib 2.69.0 ================================== * Fix a crash in `GKeyFile` when parsing a file which contains translations using a `GKeyFile` instance which has loaded another file previously (#2361) * Pin GIO DLL in memory on Windows (!2016) * Fix building third-party projects against GLib on CentOS 7 (work by Ignacio Casal Quinteiro) (#2387) * Add `g_thread_pool_new_full()` API to allow queued `GThreadPool` data to be freed if the pool is freed early (work by Nitin Wartkar) (#121) * Ensure `dlerror()` is used with locking as it’s not thread-safe in some libc implementations (#399) * Add `g_dbus_is_error_name()` and `g_dbus_is_interface_name()` convenience functions (work by Nitin Wartkar) (#402) * Drop internal libpcre copy in favour of a subproject from wrapdb (#962, #642) * Add `g_prefix_error_literal()` helper function (work by Emmanuel Fleury, building on work by Dan Williams) (#663) * Add `g_bytes_get_region()` to get data from a `GBytes` with range checks (work by Nitin Wartkar, building on work by Allison Karlitskaya) (#1098) * Add `g_object_take_ref()` to sink a floating ref (work by Nitin Wartkar, building on work by Allison Karlitskaya) (#1112) * Optimise grefcount atomic operations (work by Nishal Kulkarni) (#1583) * Fix resolving child GSettings schemas from the parent’s schema source (work by Christian Persch) (#1884) * Fix `g_date_time_format()` return value encoding if `LC_TIME` is not a UTF-8 locale but other locale settings are (work by Frederic Martinsons) (#2055) * Set app name in freedesktop.org notifications with `GNotification` (work by André Apitzsch) (#2069) * Significantly improve retrieval of mount data on Windows (work by LRN based on initial analysis by Jehan Pagès) (#2096) * Add `g_file_info_get_(access|creation)_date_time()` accessors (work by Abanoub Ghadban) (#2281) * Always apply the remove_dot_segments algorithm to URIs in `g_uri_parse()`; previously it was only applied to relative URIs (work by Carlos Garcia Campos) (#2342) * Rename git `master` branch to `main` (#2348) * Various macro and version check cleanup (work by Gaël Bonithon, Robin Verdenal-Tallieux, Nishal Kulkarni) (#2376, #2388, #2389) * Add a `GTlsConnectionClass.get_negotiated_protocol` vfunc so that `g_tls_connection_get_negotiated_protocol()` can be made thread-safe (work by Michael Catanzaro) (#2393) * Improve guess about whether a Windows process is a console process (work by Princeton Ferro with input from LRN) (!1662) * Add `g_steal_fd()` function (work by Simon McVittie) (!1966) * Add `g_spawn_check_wait_status()` and distinguish more carefully between wait status and exit status in the `GSpawn` API (work by Simon McVittie) (!1967) * Document GLib’s security policy; see https://gitlab.gnome.org/GNOME/glib/-/blob/main/SECURITY.md (!1985) * Add `g_tree_remove_all()` (work by Lighto-Ku) (!1986) * Simplify exception handling on Windows to eliminate risk of it failing due to prior heap corruption (work by LRN) (!2031) * Fix handling EOF when reading from SOCKS5 proxy stream (work by Benjamin Berg) (!2032) * Unset the registered state of a `GApplication` after it has shut down (work by Marco Trevisan) (!2056) * Support `GPattern` as a boxed type (work by Marco Trevisan) (!2066) * Add `g_tls_connection_get_protocol_version()` and `g_tls_connection_get_ciphersuite_name()` to get TLS connection information (work by Michael Catanzaro) (!2077) * Make TLS private key properties readable in `GTlsCertificate` (work by Michael Catanzaro) (!2087) * Fix detection of static libintl when building on macOS (work by Jonas Hahnfeld) (!2109) * Add `g_strv_builder_addv()` and `g_strv_builder_add_many()` to the `GStrvBuilder` API (work by Alexandros Theodotou) (!2112) * Add `not-valid-before`, `not-valid-after`, `subject-name`, `issuer-name`, `dns-names`, `ip-addresses` properties to `GTlsCertificate` (work by Ross Wollman) (!2113, !2142) * Add PKCS#11 flags to `GTlsPasswordFlags` (work by Patrick Griffis) (!2126) * Bugs fixed: - #121 GThreadPool and the ability to free data waiting to be handled - #229 g_match_info_fetch_named not return empty string as expected - #310 ref doc doesn't talk about "helper getters" optimization in g_file_info.c - #399 dlerror() not thread-safe in all libc, making gmodule-dl.c's fetch_dlerror fail sometimes - #402 please consider: #define g_dbus_is_error_name(x) g_dbus_is_interface_name (x) - #626 Add documentation example for GArray and g_array_set_clear_func() - #642 update to pcre 8.35+ - #663 [patch] add g_prefix_error_literal() - #793 Potentially confusing error message when object doesn't exist - #817 gobject: Allow passing %NULL for @data in g_object_remove_toggle_ref - #962 drop embedded pcre copy - #1036 gdbusproxy stops tracking if dbus service restarts - #1098 GBytes: add range-checked pointer getter - #1112 GObject: add g_object_take_ref() - #1583 Optimise gatomicrefcount operations - #1864 Somewhat misleading documentation of GSourceFuncs - #1884 `g_settings_get_child` not compatible with `g_settings_schema_source_new_from_directory` - #2011 Add additional unit tests for D-Bus name watching - #2055 g_date_time_format() does not return UTF-8 if LC_TIME is not UTF8 but other locale settings are UTF-8 - #2069 FreedesktopNotification fails to set app_name - #2096 SHGetFileInfoW() is not reliable (time-wise) - #2281 Add g_file_info_get_(access|creation)_date_time() - #2300 Crash on Windows MSVC build around gio - #2311 testfilemonitor test leaks ip_watched_file_t struct - #2340 GIO tests fail to build with clang-cl - #2342 g_uri_parse doesn't apply the remove_dot_segments algorithm to the path - #2348 Investigate renaming master git branch to main - #2352 RUN_FIRST | RUN_CLEANUP signals with a default handler ignore return values from user handlers - #2359 GLib 2.68.0: gio-querymodules segfaults on Windows - #2361 g_key_file_load_from_file segfaults on "Key[*]="like lines - #2363 g_newa() doesn’t check for multiplication overflow - #2368 g_task_run_in_thread () limits are not clear - #2369 glocalfile: Add native exfat magic number to filesystem list - #2376 GLIB_VERSION_MAX_ALLOWED < 2.60 does not warn when using G_GNUC_FALLTHROUGH - #2387 json-glib does not build with glib 2.68.1 - #2388 Pixman compilation error due to glib - #2389 Use G_GNUC_CHECK_VERSION to check the GNUC version - #2393 g_tls_connection_get_negotiated_protocol() is not threadsafe - #2397 Slow to list device in windows - #2399 Change spelling of ‘serialise’ to ‘serialize’ in documentation - #2405 Mention that GNotification requires an installed .desktop file to work - #2409 Project crashes when executing g_application_mark_busy - #2414 Devhelp: Glib Reference Manual/Glib Overview/Running Glib Applications formatting issue. - #2416 certificate: g_tls_certificate_new_from_pem invalid read on non null terminated data - #2417 GFile: `g_file_replace_contents()` reports `G_IO_ERROR_WRONG_ETAG` when saving from a symlink - #2418 gatomic: __atomic functions are called for CV-qualified output variables - #2423 resources.c:656:test_resource_binary_linked: 'found' should be TRUE - !1514 gbookmarkfile: Don't crash if we're not visited - !1662 gspawn-win32: improve guess whether process is console process - !1812 docs: Expand documentation about D-Bus GUIDs - !1957 Fix more warnings - !1965 gversionmacros: Add version macros for GLib 2.70 - !1966 Add g_steal_fd() to API - !1967 Distinguish more clearly between wait status and exit status - !1969 glib_typeof: Move definition to its own header - !1985 docs: Add a policy for handling security issues - !1986 make g_tree_remove_all public - !1996 Include glibconfig.h to get the G_OS_UNIX token - !1998 gpollableinputstream: Add missing annotation - !1999 goption.c: Simplfy parse_short_option() - !2004 Some improvements to clang-cl builds - !2005 introspection: Remove 'caller-allocates' from POD types - !2006 fuzzing: Add fuzz tests for functions which parse paths - !2008 tests: Deactivate tls-bindings test suite for windows - !2011 docs: Fix example program link - !2012 docs: Replace git.gnome.org with gitlab.gnome.org urls - !2013 fuzzing: Fix assertion failure in fuzz_paths.c - !2016 GIO W32: Pin gio DLL - !2023 gtlspassword: Fix g-i annotation of return for g_tls_password_get_value - !2025 [th/gdbus-cleanup] two minor cleanup patches for gdbusconnection.c - !2026 Split g_test_log() messages that contain multiple lines - !2027 Fix a handful of minor leaks found by Coverity - !2030 Fix more warnings - !2031 Re-simplify exception handling on Windows - !2032 gsocks5proxy: Handle EOF when reading from a stream - !2033 Fix annotation of count arguments - !2036 gmacros.h: use G_GNUC_CHECK_VERSION - !2038 Fix more warnings - !2039 Implement G_ANALYZER_NORETURN for Coverity - !2040 Fix more warnings - !2041 refcount: Clarify when the ref count ends up undefined - !2042 grefcount: Clarify that the initial reference count is 1 - !2043 gmacros.h: use g_macro__has_attribute() where possible - !2046 gerror: Clarify docs around message requirements - !2047 Fix more warnings - !2048 Fix more warnings - !2049 Fix typo in g_socket_listener_accept_async()'s comment - !2050 gdbus: document completion after idle action for g_dbus_connection_signal_unsubscribe() - !2051 Add nullable annotations in GUnixMountEntry - !2052 g_string_replace(): Fix documentation of 'limit' parameter - !2054 docs: Fix formatting of code block - !2055 Improve handling of FILENAME_MAX - !2056 application: Unset the registered state after shutting down - !2063 Fix more warnings - !2066 gpattern: Register as Boxed type and support introspection for it - !2067 gmacros: missing check if __STDC_VERSION__ is defined - !2069 gdbus-tool: Actually use argv[0] basename as program name - !2071 gstring: Cleanup documentation of g_string_replace - !2074 Fix more warnings - !2075 gdtlsconnection: Fix a check for a vfunc being implemented - !2077 tls: add functions to get protocol version and ciphersuite name - !2078 gthreadedresolver: don't ignore flags in lookup_by_name_with_flags - !2080 guuid: fix shift operation to parse hex string in uuid_parse_string() - !2081 Fix more warnings - !2085 gcredentials.h: Fix comment typo - !2087 gtlscertificate: make private key properties readable - !2088 Fix more warnings - !2090 docs: Standardize spelling of serializ* - !2091 Fix more warnings (clang) - !2098 grefcount: Optimise g_atomic_ref_count_dec - !2099 gmacros.h: G_NORETURN: remove useless checks - !2100 tests: Add missing return value check in string test - !2101 Fix more warnings - !2104 tests: Drop use of g_test_bug_base() - !2105 tests: Use a temporary file in the bookmarkfile tests - !2106 Fix more warnings - !2108 glib spawn-singlethread test only if F_DUPFD_CLOEXEC is defined - !2109 meson: Fix detection of static libintl on macOS - !2112 gstrvbuilder: add addv and add_many to the API - !2113 tls: expose cert details on GTlsCertificate - !2119 Fix more warnings - !2120 gdbusobjectmanagerclient: Call GetManagedObjects async - !2123 gdbus: Add various missing (nullable) or (not nullable) annotations - !2126 gtlspassword: Add flags signifying PIN type for PKCS#11 - !2127 gutils: ensure g_find_program_in_path() return an absolute path - !2130 Revert "tests: Deactivate tls-bindings test suite for windows" - !2139 gdbus, win32: Fix accidental dllexport in static builds - !2142 tls: expose SAN details on GTlsCertificate - !2143 compiling.xml: Don't recommend backticks - !2144 pcre: Drop internal libpcre copy - !2145 gunixmounts: Document NULL return value for g_unix_mount_for() - !2152 tests: A few small improvements to GBytes tests - !2153 docs: Fix annotations for optional arguments - !2155 glocalfilemonitor: Avoid a deadlock on finalization - !2162 testgdate: fix -Wmisleading-indentation warning - !2166 gtlscertificate: Add more annotations to new properties - !2167 g_value_set_string description: clarified (unified), that v_string is a copy. - !2173 gasyncqueue: Add missing (nullable) annotation to free function - !2174 data-to-c.py: generate new-line at the end of the file * Translation updates: - Chinese (China) - English (United Kingdom) - Hebrew - Nepali - Occitan (post 1500) - Serbian To generate a diff of this commit: cvs rdiff -u -r1.284 -r1.285 pkgsrc/devel/glib2/Makefile cvs rdiff -u -r1.94 -r1.95 pkgsrc/devel/glib2/Makefile.common cvs rdiff -u -r1.131 -r1.132 pkgsrc/devel/glib2/PLIST cvs rdiff -u -r1.291 -r1.292 pkgsrc/devel/glib2/distinfo cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/glib2/patches/patch-gio_giomodule.c cvs rdiff -u -r1.3 -r1.4 \ pkgsrc/devel/glib2/patches/patch-gmodule_gmodule-dl.c cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/glib2/patches/patch-meson.build Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_163394662718760 Content-Disposition: inline Content-Length: 12501 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/glib2/Makefile diff -u pkgsrc/devel/glib2/Makefile:1.284 pkgsrc/devel/glib2/Makefile:1.285 --- pkgsrc/devel/glib2/Makefile:1.284 Sat Sep 18 13:19:26 2021 +++ pkgsrc/devel/glib2/Makefile Mon Oct 11 10:03:47 2021 @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.284 2021/09/18 13:19:26 wiz Exp $ +# $NetBSD: Makefile,v 1.285 2021/10/11 10:03:47 cirnatdan Exp $ .include "Makefile.common" -PKGREVISION= 1 - CATEGORIES= devel gnome COMMENT= Some useful routines for C programming (glib2) Index: pkgsrc/devel/glib2/Makefile.common diff -u pkgsrc/devel/glib2/Makefile.common:1.94 pkgsrc/devel/glib2/Makefile.common:1.95 --- pkgsrc/devel/glib2/Makefile.common:1.94 Mon Sep 13 07:14:50 2021 +++ pkgsrc/devel/glib2/Makefile.common Mon Oct 11 10:03:47 2021 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.94 2021/09/13 07:14:50 adam Exp $ +# $NetBSD: Makefile.common,v 1.95 2021/10/11 10:03:47 cirnatdan Exp $ # used by devel/gdbus-codegen/Makefile # used by devel/glib2/Makefile # used by devel/glib2-tools/Makefile -DISTNAME= glib-2.68.4 +DISTNAME= glib-2.70.0 PKGNAME= ${DISTNAME:S/glib/glib2/} MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz Index: pkgsrc/devel/glib2/PLIST diff -u pkgsrc/devel/glib2/PLIST:1.131 pkgsrc/devel/glib2/PLIST:1.132 --- pkgsrc/devel/glib2/PLIST:1.131 Mon Sep 13 07:14:50 2021 +++ pkgsrc/devel/glib2/PLIST Mon Oct 11 10:03:47 2021 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.131 2021/09/13 07:14:50 adam Exp $ +@comment $NetBSD: PLIST,v 1.132 2021/10/11 10:03:47 cirnatdan Exp $ ${PLIST.nococoa}bin/gapplication bin/gdbus bin/gio @@ -120,6 +120,7 @@ include/glib-2.0/gio/gpermission.h include/glib-2.0/gio/gpollableinputstream.h include/glib-2.0/gio/gpollableoutputstream.h include/glib-2.0/gio/gpollableutils.h +include/glib-2.0/gio/gpowerprofilemonitor.h include/glib-2.0/gio/gpropertyaction.h include/glib-2.0/gio/gproxy.h include/glib-2.0/gio/gproxyaddress.h @@ -208,6 +209,7 @@ include/glib-2.0/glib/gi18n.h include/glib-2.0/glib/giochannel.h include/glib-2.0/glib/gkeyfile.h include/glib-2.0/glib/glib-autocleanups.h +include/glib-2.0/glib/glib-typeof.h include/glib-2.0/glib/glist.h include/glib-2.0/glib/gmacros.h include/glib-2.0/glib/gmain.h @@ -283,19 +285,19 @@ ${PLIST.fam}lib/gio/modules/libgiofam.so lib/glib-2.0/include/glibconfig.h lib/libgio-2.0.so lib/libgio-2.0.so.0 -lib/libgio-2.0.so.0.6800.4 +lib/libgio-2.0.so.0.7000.0 lib/libglib-2.0.so lib/libglib-2.0.so.0 -lib/libglib-2.0.so.0.6800.4 +lib/libglib-2.0.so.0.7000.0 lib/libgmodule-2.0.so lib/libgmodule-2.0.so.0 -lib/libgmodule-2.0.so.0.6800.4 +lib/libgmodule-2.0.so.0.7000.0 lib/libgobject-2.0.so lib/libgobject-2.0.so.0 -lib/libgobject-2.0.so.0.6800.4 +lib/libgobject-2.0.so.0.7000.0 lib/libgthread-2.0.so lib/libgthread-2.0.so.0 -lib/libgthread-2.0.so.0.6800.4 +lib/libgthread-2.0.so.0.7000.0 lib/pkgconfig/gio-2.0.pc lib/pkgconfig/gio-unix-2.0.pc lib/pkgconfig/glib-2.0.pc @@ -307,8 +309,8 @@ lib/pkgconfig/gthread-2.0.pc share/aclocal/glib-2.0.m4 share/aclocal/glib-gettext.m4 share/aclocal/gsettings.m4 -share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.6800.4-gdb.py -share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6800.4-gdb.py +share/gdb/auto-load/usr/pkg/lib/libglib-2.0.so.0.7000.0-gdb.py +share/gdb/auto-load/usr/pkg/lib/libgobject-2.0.so.0.7000.0-gdb.py share/gettext/its/gschema.its share/gettext/its/gschema.loc share/glib-2.0/gdb/glib_gdb.py Index: pkgsrc/devel/glib2/distinfo diff -u pkgsrc/devel/glib2/distinfo:1.291 pkgsrc/devel/glib2/distinfo:1.292 --- pkgsrc/devel/glib2/distinfo:1.291 Thu Oct 7 13:39:37 2021 +++ pkgsrc/devel/glib2/distinfo Mon Oct 11 10:03:47 2021 @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.291 2021/10/07 13:39:37 nia Exp $ +$NetBSD: distinfo,v 1.292 2021/10/11 10:03:47 cirnatdan Exp $ -RMD160 (glib-2.68.4.tar.xz) = cf4d834a0e8f5e77ba39d627290ac0263ba0f177 -SHA512 (glib-2.68.4.tar.xz) = be17d79b41d17fd2b144184d6e793180667b7d9ba299215ea6d4948b4c05f6d888b4868c48643e25935a34ee2f85ee1d03e53325151b7a61819437cbd3c84b10 -Size (glib-2.68.4.tar.xz) = 4945212 bytes +RMD160 (glib-2.70.0.tar.xz) = 139674d8107c540d5f826fabe0c756a4f4fc84a7 +SHA512 (glib-2.70.0.tar.xz) = fd3fcaebd34aebe0e63f9dc915b2df026a3f88a5c2254e9f17beea0a59ab0ac563976fca54eb57bd2f7af183c4ae76fb86f05951216bf4159d258b5e7b29696f +Size (glib-2.70.0.tar.xz) = 4796812 bytes SHA1 (patch-gio_gcredentialsprivate.h) = 6547edb518a98c3aca53acc1f98bde83e71b14cb SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = ec8ce89da08059ebf953d84a1dca5a2b380349f4 -SHA1 (patch-gio_giomodule.c) = d704699b2f457a08fff9219fe697e5fd2cc582ed +SHA1 (patch-gio_giomodule.c) = 68e612ac178c41aa0aae2bd66c3e4263910711ac SHA1 (patch-gio_glib-compile-schemas.c) = 4fc8e8ba62bef01762007ebf21569053374808d0 SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312 @@ -21,9 +21,9 @@ SHA1 (patch-glib_meson.build) = 65cbe6e3 SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0 SHA1 (patch-glib_tests_meson.build) = d358bd579eb09655c608106092bdeed8f16ff4d0 -SHA1 (patch-gmodule_gmodule-dl.c) = 7a179e4ae0fabb0e807bf061b06111ac910a8d82 +SHA1 (patch-gmodule_gmodule-dl.c) = 13a6e81adc1b54ab0ed8d6302ee063754cd6f881 SHA1 (patch-gmodule_gmodule.c) = a020920b8e5bad34550c9963eb2fc27bef24c5c9 SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d SHA1 (patch-gobject_meson.build) = 412b65558aa4cf9648ee84a57ad6dfcc988b1a1d -SHA1 (patch-meson.build) = f186c7e8ab2c5ba779a1227ae75b15adc0ea17f9 +SHA1 (patch-meson.build) = 15e5b005c7eca9027fe1fc7e9a550b93a5f5d33e SHA1 (patch-meson_options.txt) = 7f633fbbfa9d9b2d958365891ffb9e4094d7dd54 Index: pkgsrc/devel/glib2/patches/patch-gio_giomodule.c diff -u pkgsrc/devel/glib2/patches/patch-gio_giomodule.c:1.6 pkgsrc/devel/glib2/patches/patch-gio_giomodule.c:1.7 --- pkgsrc/devel/glib2/patches/patch-gio_giomodule.c:1.6 Tue Aug 20 14:06:46 2019 +++ pkgsrc/devel/glib2/patches/patch-gio_giomodule.c Mon Oct 11 10:03:47 2021 @@ -1,13 +1,13 @@ -$NetBSD: patch-gio_giomodule.c,v 1.6 2019/08/20 14:06:46 wiz Exp $ +$NetBSD: patch-gio_giomodule.c,v 1.7 2021/10/11 10:03:47 cirnatdan Exp $ Disable inotify on SunOS. ---- gio/giomodule.c.orig 2019-07-24 10:52:04.000000000 +0000 +--- gio/giomodule.c.orig 2021-09-17 10:17:56.682960300 +0000 +++ gio/giomodule.c -@@ -1210,7 +1210,7 @@ _g_io_modules_ensure_loaded (void) - g_type_ensure (g_null_settings_backend_get_type ()); +@@ -1280,7 +1280,7 @@ _g_io_modules_ensure_loaded (void) g_type_ensure (g_memory_settings_backend_get_type ()); g_type_ensure (g_keyfile_settings_backend_get_type ()); + g_type_ensure (g_power_profile_monitor_dbus_get_type ()); -#if defined(HAVE_INOTIFY_INIT1) +#if defined(HAVE_INOTIFY_INIT1) && !defined(__sun) g_type_ensure (g_inotify_file_monitor_get_type ()); Index: pkgsrc/devel/glib2/patches/patch-gmodule_gmodule-dl.c diff -u pkgsrc/devel/glib2/patches/patch-gmodule_gmodule-dl.c:1.3 pkgsrc/devel/glib2/patches/patch-gmodule_gmodule-dl.c:1.4 --- pkgsrc/devel/glib2/patches/patch-gmodule_gmodule-dl.c:1.3 Wed Jun 30 14:26:11 2021 +++ pkgsrc/devel/glib2/patches/patch-gmodule_gmodule-dl.c Mon Oct 11 10:03:47 2021 @@ -1,11 +1,11 @@ -$NetBSD: patch-gmodule_gmodule-dl.c,v 1.3 2021/06/30 14:26:11 prlw1 Exp $ +$NetBSD: patch-gmodule_gmodule-dl.c,v 1.4 2021/10/11 10:03:47 cirnatdan Exp $ RTL_GLOBAL is a bug. https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2171 ---- gmodule/gmodule-dl.c.orig 2021-06-10 18:57:57.268194400 +0000 +--- gmodule/gmodule-dl.c.orig 2021-09-17 10:17:56.832962500 +0000 +++ gmodule/gmodule-dl.c -@@ -106,36 +106,13 @@ _g_module_open (const gchar *file_name, +@@ -151,38 +151,13 @@ _g_module_open (const gchar *file_name, static gpointer _g_module_self (void) { @@ -22,6 +22,7 @@ https://gitlab.gnome.org/GNOME/glib/-/me - * always returns 'undefined symbol'. Only if RTLD_DEFAULT or - * NULL is given, dlsym returns an appropriate pointer. - */ +- lock_dlerror (); -#if defined(__BIONIC__) - handle = RTLD_DEFAULT; -#else @@ -29,6 +30,7 @@ https://gitlab.gnome.org/GNOME/glib/-/me -#endif - if (!handle) - g_module_set_error (fetch_dlerror (TRUE)); +- unlock_dlerror (); - - return handle; + return RTLD_DEFAULT; @@ -41,5 +43,5 @@ https://gitlab.gnome.org/GNOME/glib/-/me if (handle != RTLD_DEFAULT) -#endif { + lock_dlerror (); if (dlclose (handle) != 0) - g_module_set_error (fetch_dlerror (TRUE)); Index: pkgsrc/devel/glib2/patches/patch-meson.build diff -u pkgsrc/devel/glib2/patches/patch-meson.build:1.14 pkgsrc/devel/glib2/patches/patch-meson.build:1.15 --- pkgsrc/devel/glib2/patches/patch-meson.build:1.14 Tue Mar 30 09:37:51 2021 +++ pkgsrc/devel/glib2/patches/patch-meson.build Mon Oct 11 10:03:47 2021 @@ -1,4 +1,4 @@ -$NetBSD: patch-meson.build,v 1.14 2021/03/30 09:37:51 cirnatdan Exp $ +$NetBSD: patch-meson.build,v 1.15 2021/10/11 10:03:47 cirnatdan Exp $ - On Darwin, optionally use Cocoa (needed for X11 users). @@ -12,45 +12,27 @@ $NetBSD: patch-meson.build,v 1.14 2021/0 - Define a newer POSIX, as we build this package with -std=gnu99 ---- meson.build.orig 2021-03-18 13:28:31.000000000 +0000 +--- meson.build.orig 2021-09-17 10:17:56.849962700 +0000 +++ meson.build -@@ -773,6 +773,7 @@ if host_system == 'darwin' +@@ -778,7 +778,7 @@ if host_system == 'darwin' #error "Detected GNUstep, not Cocoa" #endif''', name : 'Mac OS X Cocoa support') +- + glib_have_cocoa = glib_have_cocoa and get_option('use_cocoa') - if glib_have_cocoa glib_conf.set('HAVE_COCOA', true) -@@ -2038,7 +2039,7 @@ endif + osx_ldflags += ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit'] +@@ -2047,7 +2047,7 @@ endif # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible # implementations. This could be extended if issues are found in some platforms. libintl_deps = [] --if cc.has_function('ngettext') -+if cc.has_function('ngettext') and host_system != 'sunos' +-if cc.has_function('ngettext', args : osx_ldflags) ++if cc.has_function('ngettext', args : osx_ldflags) and host_system != 'sunos' have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset') else # First just find the bare library. -@@ -2111,16 +2112,15 @@ if host_system != 'windows' and get_opti - if cc.has_function('getxattr') and cc.has_header('sys/xattr.h') - glib_conf.set('HAVE_SYS_XATTR_H', 1) - glib_conf_prefix = glib_conf_prefix + '#define @0@ 1\n'.format('HAVE_SYS_XATTR_H') -+ glib_conf.set('HAVE_XATTR', 1) - #failure. try libattr - elif cc.has_header_symbol('attr/xattr.h', 'getxattr') - glib_conf.set('HAVE_ATTR_XATTR_H', 1) - glib_conf_prefix = glib_conf_prefix + '#define @0@ 1\n'.format('HAVE_ATTR_XATTR_H') - xattr_dep = [cc.find_library('xattr')] -- else -- error('No getxattr implementation found in C library or libxattr') -+ glib_conf.set('HAVE_XATTR', 1) - endif - -- glib_conf.set('HAVE_XATTR', 1) - if cc.compiles(glib_conf_prefix + ''' - #include - #ifdef HAVE_SYS_TYPES_H -@@ -2220,9 +2220,11 @@ endif +@@ -2230,9 +2230,12 @@ endif glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline) @@ -62,10 +44,11 @@ $NetBSD: patch-meson.build,v 1.14 2021/0 + python = import('python').find_installation() +endif +python_name = python.path() ++ python_version = python.language_version() python_version_req = '>=3.5' -@@ -2231,7 +2233,7 @@ if not python_version.version_compare(py +@@ -2241,7 +2244,7 @@ if not python_version.version_compare(py endif # Determine which user environment-dependent files that we want to install @@ -74,7 +57,7 @@ $NetBSD: patch-meson.build,v 1.14 2021/0 bash_comp_dep = dependency('bash-completion', version: '>=2.0', required: false) have_sh = find_program('sh', required : false).found() # For glib-gettextize -@@ -2240,8 +2242,7 @@ env_program = find_program('env', requir +@@ -2250,8 +2253,7 @@ env_program = find_program('env', requir # FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578 if host_system == 'sunos' --_----------=_163394662718760--