Received: by mail.netbsd.org (Postfix, from userid 605) id 9EDDA84E69; Sun, 24 Jul 2022 21:25:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D54CD84DB2 for ; Sun, 24 Jul 2022 21:24:59 +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 yJVx2Ji7kG1V for ; Sun, 24 Jul 2022 21:24:56 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 9A80384CF9 for ; Sun, 24 Jul 2022 21:24:56 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8E16EFB1A; Sun, 24 Jul 2022 21:24:56 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1658697896125290" MIME-Version: 1.0 Date: Sun, 24 Jul 2022 21:24:56 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/devel To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20220724212456.8E16EFB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1658697896125290 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: wiz Date: Sun Jul 24 21:24:56 UTC 2022 Modified Files: pkgsrc/devel/gdbus-codegen: Makefile PLIST distinfo pkgsrc/devel/glib2: Makefile.common PLIST distinfo pkgsrc/devel/glib2-tools: Makefile pkgsrc/devel/glib2/patches: patch-gio_meson.build patch-glib_meson.build patch-meson.build Log Message: glib2*: update to 2.72.2 Overview of changes in GLib 2.72.2 ================================== * Bugs fixed: - #2640 UWP warnings about extensions and verbs with glib 2.72.1 - !2605 Backport !2449 and !2600 mingw test fixes to glib-2-72 - !2616 Backport !2615 “Meson: Fix gio-windows-2.0 override name” to glib-2-72 - !2629 Backport !2626, !2627 minor leak fixes to glib-2-72 - !2643 Backport !2642 “meson: Check rres.compiled() before calling rres.returncode()” to glib-2-72 - !2644 Backport !2631 “Cast to guintptr instead of subtracting by null” to glib-2-72 - !2662 Backport !2654 “gtask: use g_strconcat() in g_task_return() only if needed” to glib-2-72 - !2691 Backport !2661 “win32appinfo: change log level from warning to debug” to glib-2-72 Overview of changes in GLib 2.72.1 ================================== * Fix building projects which use g_warning_once() with clang++ (#2625) * Fix `g_file_trash()` not deleting directories via the portals backend (work by Matthias Clasen) (#2629) * A number more compiler warnings fixed for MSVC (work by Loïc Le Page) (!2495) * Fix detection of broken `poll()` function on macOS (work by Haruka Ma) (!2571) * Fix spawning subprocesses from GUI programs on Windows (work by Marc-André Lureau) (!2582) * Bugs fixed: - #2312 gdbus-test-codegen tests leak GWeakRef objects - #2625 g_warning_once fails to build with clang++ - #2629 g_file_trash() does not work on directories inside a sandbox - !2495 Cleanup warnings split 6 - !2499 Various contenttype-related test fixes on win32 - !2534 gpowerprofilemonitor: Tweak wording of documentation to make more sense - !2540 Various win32 tests skip & fixes - !2541 meson: simplify lookup of python command - !2543 ci: Update the Fedora CI image to Fedora 34 - !2556 gdbusconnection: Use g_strv_contains() rather than a home-grown version - !2557 gdbusmethodinvocation: Fix a leak on an early return path - !2558 Move unit test on g_basename() function to glib/tests/fileutils.c - !2559 Move tests/relation-test.c to glib/tests/relation.c - !2560 ci: Update Coverity, mingw and Android CI images to Fedora 34 - !2563 glib: Format GDateTime ISO8601 years as %C%y - !2564 Move test files on slices from tests/ to glib/tests/ - !2566 tests: Add more tests for GResolver response parsing - !2573 Backport translation fixes and !2571 “meson: Set BROKEN_POLL in macOS builds” to glib-2-72 - !2574 Backport !2565 “Revert "meson: simplify lookup of python command"” to glib-2-72 - !2587 Backport !2583 “Fix trashing sandboxed directories” to glib-2-72 - !2588 Backport !2582 “glib/win32: fix spawn from GUI regression” to glib-2-72 - !2590 Backport !2589 “tests: Don’t exit gdbus-method-invocation test early on connection close” to glib-2-72 - !2593 Backport !2578 “gatomic: Add a C++ variant of g_atomic_int_compare_and_exchange()” to glib-2-72 Overview of changes in GLib 2.72.0 ================================== * Bugs fixed: - #2620 g_time_zone_new_offset() assertion failure if offset >= 25 hours - !2538 Various unit test fixes - !2542 fuzzing: Fix test failure with G_DISABLE_ASSERT - !2547 gprintf: Fix a memory leak with an invalid format in g_vasprintf() - !2548 tests: Various fixes to gdbus-auth, gdbus-non-socket, gdbus-connection-flush, spawn-multithreaded tests - !2551 tests: More flaky test fixes to converter-stream and test-printf - !2552 gtlsconnection: fix typo in docs Overview of changes in GLib 2.71.3 ================================== * Fix flaky `GDebugController` tests (!2504) * Numerous small documentation updates * Bugs fixed: - #517 g_utf8_collate returns 0 on U+C5D0 vs U+CD94 - #1929 gdbus-connection-flush: setup_client_cb: Exhausted all available authentication mechanisms (tried: EXTERNAL, DBUS_COOKIE_SHA1) - #2589 Hash sign misinterpreted as heading - #2598 g_main_loop_run() may leak a GMainLoop reference - #2609 Clarify documentation for g_log_set_debug_enabled() - #2611 Unspecified options considered present - #2612 side effects of ensure_valid_dict result used in g_return_if_fail macro - #2613 Naked magic literal in gvariant.h - !1707 Add cache to g_unix_mount_points_get() - !2424 Remove old test file tests/testglib.c - !2451 glib: fix buffer overflow in g_canonicalize_filename() - !2466 Various minor fixes for empty argv handling - !2480 Various glib/tests/date fixes on win32 - !2485 Various spawn-related test fixes on win32 - !2490 Cleanup warnings split 1 - !2491 Cleanup warnings split 2 - !2492 Cleanup warnings split 3 - !2493 Cleanup warnings split 4 - !2501 glib-compile-resources: Fix a memory leak of the compiler option - !2502 tests: Merge iochannel-test into io-channel tests in glib directory - !2503 gbacktrace: Fix a set-but-not-used variable - !2504 gdebugcontrollerdbus: Track pending tasks with weak refs - !2505 tests: Stop ignoring test failures on macOS - !2506 gresource-tool: Fix unused-but-set-variable warn with G_DISABLE_ASSERT - !2507 ci: Drop custom dependency builds from installed-tests - !2508 codegen: Reformat parser.py according to black - !2509 tests: Fix various small memory leaks - !2510 gdesktopappinfo: Fix a leak when launching URIs over D-Bus - !2512 doc: Extend a bit G_DECLARE_* documentation example - !2513 gmain: Expand documentation about GSource priorities a little - !2514 ci: Various cleanups and moving Android API 21 and FreeBSD 12 to scheduled run - !2515 gmessages: Fix typo in docs - !2516 glocalfileinfo: Always define _g_stat_mtim_nsec, etc. - !2517 meson: Add schemasdir and giomoduledir to gio dependency - !2518 meson: Set GIO_EXTRA_MODULES in devenv - !2519 gdebugcontrollerdbus: Mark a variable as G_GNUC_UNUSED - !2520 tests: Remove threads from mock-resolver/network-address test - !2523 Add handling of NULL time_t* pointer as argument - !2524 Revert "meson: Add schemasdir and giomoduledir to gio dependency" - !2525 meson: Add schemasdir and giomoduledir to gio dependency - !2526 Remove unused test tests/testgdateparser.c - !2527 Move tests/type-test.c to glib/tests/types.c - !2528 meson: Add PYTHONPATH to load GDB helper module - !2531 gtask: Document that task name is set by g_task_set_source_tag() Overview of changes in GLib 2.71.2 ================================== * Rework `glib-compile-resources` to output compiler-specific files to reduce compilation time; see the new `--compiler` option (work by Emmanuele Bassi) (#2492) * Add a cross-platform API for aligned memory allocations (`g_aligned_alloc()`, `g_aligned_alloc0()` and `g_aligned_free()`) (work by Emmanuele Bassi) (#2574) * Deprecate `force_posix_threads` configure option, since it was a workaround for static linking on Windows (#2592) * Add `GBindingGroup` and `GSignalGroup` APIs (work by Christian Hergert and Garrett Regier) (!2235) * Implement FD remapping support for `g_spawn_async_with_pipes_and_fds()` on Windows (work by Marc-André Lureau) (!2458) * Add an async file move API, `g_file_move_async()` (work by Lucas Schwiderski) (!2469) * Bugs fixed: - #1190 gapplication: Add an org.gtk.Debugging interface - #2329 GApplication CLI parsing of DOUBLE type failure - #2492 glib-compile-resources contains resource data twice and creates large output files - #2563 g_test_build_filename and friends not safe to call after g_test_run() has finished - #2574 Add API for aligned allocations - #2592 Consider deprecating 'force_posix_threads' build option - #2601 Missing tag in generated files - !2235 Add GBindingGroup and GSignalGroup - !2378 gtestutils: Mention the unit used for the test timer - !2404 File tests - !2433 Remove tests/testgdate.c from tests - !2458 Implement fd passing for Windows spawn - !2464 Amend g_bus_get* documentation regarding private connection - !2465 gi: expose some files as variable for gobject-introspection - !2467 ci: Add link to Coverage output at end of coverage job - !2468 gfile: resolve_relative_path isn't nullable - !2469 Implement async file movement - !2471 Fix test on the date format for FreeBSD and MacOS X. - !2472 Fix test date (again)... - !2473 Fix glib/test/date.c for FreeBSD/OpenBSD/MacOS X - !2476 Add G_UNICODE_SCRIPT_MATH to GUnicodeScript - !2477 Improve coverage of two digit years in gdate tests - !2481 Fix glib/tests/fileutils on win32 - !2482 Fix unit test on date format '%Z' which is too versatile to be trustable - !2483 Fix glib/tests/gdatetime on win32 - !2484 tests: Use g_test_skip() to skip a test on Windows - !2487 gconstructor.h: Visual Studio: Only include gslist.h if needed - !2488 Fix some problems with g_aligned_alloc() tests Overview of changes in GLib 2.71.1 ================================== * Basic support for static builds on Windows (work by Loïc Le Page, Marc-André Lureau, with contributions from Xavier Claessens, Nirbheek Chauhan, Charlie Barto, Luca Bacci, Amos Wenger) (#692, #2585, !2442) * Add `GDebugController` and a D-Bus implementation which exposes whether debug output is enabled in a process using the `org.gtk.Debugging` D-Bus interface (work by Philip Withnall) (#1190) * Support for `AF_UNIX` sockets on Windows 10 (and later) (work by Marc-André Lureau) (#2487) * Several important fixes to GDBus message and GVariant parsing of invalid data (work by Sebastian Wilhelmi) (#2557, #2572) * Fix potential data loss due to missing fsync when saving files on btrfs (work by Sebastian Keller) (!2425) * Fix potential buffer overflows in `garray.c` for very large `GArray`s and `GPtrArray`s (work by Tobias Stoeckmann) (#2578) * Fix FDs in gspawn not being closed and causing process hangs if `close_range()` fails unexpectedly (work by Dan Nicholson) (#2580) * Fix `g_find_program_in_path()` not returning an absolute path if `$PATH` is relative (work by Christoph Niethammer) (#2586) * Add support for loading PKCS#12 encrypted files in `GTlsCertificate` (work by Patrick Griffis) (!2239) * A number of improvements to unit tests (work by Emmanuel Fleury, Charlie Barto) (!2399, !2400, !2402, !2403, !2428, !2431, !2432, !2434) * Support `LOCAL_PEERPID` on macOS, giving partial support for PIDs in `GCredentials` on that platform (work by Ignacio Casal Quinteiro) (!2362) * Add `g_get_user_state_dir()` to support `XDG_STATE_HOME` (work by Sophie Herold) (!2395) * Add `g_hash_table_new_similar()` to copy a hash table and its hash/equal functions without its data (work by Jonas Ådahl) (!2405) * Support D-Bus client authentication with `EXTERNAL` on Windows (work by Marc-André Lureau) (!2429) * Add a reStructuredText documentation generator to `gdbus-codegen` (work by Emmanuele Bassi) (!2448) * Add a Windows implementation of `GMemoryMonitor` (work by Marc-André Lureau) (!2452) * Bugs fixed: - #692 meta: Fix static build on Windows - #1190 gapplication: Add an org.gtk.Debugging interface - #2487 Add support for native unix domain sockets on WIN32 to GLib.Socket and related classes - #2550 possible GDateTime issue with localtime on Illumos/Solaris - #2557 Arrays of zero-element tuples with non-zero length lead to infinite loops in g_dbus_message_new_from_blob - #2559 2.71.0: compile and link time warnings - #2560 Link error xdgmime.c: unresolved external symbol S_ISREG when building with VS2022 - #2564 Hangul Jamo Extended-B should be 0-width - #2565 Build glib-2.71.0 failed in Windows using MSYS2-MINGW64 - #2571 Cross build error "undefined reference to `_g_binary_test1_resource_data'" when building tests for Windows on openSUSE Leap - #2572 Check for GVariant recursion depth before recursing - #2578 buffer overflows in garray.c - #2579 Outdated paths in INSTALL.in - #2580 gspawn doesn't set CLOEXEC if close_range fails unexpectedly - #2582 glib 2.71.0 muslc - build error missing sentinel in function call - #2585 Static link issue on Windows due to resource files being linked in twice - #2586 g_find_program_in_path not returning an absolute path - !2239 gtlscertificate: Add ability to load PKCS#12 encrypted files - !2362 credentials: support the local peerpid on macos - !2384 meson: Fix linking with static library in Windows - !2395 utils: Add XDG_STATE_HOME support - !2399 Move tests/env-test.c into glib/tests/environment.c - !2400 Prevent gtest tests from popping up dialog boxes - !2402 Improving glib/tests/environment.c - !2403 Improve test coverage of glib/tests/asyncqueue.c - !2405 ghash: Add g_hash_table_new_similar - !2407 tests: Fix environment test on FreeBSD - !2411 annotate `g_content_type_guess` parameter as filename - !2412 paramspec: fix unref annotation - !2413 Use meson dependency to link against apple framework - !2414 docs: Improve docs for gdbusutils.c - !2417 gtestutils: Fix minor typos in the g_test_get_filename() docs - !2423 Make clear in doc that signals are emitted synchroniously - !2425 gfileutils: Remove outdated BTRFS fsync optimization from set_contents - !2426 gdbus-codegen: Fix a typo in a comment - !2428 Merge tests/gobject/gvalue-test.c with gobject/tests/value.c - !2429 gdbus: make client work with EXTERNAL on Windows - !2431 Merge tests/gobject/paramspec-test.c into gobject/tests/param.c - !2432 Merge test/unicode-caseconv.c into glib/tests/unicode.c - !2434 Remove a disabled test case that was covered by glib/tests/collate.c - !2440 Improve g_ascii_formatd docs and preconditions - !2441 Reduce the amount of compile-time warnings - !2442 Fix tests with static build on Windows - !2447 giowin32: use gint64 and _lseeki64 - !2448 Add reStructuredText documentation generator for gdbus-codegen - !2452 gio/win32: add GMemoryMonitorWin32 - !2453 Add `(array length)` annotation to `g_tls_certificate_new_from_pkcs12()` - !2454 gdbusmessage, gvariant and garray fixes - !2456 tests: Pass --internal and -z noexecstack to glib-compile-resources tests - !2459 gio: add missing zlib dependency in gio-windows-2.0.pc - !2461 Fix memory leak in gio/gdbusauthmechanismsha1.c - !2463 Revert "Merge branch 'fix-windows-pc' into 'main'" Overview of changes in GLib 2.71.0 ================================== * Fix network changes not being signalled from NetworkManager (work by Julian Andres Klode) (#2505) * Fix build when building with --fatal-meson-warnings (work by Eli Schwartz) (!2304) * Fix use of the default log writer with journald namespaces (diagnosis by Ilya Basin) (#2530) * Fix hang in `dbus-daemon` under `GTestDBus` when `G_MESSAGES_DEBUG=all` is set (work by Marco Trevisan) (#2537) * Speed up `g_canonicalize_filename()` to avoid pathogenic cases with `..` (work by Sebastian Wilhelmi) (#2541) * Fix URI for pcre subproject as it’s moved upstream (work by Albert Astals Cid) (!2324) * Fix storing GSettings dictionaries on macOS (work by Maurice) (#2527) * Speed up ‘remove dot segments’ algorithm in `GUri` to avoid pathogenic cases with `..` (work by Sebastian Wilhelmi) (#2526) * Fix infinite loops in D-Bus message parsing for truncated inputs (work by Sebastian Wilhelmi) (#2528) * Improve correctness of version information returned by `g_get_os_info()` for Windows 10/Server 2019+ (work by Chun-wei Fan) (#2443) * Various fixes to GWeakRef cleanup (#865, #2390) and toggle refs (#2394) (work by Marco Trevisan) * Add `G_DBUS_PROXY_FLAGS_NO_MATCH_RULE` flag for disabling match rules when creating a `GDBusProxy` (#1109) * Fix FD remapping in `g_spawn_async_with_pipes_and_fds()` with certain values of target FDs (#2503, #2506) (work by Michael Catanzaro) * Make `GDBusProxy::g-signal` signal detailed with D-Bus signal names (#2536) (work by Aleksandr Mezin) * Emit `launched` signal for D-Bus activation of apps with `GDesktopAppInfo` (!2227) (work by Guido Günther) * Fix IDs of `GDesktopAppInfo`s which are constructed from a `.desktop` file in a subdirectory (!2283) (work by Ivalyo Dimitrov) * Add `--interactive` option to `gdbus call` (!2329) * Add `G_SUBPROCESS_FLAGS_SEARCH_PATH_FROM_ENVP` to `GSubprocess` (!2333) (work by Hristo Venev) * Bugs fixed: - #475 Add g_alloca0() and g_newa0() - #847 g_set_prgname() should be thread-safe - #865 GWeakRefs not cleared by g_object_run_dispose() - #1109 [PATCH] GDBusProxy: add G_DBUS_PROXY_FLAGS_NO_MATCH_RULE flag - #1231 gobject declare macros cause alignment warnings on armhf/armhf/mipsel - #1331 GArray with 10 million items overflows index arithmetic - #1735 Get back to a -werror build - #1781 Sort output of gsettings command-line tool - #2310 contenttype test leaks xdg-mime internal data - #2390 GWeakRef's aren't cleared again on finalization (and not fully thread-safe) - #2394 Toggle refs notification may not handle multiple threads correctly - #2400 Use-after-free in invoke_set_property_in_idle_cb() - #2401 GDBus runtime warning from remove_interfaces() - #2404 GTask: clarify that GTask assumes are running mainloop - #2426 GSettings delayed apply generates runtime warnings - #2443 Add Windows 11 support to get_windows_version() - #2468 GSequence pessimizes itself and slows down - #2471 g_output_stream_write_all_async prints error when count == 0 and content == NULL - #2488 Unix password unit test fails on FreeBSD 13 - #2489 Add a (diagnostic) warning for finalized objects with floating refs - #2490 Upgrade to Unicode Character Database 14.0 - #2496 Wrong parameter type for g_simple_proxy_resolver_set_ignore_hosts - #2498 GIR: Remove non-existing IOModule methods `load`, `unload` - #2500 Able to export object manager and object on root path, but not other paths - #2503 gspawn.c may clobber target fds - #2505 g_network_monitor_nm never updates on connection change (listens for signal on wrong dbus interface) - #2506 gspawn.c fails to close child_err_report_fd if it is duped to avoid conflation with one of the target_fds - #2507 Strange behavior of GFileEnumerator with GVfs locations - #2514 test suite failure in glib/tests/gdatetime.c if German locale de_DE.ISO-8859-1 is available - #2518 Misleading message when privileged program starts G_BUS_TYPE_SESSION - #2520 g_date_new_ functions return NULL on invalid input - #2523 MacOS generates warnings for g_size_checked_mul() - #2526 fuzz_uri_parse failure - #2527 Error storing dictionary with string keys as GSettings on macOS - #2528 g_dbus_message_new_from_blob goes into infinite loop for certain inputs - #2529 load_user_special_dirs returns NULL in certain cases - #2530 g_log_writer_is_journald fails if a Journal Namespace is used - #2536 GDBusProxy: make g-signal detailed - #2537 GTestDBus dbus daemon causes child process to hang when using verbose output - #2541 g_canonicalize_filename should work in linear time complexity - #2553 Consider not depending on strtoull_l and strtoll_l as much - !1960 Add g_main_context_new_with_flags() and ownerless polling option - !1968 gspawn: Implement fd remapping for posix_spawn codepath, and fix file descriptor conflation issues - !1991 Keyfile parsing performance improvements - !2029 Updating xdgmime - !2064 gobject: Cleanup GWeakRef locations on object finalization - !2114 Coerce type cast to void* because it causes compiler warnings - !2191 docs: Add .editorconfig file - !2214 Document potential footgun with GTlsCertificateFlags and deprecate certain usages - !2223 Better detection of the cleanup attribute. - !2227 gdesktopappinfo: Emit "launched" signal for D-Bus activation too - !2242 gsettings: Add various missing (nullable) or (not nullable) annotations - !2244 gutils: Avoid segfault in g_get_user_database_entry - !2245 gdesktopappinfo: Do not call xterm when it does not exist, inform the caller the launch failed - !2246 gobject: Document it’s unsafe to call g_object_ref() from GWeakNotify - !2249 Add version macros for GLib 2.72 and bump version to 2.71.0 - !2251 GString: Bump minimum size - !2254 Small optimization for g_object_set - !2255 gobject: Clarify behaviour of adding weak refs during disposal - !2257 Fix documentation for g_dbus_object_manager_get_object(). - !2260 GWin32AppInfo: Do not assert about successful open'ing of registry keys - !2261 Provide built DLLs as Gitlab-CI artifacts - !2266 fix uninitial variable - !2273 Fix more (Windows) warnings - !2277 Revert "Don't compile some unused functions in gio/xdgmime/" - !2283 GDesktopAppInfo: Try to always correctly set id - !2284 update the proxy-libintl subproject to the latest release - !2285 fix issues found by svace static code analyzer - !2286 meson: fix warnings for extract_all_objects function - !2287 ci: Update CI images to latest stable Debian and Fedora, bump Meson dependency to 0.52 - !2288 Update g_source_remove doc comment: the function doesn't always return TRUE - !2289 Update g_source_remove documentation for the returned value - !2290 mkdir path specified by XDG_RUNTIME_DIR - !2292 Fix cast from pointer to integer of different size warning in gio/gwin32appinfo.c - !2293 glib-private: Fix MSVC build with AddressSanitizer - !2294 Fix windows warnings - !2295 gutf8: Document that out args from g_utf16_to_utf8() are non-negative - !2303 Fix more windows warnings - !2305 gio: document GFile API when relative path is absolute - !2306 gunixmounts: Drop references to pamconsole mount option - !2308 gthread-win32: Remove an unnecessary volatile qualifier - !2309 Rename libpcre.wrap to pcre.wrap - !2310 tests: Fix a typo in a test message in gdatetime.c - !2311 Fix always true comparison warning in glib/garray.c - !2319 docs: Fix the GListModel description - !2323 Fix final warnings in Windows code - !2324 Fix link to pcre-8.37.tar.bz2 - !2326 Improve some documentation related to GTlsDatabase - !2328 gutf8: add string length check when ending character offset is -1 - !2329 gdbus: Add --interactive option to `gdbus call` - !2332 Changed gendered terms to be gender-neutral - !2333 gsubprocess: Add G_SUBPROCESS_FLAGS_SEARCH_PATH_FROM_ENVP - !2336 tests: Drop arbitrary and flaky waits from actions tests - !2339 ci: Bump Meson version to 0.60.1 on macOS - !2341 tests: Wait for gdbus-testserver to die when killing it - !2342 tests: Reformat mkenums.py slightly to make run-black.sh happy - !2345 gutils: Disable some dead code on macOS - !2347 Removing tests/asyncqueue-test.c from tests/ - !2348 gio/tests/codegen.py: bump timeout to 100 seconds - !2349 Annotate `g_getenv()` and `g_environ_getenv()` return value as `nullable` - !2352 tests: Fix a flaky wait in converter-stream - !2353 Address some oddities around GResolver::reload - !2357 ci: Upgrade to clang-format-11 from clang-format-7 - !2360 meson: specify when commands need to succeed in run_command - !2364 tests: Allow `objcopy --help` to fail, because it fails on FreeBSD - !2365 Add vfunc checks in gappinfo.c - !2368 De-duplicate g_nearest_pow() implementation and add some overflow protections to g_ptr_array_maybe_expand(), g_string_maybe_expand() and g_string_chunk_insert_len() - !2370 gqsort: Move test to glib/tests/ - !2371 Freeze notification during object destruction - !2372 docs: Improve GVariant docs - !2373 glib.supp: Suppress one-time allocation in g_get_home_dir() - !2376 GSource: move test to glib/tests/ - !2379 Merging tests/bit-test.c into glib/tests/utils.c - !2381 tests: Test the function forms of g_bit_*() APIs too - !2382 gfileutils: Correctly reset start value when canonicalising paths - !2385 gfileutils: Fix transfer annotation and whitespace issues - !2386 docs: Add API documentation links to the README - !2387 docs: Update the README a little - !2390 Merging tests/child-test.c into glib/tests/spawn-multithreaded.c - !2391 Removing redundant cxx test tests/cxx-test.cpp - !2392 Move tests/completion-test.c to glib/tests/completion.c - !2393 Removing unnecessary test on gdatetime.c - !2396 fuzzing: Add a fuzz test for parsing DNS records - !2397 Moving tests/dirname-test.c to glib/tests/fileutils.c - !2398 fix /list/position test To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/gdbus-codegen/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/gdbus-codegen/PLIST cvs rdiff -u -r1.32 -r1.33 pkgsrc/devel/gdbus-codegen/distinfo cvs rdiff -u -r1.100 -r1.101 pkgsrc/devel/glib2/Makefile.common cvs rdiff -u -r1.137 -r1.138 pkgsrc/devel/glib2/PLIST cvs rdiff -u -r1.299 -r1.300 pkgsrc/devel/glib2/distinfo cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/glib2-tools/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/glib2/patches/patch-gio_meson.build cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/glib2/patches/patch-glib_meson.build cvs rdiff -u -r1.16 -r1.17 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. --_----------=_1658697896125290 Content-Disposition: inline Content-Length: 15981 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/gdbus-codegen/Makefile diff -u pkgsrc/devel/gdbus-codegen/Makefile:1.26 pkgsrc/devel/gdbus-codegen/Makefile:1.27 --- pkgsrc/devel/gdbus-codegen/Makefile:1.26 Thu Jun 30 11:18:13 2022 +++ pkgsrc/devel/gdbus-codegen/Makefile Sun Jul 24 21:24:55 2022 @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.26 2022/06/30 11:18:13 nia Exp $ +# $NetBSD: Makefile,v 1.27 2022/07/24 21:24:55 wiz Exp $ -PKGREVISION= 1 .include "../../devel/glib2/Makefile.common" PKGNAME:= ${PKGNAME:S/glib2/gdbus-codegen/} Index: pkgsrc/devel/gdbus-codegen/PLIST diff -u pkgsrc/devel/gdbus-codegen/PLIST:1.3 pkgsrc/devel/gdbus-codegen/PLIST:1.4 --- pkgsrc/devel/gdbus-codegen/PLIST:1.3 Mon Jun 3 09:53:50 2019 +++ pkgsrc/devel/gdbus-codegen/PLIST Sun Jul 24 21:24:55 2022 @@ -1,9 +1,10 @@ -@comment $NetBSD: PLIST,v 1.3 2019/06/03 09:53:50 prlw1 Exp $ +@comment $NetBSD: PLIST,v 1.4 2022/07/24 21:24:55 wiz Exp $ bin/gdbus-codegen share/glib-2.0/codegen/__init__.py share/glib-2.0/codegen/codegen.py share/glib-2.0/codegen/codegen_docbook.py share/glib-2.0/codegen/codegen_main.py +share/glib-2.0/codegen/codegen_rst.py share/glib-2.0/codegen/config.py share/glib-2.0/codegen/dbustypes.py share/glib-2.0/codegen/parser.py Index: pkgsrc/devel/gdbus-codegen/distinfo diff -u pkgsrc/devel/gdbus-codegen/distinfo:1.32 pkgsrc/devel/gdbus-codegen/distinfo:1.33 --- pkgsrc/devel/gdbus-codegen/distinfo:1.32 Thu Mar 31 11:54:54 2022 +++ pkgsrc/devel/gdbus-codegen/distinfo Sun Jul 24 21:24:55 2022 @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.32 2022/03/31 11:54:54 adam Exp $ +$NetBSD: distinfo,v 1.33 2022/07/24 21:24:55 wiz Exp $ -BLAKE2s (glib-2.70.5.tar.xz) = 3569eed599ae7b2ba7204fa6cd5cbca0920c82a0a16eabb0d7f7b0828726e75b -SHA512 (glib-2.70.5.tar.xz) = 3dfb45a9b6fe67fcf185f5cbb3985b6f1da17caf9c6f01e638d8fe4a6271ea1a30b0cf4ca8f43728bd29a8ac13b05a34e1cf262ade7795f0c0d0a2c0b90b1ff8 -Size (glib-2.70.5.tar.xz) = 4822784 bytes +BLAKE2s (glib-2.72.2.tar.xz) = ed97c124af002c0796e0e539628a9f1cab2c994602e80e7be9e60ddf68d2948c +SHA512 (glib-2.72.2.tar.xz) = 9a1121be1d5b1de50fb732d55298a8deb6e6e7fe02e06ab18fdfbc51a0f0d77c13c5faf29a227b5746b0f8c1c0502fc79c36cef2b7a62c4701b9deffe5887e69 +Size (glib-2.72.2.tar.xz) = 4891264 bytes SHA1 (patch-meson.build) = 4f9d178950414e1537b48a552d63c9e551801999 Index: pkgsrc/devel/glib2/Makefile.common diff -u pkgsrc/devel/glib2/Makefile.common:1.100 pkgsrc/devel/glib2/Makefile.common:1.101 --- pkgsrc/devel/glib2/Makefile.common:1.100 Thu Mar 31 11:54:54 2022 +++ pkgsrc/devel/glib2/Makefile.common Sun Jul 24 21:24:56 2022 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.100 2022/03/31 11:54:54 adam Exp $ +# $NetBSD: Makefile.common,v 1.101 2022/07/24 21:24:56 wiz Exp $ # used by devel/gdbus-codegen/Makefile # used by devel/glib2/Makefile # used by devel/glib2-tools/Makefile -DISTNAME= glib-2.70.5 +DISTNAME= glib-2.72.2 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.137 pkgsrc/devel/glib2/PLIST:1.138 --- pkgsrc/devel/glib2/PLIST:1.137 Thu Mar 31 11:54:54 2022 +++ pkgsrc/devel/glib2/PLIST Sun Jul 24 21:24:56 2022 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.137 2022/03/31 11:54:54 adam Exp $ +@comment $NetBSD: PLIST,v 1.138 2022/07/24 21:24:56 wiz Exp $ ${PLIST.nococoa}bin/gapplication bin/gdbus bin/gio @@ -11,14 +11,11 @@ bin/gresource bin/gsettings ${PLIST.nococoa}include/gio-unix-2.0/gio/gdesktopappinfo.h include/gio-unix-2.0/gio/gfiledescriptorbased.h -include/gio-unix-2.0/gio/gunixconnection.h -include/gio-unix-2.0/gio/gunixcredentialsmessage.h include/gio-unix-2.0/gio/gunixfdlist.h include/gio-unix-2.0/gio/gunixfdmessage.h include/gio-unix-2.0/gio/gunixinputstream.h include/gio-unix-2.0/gio/gunixmounts.h include/gio-unix-2.0/gio/gunixoutputstream.h -include/gio-unix-2.0/gio/gunixsocketaddress.h include/glib-2.0/gio/gaction.h include/glib-2.0/gio/gactiongroup.h include/glib-2.0/gio/gactiongroupexporter.h @@ -63,6 +60,8 @@ include/glib-2.0/gio/gdbusobjectskeleton include/glib-2.0/gio/gdbusproxy.h include/glib-2.0/gio/gdbusserver.h include/glib-2.0/gio/gdbusutils.h +include/glib-2.0/gio/gdebugcontroller.h +include/glib-2.0/gio/gdebugcontrollerdbus.h include/glib-2.0/gio/gdrive.h include/glib-2.0/gio/gdtlsclientconnection.h include/glib-2.0/gio/gdtlsconnection.h @@ -114,7 +113,6 @@ include/glib-2.0/gio/gnetworking.h include/glib-2.0/gio/gnetworkmonitor.h include/glib-2.0/gio/gnetworkservice.h include/glib-2.0/gio/gnotification.h -${PLIST.cocoa}include/glib-2.0/gio/gosxappinfo.h include/glib-2.0/gio/goutputstream.h include/glib-2.0/gio/gpermission.h include/glib-2.0/gio/gpollableinputstream.h @@ -166,6 +164,9 @@ include/glib-2.0/gio/gtlsfiledatabase.h include/glib-2.0/gio/gtlsinteraction.h include/glib-2.0/gio/gtlspassword.h include/glib-2.0/gio/gtlsserverconnection.h +include/glib-2.0/gio/gunixconnection.h +include/glib-2.0/gio/gunixcredentialsmessage.h +include/glib-2.0/gio/gunixsocketaddress.h include/glib-2.0/gio/gvfs.h include/glib-2.0/gio/gvolume.h include/glib-2.0/gio/gvolumemonitor.h @@ -261,6 +262,7 @@ include/glib-2.0/glib/gversionmacros.h include/glib-2.0/glib/gwin32.h include/glib-2.0/gmodule.h include/glib-2.0/gobject/gbinding.h +include/glib-2.0/gobject/gbindinggroup.h include/glib-2.0/gobject/gboxed.h include/glib-2.0/gobject/gclosure.h include/glib-2.0/gobject/genums.h @@ -273,6 +275,7 @@ include/glib-2.0/gobject/gobjectnotifyqu include/glib-2.0/gobject/gparam.h include/glib-2.0/gobject/gparamspecs.h include/glib-2.0/gobject/gsignal.h +include/glib-2.0/gobject/gsignalgroup.h include/glib-2.0/gobject/gsourceclosure.h include/glib-2.0/gobject/gtype.h include/glib-2.0/gobject/gtypemodule.h @@ -285,19 +288,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.7000.5 +lib/libgio-2.0.so.0.7200.2 lib/libglib-2.0.so lib/libglib-2.0.so.0 -lib/libglib-2.0.so.0.7000.5 +lib/libglib-2.0.so.0.7200.2 lib/libgmodule-2.0.so lib/libgmodule-2.0.so.0 -lib/libgmodule-2.0.so.0.7000.5 +lib/libgmodule-2.0.so.0.7200.2 lib/libgobject-2.0.so lib/libgobject-2.0.so.0 -lib/libgobject-2.0.so.0.7000.5 +lib/libgobject-2.0.so.0.7200.2 lib/libgthread-2.0.so lib/libgthread-2.0.so.0 -lib/libgthread-2.0.so.0.7000.5 +lib/libgthread-2.0.so.0.7200.2 lib/pkgconfig/gio-2.0.pc lib/pkgconfig/gio-unix-2.0.pc lib/pkgconfig/glib-2.0.pc @@ -309,8 +312,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.7000.5-gdb.py -share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.7000.5-gdb.py +share/gdb/auto-load/usr/pkg/lib/libglib-2.0.so.0.7200.2-gdb.py +share/gdb/auto-load/usr/pkg/lib/libgobject-2.0.so.0.7200.2-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.299 pkgsrc/devel/glib2/distinfo:1.300 --- pkgsrc/devel/glib2/distinfo:1.299 Thu Mar 31 11:54:54 2022 +++ pkgsrc/devel/glib2/distinfo Sun Jul 24 21:24:56 2022 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.299 2022/03/31 11:54:54 adam Exp $ +$NetBSD: distinfo,v 1.300 2022/07/24 21:24:56 wiz Exp $ -BLAKE2s (glib-2.70.5.tar.xz) = 3569eed599ae7b2ba7204fa6cd5cbca0920c82a0a16eabb0d7f7b0828726e75b -SHA512 (glib-2.70.5.tar.xz) = 3dfb45a9b6fe67fcf185f5cbb3985b6f1da17caf9c6f01e638d8fe4a6271ea1a30b0cf4ca8f43728bd29a8ac13b05a34e1cf262ade7795f0c0d0a2c0b90b1ff8 -Size (glib-2.70.5.tar.xz) = 4822784 bytes +BLAKE2s (glib-2.72.2.tar.xz) = ed97c124af002c0796e0e539628a9f1cab2c994602e80e7be9e60ddf68d2948c +SHA512 (glib-2.72.2.tar.xz) = 9a1121be1d5b1de50fb732d55298a8deb6e6e7fe02e06ab18fdfbc51a0f0d77c13c5faf29a227b5746b0f8c1c0502fc79c36cef2b7a62c4701b9deffe5887e69 +Size (glib-2.72.2.tar.xz) = 4891264 bytes SHA1 (patch-gio_gcredentialsprivate.h) = f719ae41a9eb1d2f04d866b246fa5176543f2df9 SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = ec8ce89da08059ebf953d84a1dca5a2b380349f4 SHA1 (patch-gio_giomodule.c) = 68e612ac178c41aa0aae2bd66c3e4263910711ac @@ -11,13 +11,13 @@ SHA1 (patch-gio_gresource-tool.c) = ad0e SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312 SHA1 (patch-gio_gunixmounts.c) = 6213fb2d4cb52af0ebbe794832e37dd3de9fd27f SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4 -SHA1 (patch-gio_meson.build) = 07c0fd5cc495b3bf3788cf77701a9ebc8df70115 +SHA1 (patch-gio_meson.build) = c2900405ed83fa84d5590b83c7bcf6f994694388 SHA1 (patch-gio_tests_gdbus-export.c) = 59d85ca079d02b52e33153c7d2ac1cc48c26707a SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6 SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8 SHA1 (patch-glib_genviron.c) = dd25be36536d56dfe933225d785eb65f753c4a97 SHA1 (patch-glib_gspawn.c) = 8f833edd594168fe62c5d0e161ebaafdebda2294 -SHA1 (patch-glib_meson.build) = 65cbe6e3bd650f8f2c37f003a48ef183700a6ef9 +SHA1 (patch-glib_meson.build) = 666a4dba0ad53acdf952946056b7a84bf5fdcf1e SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0 SHA1 (patch-glib_tests_meson.build) = d358bd579eb09655c608106092bdeed8f16ff4d0 @@ -25,5 +25,5 @@ SHA1 (patch-gmodule_gmodule-dl.c) = 13a6 SHA1 (patch-gmodule_gmodule.c) = a020920b8e5bad34550c9963eb2fc27bef24c5c9 SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d SHA1 (patch-gobject_meson.build) = 412b65558aa4cf9648ee84a57ad6dfcc988b1a1d -SHA1 (patch-meson.build) = b91bc6ef742c4281823dadf73c98df217a2f5951 +SHA1 (patch-meson.build) = a901c4443df1600e9a81504229b4df67229a9cd0 SHA1 (patch-meson_options.txt) = 7f633fbbfa9d9b2d958365891ffb9e4094d7dd54 Index: pkgsrc/devel/glib2-tools/Makefile diff -u pkgsrc/devel/glib2-tools/Makefile:1.10 pkgsrc/devel/glib2-tools/Makefile:1.11 --- pkgsrc/devel/glib2-tools/Makefile:1.10 Thu Jun 30 11:18:14 2022 +++ pkgsrc/devel/glib2-tools/Makefile Sun Jul 24 21:24:56 2022 @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.10 2022/06/30 11:18:14 nia Exp $ +# $NetBSD: Makefile,v 1.11 2022/07/24 21:24:56 wiz Exp $ -PKGREVISION= 1 .include "../../devel/glib2/Makefile.common" PKGNAME:= ${PKGNAME:S/glib2/glib2-tools/} Index: pkgsrc/devel/glib2/patches/patch-gio_meson.build diff -u pkgsrc/devel/glib2/patches/patch-gio_meson.build:1.8 pkgsrc/devel/glib2/patches/patch-gio_meson.build:1.9 --- pkgsrc/devel/glib2/patches/patch-gio_meson.build:1.8 Sun Nov 7 13:24:04 2021 +++ pkgsrc/devel/glib2/patches/patch-gio_meson.build Sun Jul 24 21:24:56 2022 @@ -1,10 +1,10 @@ -$NetBSD: patch-gio_meson.build,v 1.8 2021/11/07 13:24:04 adam Exp $ +$NetBSD: patch-gio_meson.build,v 1.9 2022/07/24 21:24:56 wiz Exp $ Disable inotify on SunOS. ---- gio/meson.build.orig 2021-10-28 12:34:36.000000000 +0000 +--- gio/meson.build.orig 2022-05-30 13:26:47.000000000 +0000 +++ gio/meson.build -@@ -755,7 +755,7 @@ gioenumtypes_c = custom_target('gioenumt +@@ -754,7 +754,7 @@ gioenumtypes_c = custom_target('gioenumt gioenumtypes_dep = declare_dependency(sources : [gioenumtypes_h, glib_enumtypes_h]) # inotify @@ -12,4 +12,4 @@ Disable inotify on SunOS. +if glib_conf.has('HAVE_SYS_INOTIFY_H') and have_func_inotify_init1 and host_system != 'sunos' subdir('inotify') internal_deps += [ inotify_lib ] - internal_objects += [inotify_lib.extract_all_objects(recursive: false)] + endif Index: pkgsrc/devel/glib2/patches/patch-glib_meson.build diff -u pkgsrc/devel/glib2/patches/patch-glib_meson.build:1.9 pkgsrc/devel/glib2/patches/patch-glib_meson.build:1.10 --- pkgsrc/devel/glib2/patches/patch-glib_meson.build:1.9 Tue Sep 29 10:43:33 2020 +++ pkgsrc/devel/glib2/patches/patch-glib_meson.build Sun Jul 24 21:24:56 2022 @@ -1,11 +1,11 @@ -$NetBSD: patch-glib_meson.build,v 1.9 2020/09/29 10:43:33 prlw1 Exp $ +$NetBSD: patch-glib_meson.build,v 1.10 2022/07/24 21:24:56 wiz Exp $ - Don't bother with gtester as it's slated for deprecation anyway: https://gitlab.gnome.org/GNOME/glib/issues/1441 ---- glib/meson.build.orig 2020-02-27 16:12:52.000000000 +0000 +--- glib/meson.build.orig 2022-05-30 13:26:47.000000000 +0000 +++ glib/meson.build -@@ -410,25 +410,8 @@ if host_system == 'windows' +@@ -431,25 +431,8 @@ if host_system == 'windows' include_directories : configinc, dependencies : [libglib_dep]) endif @@ -30,4 +30,4 @@ $NetBSD: patch-glib_meson.build,v 1.9 20 - install_data('glib_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb')) - gdb_conf = configuration_data() + # This is needed to make gdb find glib_gdb.py Index: pkgsrc/devel/glib2/patches/patch-meson.build diff -u pkgsrc/devel/glib2/patches/patch-meson.build:1.16 pkgsrc/devel/glib2/patches/patch-meson.build:1.17 --- pkgsrc/devel/glib2/patches/patch-meson.build:1.16 Fri Oct 15 15:04:47 2021 +++ pkgsrc/devel/glib2/patches/patch-meson.build Sun Jul 24 21:24:56 2022 @@ -1,4 +1,4 @@ -$NetBSD: patch-meson.build,v 1.16 2021/10/15 15:04:47 jperkin Exp $ +$NetBSD: patch-meson.build,v 1.17 2022/07/24 21:24:56 wiz Exp $ - On Darwin, optionally use Cocoa (needed for X11 users). @@ -12,9 +12,9 @@ $NetBSD: patch-meson.build,v 1.16 2021/1 - Define a newer POSIX, as we build this package with -std=gnu99 ---- meson.build.orig 2021-09-17 10:17:56.849962700 +0000 +--- meson.build.orig 2022-05-30 13:26:47.000000000 +0000 +++ meson.build -@@ -778,7 +778,7 @@ if host_system == 'darwin' +@@ -821,7 +821,7 @@ if host_system == 'darwin' #error "Detected GNUstep, not Cocoa" #endif''', name : 'Mac OS X Cocoa support') @@ -22,17 +22,8 @@ $NetBSD: patch-meson.build,v 1.16 2021/1 + glib_have_cocoa = glib_have_cocoa and get_option('use_cocoa') if glib_have_cocoa glib_conf.set('HAVE_COCOA', true) - 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', 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. -@@ -2118,18 +2118,17 @@ if host_system != 'windows' and get_opti + endif +@@ -2159,18 +2159,17 @@ if host_system != 'windows' and get_opti # try glibc if cc.has_function('getxattr') and cc.has_header('sys/xattr.h') @@ -53,7 +44,7 @@ $NetBSD: patch-meson.build,v 1.16 2021/1 if cc.compiles(glib_conf_prefix + ''' #include #ifdef HAVE_SYS_TYPES_H -@@ -2230,9 +2229,12 @@ endif +@@ -2271,9 +2270,12 @@ endif glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline) @@ -69,7 +60,7 @@ $NetBSD: patch-meson.build,v 1.16 2021/1 python_version = python.language_version() python_version_req = '>=3.5' -@@ -2241,7 +2243,7 @@ if not python_version.version_compare(py +@@ -2282,7 +2284,7 @@ if not python_version.version_compare(py endif # Determine which user environment-dependent files that we want to install @@ -78,7 +69,7 @@ $NetBSD: patch-meson.build,v 1.16 2021/1 bash_comp_dep = dependency('bash-completion', version: '>=2.0', required: false) have_sh = find_program('sh', required : false).found() # For glib-gettextize -@@ -2250,8 +2252,7 @@ env_program = find_program('env', requir +@@ -2291,8 +2293,7 @@ env_program = find_program('env', requir # FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578 if host_system == 'sunos' --_----------=_1658697896125290--