Skip to content

Commit

Permalink
glib2: update to 2.78.0
Browse files Browse the repository at this point in the history
Overview of changes in GLib 2.78.0, 2023-09-08
==============================================

* Bugs fixed:
  - #3095 Error handling of invalid GKeyFile string escape sequences changed in
    GLib 2.77.3 (Philip Withnall)
  - !3559 gdb: Workaround optimized out quark_seq_id
  - !3561 meson: fix `gnetworking.h` install tag
  - !3562 gthread: Annotate g_thread_exit() with G_NORETURN
  - !3564 Fix gutils-user-database unit test

Overview of changes in GLib 2.77.3, 2023-08-31
==============================================

* Bugs fixed:
  - #2575 GSettings schemas default value translations don't work when using
    l10n=time (Michael Catanzaro)
  - #3032 gdbus-codegen eats indentation in RST in XML comments (André)
  - #3051 g_dbus_connection_export_menu_model() is not thread_safe
  - #3061 Possible SEGV (null pointer deref) in distribute_method_call() (Philip
    Withnall)
  - #3083 `arg_data`  in GOptionEntry is not a list (Philip Withnall)
  - #3090 Possible SEGV (null pointer deref) in _g_resource_file_new() (Philip
    Withnall)
  - !3459 glib-unix: Clean up use of O_NONBLOCK
  - !3503 interim solution for macOS CI
  - !3519 meson: warn if -mms-bitfields is necessary
  - !3526 gnetworkaddress: use reentrant getservbyname_r() if available
  - !3527 tests: Use g_assert_*() rather than g_assert() in tree tests
  - !3528 gio-tool-info: Move translator comments so they’re visible
  - !3530 gregex: set default max stack size for PCRE2 JIT compiler to 512KiB
  - !3532 tests: Disable use of ptrace() in tests on BSD and macOS
  - !3533 ci: Only run pages CI job on scheduled job runs
  - !3534 ci: Further fix to pages CI job
  - !3535 Use 'meson setup' to configure
  - !3538 glib-unix: Accept O_CLOEXEC as well as FD_CLOEXEC in
    g_unix_open_pipe()
  - !3540 gio: Add gresource.dtd
  - !3541 gtestutils: Mention not ignoring SIGCHLD in g_test_trap_subprocess()
    docs
  - !3542 [th/gchildwatch-fail-message] gmain: improve g_warning() for failure
    in g_child_watch_dispatch()
  - !3543 [th/use-localtime-r] use localtime_r() in g_log_writer_format_fields()
  - !3545 gregex: if JIT stack limit is reached, fall back to interpretive
    matching
  - !3547 glib/gfileutils.c: use 64 bits for value in get_tmp_file()
  - !3550 glib/tests/asyncqueue.c: skip test_async_queue_timed in 2038 or later
  - !3553 Generate missing docs for out arguments
  - !3555 gkeyfile: Fix overwriting of GError

Overview of changes in GLib 2.77.2, 2023-08-12
==============================================

* Bugs fixed:
  - #3071 g_test_trap_subprocess and g_test_subprocess broken in 2.77.1 (Jonas
    Ådahl)
  - !3432 ci: Don’t run pipeline after merging a MR
  - !3520 Fix typos
  - !3521 GTree: Handle node counter overflow and return it as an unsigned value
  - !3523 gspawn, gdataset: Restore nullable callback functions

Overview of changes in GLib 2.77.1, 2023-07-30
==============================================

* Fix some regressions with `GKeyFile` comment handling (#3047, work by Gaël Bonithon)

* Improve handling of query and fragment components in `file:` URIs (#3050, work by Lukáš Tyrychtr)

* Bugs fixed:
  - #473 systemtap probes for gvariant (Allison Karlitskaya)
  - #623 g_type_query() doesn't work for dynamic types (Philip Withnall)
  - #931 Optimise GPrivate by removing one malloc (Allison Karlitskaya)
  - #2929 gio: Failing build due to race generating glib/gversionmacros.h (Eric
    van Gyzen)
  - #3045 2.77.0: gio pkg-config test has incorrect install location for gio-
    querymodules & glib-compile-schemas (Philip Withnall)
  - #3047 2.77.0 changes formatting of keyfiles (Gaël Bonithon)
  - #3048 Forcing fallback for libintl does not work (Brendan Shanks)
  - #3050 g_file_new_for_uri() handles query strings incorrectly ("?") (Lukáš
    Tyrychtr)
  - #3054 Fedora installer (anaconda) crashes early with glib 2.77.0 due to
    "Attempt to unlock mutex that was not locked", when it runs `hwclock` and
    changes the system time (Thomas Haller, Philip Withnall)
  - !3287 Audit and fix incorrect use of (closure) in glib
  - !3461 gfileinfo: add file_path methods for language bindings
  - !3485 docs: Expand supported platforms documentation a little
  - !3494 ci: Manually fetch submodules for style-check CI jobs
  - !3495 gdbus-codegen: Error on invalid dbus types
  - !3496 garray: Fix typo in doc comment of g_ptr_array_sort[_with_data]()
  - !3499 strfuncs: Add missing ownership annotations for returned string
    vectors
  - !3504 Revert "build/gmodule-2.0.pc: Move compiler flags from Libs to Cflags"
  - !3505 meson: help gobject-introspection locate source and build dirs
  - !3509 build-sys: drop -mms-bitfields GCC flag
  - !3510 testutils: Use prctl PR_SET_DUMPABLE to silence core dumps on Linux
  - !3514 Revert "build-sys: drop -mms-bitfields GCC flag"
  - !3515 gnetworkmonitor: Expand guidelines for metered data use
  - !3517 tests: Add some more tests for g_type_query()
  - !3518 m4macros: drop unused m4 files

Overview of changes in GLib 2.77.0, 2023-07-06
==============================================

* Fix `GSocketClient` connecting to a proxy if the port is not specified
  (#2832, work by Michael Catanzaro)

* Support using `copy_file_range()` in `g_file_copy()`, if available (#2863,
  work by Philip Withnall)

* Improve handling of comments above groups in key files (#2927,
  work by Gaël Bonithon)

* Re-upgrade missing attribute debugs to criticals in `GFileInfo` (#2951,
  work by Philip Withnall)

* Do not redefine NULL on C++ (#2973, work by Marco Trevisan)

* Make `g_signal_handlers_block_matched()` work for `G_SIGNAL_MATCH_ID`
  (#2980, work by Przemyslaw Gorszkowski)

* Fixes to support building with bionic libc better (#3008, work by Øyvind Kolås)

* Fix potential stack overflow in gspawn on macOS if open file limit is very
  high (#3024, work by Dario Saccavino)

* Fix support for `--force-fallback-for libpcre` in meson configuration (#3025,
  work by Marius Kintel)

* Generate specific marshallers in `gdbus-codegen` (#3028, work by Marco Trevisan)

* Fix build failure on Android with `statx()` support (#3039, work by Philip Withnall)

* Improve locking performance of `GSignal` (!2824, work by Marco Trevisan)

* Improve locking performance of `g_main_context_iterate()` (!3235, work by
  Marco Trevisan)

* Add an inline definition of `g_free()` to automatically use `g_free_sized()`
  if available (!3252, work by Marco Trevisan)

* Fix race with `waitpid()` and `GChildWatchSource` (!3353, work by Thomas Haller)

* Add `glib_valgrind_suppressions` variable to glib pkg-config file (!3361, work
  by Marco Trevisan)

* Fix build on macOS SDK 10.11 (!3385, work by Peter Williams)

* Switch to using a separate thread pool and support timeouts in
  `GThreadedResolver` (!3397, work by Philip Withnall)

* Track pending `GTask`s if `G_ENABLE_DEBUG` is defined (!3404, work by Philip Withnall)

* Support GSignal fast path and more marshallers in `gobject_gdb.py` (!3437,
  work by Nelson Ben)

* Disable the macOS CI because it’s too unreliable — if you rely on GLib working
  on macOS, please get in touch and do something to help! (!3463, decision taken
  by Philip Withnall)

* Bugs fixed:
  - #65 glib-mkenums: parse_trigraph() chokes on quoted commas (Emmanuel Fleury)
  - #95 GMarkupParser documentation completion (David King)
  - #98 g_get_current_dir SIGSEGV on long path (Philip Withnall)
  - #104 Invocation of the interface "g_key_file_remove_comment" does not remove
    comment in specific case (Gaël Bonithon)
  - #116 Document UTF-8 behaviour and requirements throughout GLib (Philip
    Withnall)
  - #252 Disagreement between runtime and docs on whether interfaces are
    "classed" (Philip Withnall)
  - #322 gdbus-example-proxy-subclass.c is not complete. (Colin Walters)
  - #799 GAppInfoMonitor documentation deficiencies (Philip Withnall)
  - #1264 Use-after-free under
    send_message_with_reply_cleanup():gdbusconnection.c:1792 (Philip Withnall)
  - #2289 Document clearly that libgio is not guaranteed to be safe to use in
    setuid processes (Philip Withnall)
  - #2307 mainloop test leaks a GMainLoop object (Philip Withnall)
  - #2829 "glib-compile-resources --dependency-file=DEPFILE" creates wrong set
    of dependencies (Michael Catanzaro)
  - #2832 GSocketClient cannot proxy connect unless default port is explicitly
    specified in proxy URL (Michael Catanzaro)
  - #2855 gio/tests/socket-client.c name is too confusing because it does not
    use GSocketClient (Mike Salmela)
  - #2861 Check for __kernel_long_t when enabling futex()
  - #2863 Use copy_file_range() whenever possible in g_file_copy (Philip
    Withnall)
  - #2864 Documentation mentions non-existing function `g_value_free` (Philip
    Withnall)
  - #2879 Job #2498619 failed: gio/tests/socket.c:1654:test_reuse_tcp: assertion
    failed (error == (g-io-error-quark, 33)): error is NULL (Philip Withnall)
  - #2927 GKeyFile: Inconsistent behavior of comment writing above a group (Gaël
    Bonithon)
  - #2939 mkenums.py test fails on FreeBSD (Philip Withnall)
  - #2951 Re-upgrade missing attribute debugs to criticals in GFileInfo (Philip
    Withnall)
  - #2952 Not clear that GPollableInputStream methods are undefined if
    can_poll() returns FALSE (Philip Withnall)
  - #2953 Missing docs for GOption (commandline parser) (Sam Thursfield)
  - #2958 nbd server fails with glib 2.76.0
  - #2960 GDebugControllerDBus wrong default in documentation (Philip Withnall)
  - #2963 Probably wrong information regarding G_PLATFORM_WIN32 in
    README.win32.md
  - #2965 test_measure fails with coreutils 9.2 (Joan Bruguera)
  - #2966 Multiple Definition Error When Generating gio/tests/test5.gresource
    (Dan Yeaw)
  - #2969 user docs: GLib.DateTime.format: broken highlighting (Philip Withnall)
  - #2972 GtkFileLauncher: generated paths not recognized on Win32 (Luca Bacci)
  - #2973 Build failed due to NULL pointer redefinition in C++ (Marco Trevisan
    (Treviño))
  - #2980 g_signal_handlers_block_matched does not work for G_SIGNAL_MATCH_ID
    (Przemyslaw Gorszkowski)
  - #2982 Build randomly fails with: 'gmodule/gmodule-visibility.h' file not
    found (Marco Trevisan (Treviño))
  - #2993 g_dbus_interface_skeleton_get_vtable misses transfer annotation and is
    not introspectable
  - #2997 g_assert_cmpuint() should display positive, not negative values (Eric
    Blake)
  - #3003 glib-compile-schemas failed on directory name with no Latin symbols
    (Daniyar Tleulin)
  - #3007 GOptionContext group headings missing colon at the end (Philip
    Withnall)
  - #3008 Adaptations for building with bionic libc under termux (Øyvind Kolås)
  - #3020 Races in gio/tests/portal-support-snap* tests
  - #3024 Possible stack overflow in gspawn on MacOS
  - #3025 libpcre and libintl cannot be chosen to use the builtins
  - #3027 action exporter fails in the presence of actions with maybe parameter
    types (Matthias Clasen)
  - #3028 gdbus-codegen should generate marshallers (Marco Trevisan (Treviño))
  - #3030 Document GListModel requiring unique instance pointers from
    GListModelInterface.get_item (Christian Hergert)
  - #3034 futex based g_mutex_lock sometimes splatters errno with EAGAIN on
    contended locks
  - #3039 Build failure due to statx fields with NDK r25.c (Philip Withnall)
  - #3040 gtester in custom_target() run against system rather than built
    libglib during build
  - !2824 gsignal: Reduce lock/unlock pairs and ensure we always work on valid
    signal nodes
  - !3146 Make GVariant/GHash opaque types compatible with CHERI
  - !3235 gmain: Avoid some lock/unlock dance during g_main_context_iterate
  - !3252 gmem: Add an inline definition of g_free() to automatically use
    g_free_sized()
  - !3289 Work around an UCRT issue with _wspawn() functions taking an envp
    block
  - !3306 gregistrysettingsbackend: Allow a different root key path
  - !3308 doc: Workaround missing API index
  - !3314 gmain: More explicitly document g_main_context_release() prereqs
  - !3326 unicode: add tests for g_utf8_normalize() and empty strings
  - !3333 build: Drop old .gitignore files from test directories
  - !3335 meson: allow -Dlibelf=enabled without pkg-config
  - !3337 gio-tool-info: Fix a duplicate attribute name in the UI
  - !3340 meson: Move msvc_recommended_pragmas.h to a subdirectory
  - !3341 g_utf8_normalize: don't read past the end of the buffer
  - !3342 Add fuzzing harness for g_utf8_normalize()
  - !3344 tools: Drop check-abis.sh script
  - !3345 docs: Drop section about default branch renaming from README.md
  - !3347 gsocket/inotify/gwakeup: Use SOCK_NONBLOCK and O_NONBLOCK to avoid
    fcntl() syscalls where possible
  - !3351 tests: Update Unicode normalisation tests from Unicode 15
  - !3352 meson: Fix detection of a system-provided proxy-libintl
  - !3353 [th/child-watch-waitpid] fix race with waitpid() and child watcher
    sources
  - !3356 build/gmodule-2.0.pc: Move compiler flags from Libs to Cflags
  - !3357 Make clang++ happier when using G_STATIC_ASSERT
  - !3361 meson: Add glib_valgrind_suppressions variable to glib pkg-config file
  - !3365 gwin32: Avoid use of function call with side effect in g_return_*
    macro
  - !3366 Add init macros for refcounting types
  - !3367 actiongroup: Add a compiler warning
  - !3371 Explicitly mark size parameter as (in)
  - !3377 gsignal: Clarify documentation for GSignalMatchType matching
  - !3378 build: Post-release version bump
  - !3381 gtimer: Avoid doing anything on g_usleep (0)
  - !3382 gsocket: Explicitly mark size parameter as (in)
  - !3383 add g_timeout_add_seconds_once
  - !3384 Test g_signal_handlers_disconnect_matched for G_SIGNAL_MATCH_ID match
  - !3385 gio: fix build on older macOS SDKs
  - !3388 appmonitor: Skip the test under OSX
  - !3389 glib/tests/[rec-]mutex: Allow each thread to work
  - !3390 Fix error format in gio/gunixconnection.c (part 2)
  - !3392 gvariant: Fix doc for g_variant_new_object_path
  - !3393 Fix small issues in docs
  - !3395 gtask: Document that g_task_run_in_thread() uses a shared resource
  - !3396 glib-unix: Improve documentation for g_unix_fd_source_new()
  - !3397 gthreadedresolver: Switch to using a separate thread pool and support
    timeouts
  - !3398 Avoid having g_futex_simple() inadvertently modify errno
  - !3399 meson: wrap html documentation generation with gtk_doc option
  - !3400 restore error messages in gunixconnection while maintaining older
    compiler support
  - !3401 ci: Disable the Coverity CI job
  - !3404 gtask: Track pending GTasks if G_ENABLE_DEBUG is defined
  - !3405 gthreadedresolver: Remove some incorrect assertions
  - !3406 gthreadpool: Clarify that item_free_func is not normally called
  - !3407 gregistrysettingsbackend: Remove translatable pspec nick/blurb
  - !3408 docs: Update/Drop txt documents from docs directory
  - !3409 docs: Don’t ignore gunixfdlist.h when building docs on Windows
  - !3410 tests: Add descriptions to environment tests
  - !3416 gtestutils: Fix section marker in documentation
  - !3418 docs: Add lb90 as a Windows maintainer
  - !3419 docs: Update various broken/redirected links and fix list formatting
  - !3420 gtestutils: print timing information per test case in TAP output
  - !3421 glib/tests/fileutils:fix asserts when running as root
  - !3422 Check for linux/netlink.h buildability
  - !3423 gstring: add g_string_new_take
  - !3425 gwin32networkmonitor: Fix returning address of local variable
  - !3426 gdataset, gobject: Use atomic compare and exchange full to set
    pointers
  - !3429 Rename GTK+ to GTK (mostly comments and documentation)
  - !3430 gobject_gdb.py: fix regression caused by bfbe7127d5
  - !3431 gfile: Ensure loff_t is defined on FreeBSD
  - !3435 Ignore g_task_print_alive_task() when introspecting GIO
  - !3437 gobject_gdb.py: support gsignal fastpath and detect more marshallers
  - !3438 gio: Check cancellable iterating local file enumerator
  - !3439 gstring: Add `Since` marker to `g_string_new_take()`
  - !3440 gutf8: Add a g_utf8_truncate_middle() function
  - !3441 Allow proper introspection of GTypeValueTable
  - !3442 gio: Add g_file_new_build_filenamev
  - !3448 meson: try iconv in libintl lookup
  - !3449 docs: Move README.win32.md to the docs folder and update
    CONTRIBUTING.md
  - !3450 gactionmap: Add g_action_map_remove_action_entries()
  - !3453 docs: Use the type name as the section name for GKeyFile
  - !3455 gfileinfo: add (type filename) annotation to symlink_target functions
  - !3456 gmain: Document that g_steal_fd() preserves errno
  - !3458 gstdio: Improve documentation of some functions as async-signal safe
  - !3462 tests: Reduce thread and iteration count on CI for /thread/rec-mutex3
  - !3463 ci: Disable the macOS CI
  - !3465 gobject_gdb.py: adapt to recent gsignal changes
  - !3466 resolver: Add space in documentations
  - !3470 pcre subproject fixes: Allow fallback & static build
  - !3471 gio-tool-mount: Add option to show progress when unmounting
  - !3472 tests: Fix an intermittent timing error with testing g_usleep(0)
  - !3477 gdbus-codegen: Fix some minor typos in the documentation
  - !3484 docs: Fix a typo in the backports policy
  - !3486 docs: Document issue and merge request triaging and review guidelines
  - !3488 codegen: Use g_signal_emit to emit signals
  - !3489 guniprop: fix param direction in g_unichar_get_mirror_char(), for
    introspection
  - !3490 gobject/tests: Fix running on 32-bit Windows
  • Loading branch information
0-wiz-0 committed Nov 2, 2023
1 parent 674249b commit 8724023
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 39 deletions.
8 changes: 4 additions & 4 deletions devel/gdbus-codegen/distinfo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.43 2023/09/16 03:09:02 adam Exp $
$NetBSD: distinfo,v 1.44 2023/11/02 13:17:27 wiz Exp $

BLAKE2s (glib-2.76.5.tar.xz) = b2c01bf2b8fce596ef8cc8a9da820c382d9279096f47bacd22a4f054f1e0122c
SHA512 (glib-2.76.5.tar.xz) = 190a98e9a0ebb802a31b511e95725ed1fec9d750aed6bd87f14f3047d1f1d79458be3fa954fd6eb9af9f481a8deeaae73c95c990f5aa002a4b1166372ed4c4f1
Size (glib-2.76.5.tar.xz) = 5278804 bytes
BLAKE2s (glib-2.78.0.tar.xz) = 78edc6a5a30f54ddade7508b0005fc439fe268471db4c7a1bc292721077ca608
SHA512 (glib-2.78.0.tar.xz) = 3d06890002f4b13f831c83fbb70cfce529f9750e30888619e4d6277116be15d106379a03143412cf4b2a289c0cbdbbc299ecf17284fbffc06c791ecf7556c765
Size (glib-2.78.0.tar.xz) = 5327096 bytes
SHA1 (patch-meson.build) = 4f9d178950414e1537b48a552d63c9e551801999
12 changes: 8 additions & 4 deletions devel/glib2/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.296 2023/10/23 06:37:38 wiz Exp $
# $NetBSD: Makefile,v 1.297 2023/11/02 13:17:26 wiz Exp $

.include "Makefile.common"

Expand Down Expand Up @@ -37,15 +37,19 @@ MESON_CROSS.NetBSD.have_unix98_printf= true
MESON_CROSS.hppa.growing_stack= true
.endif

REPLACE_PYTHON+= gio/gio-querymodules-wrapper.py
REPLACE_PYTHON+= gio/tests/gengiotypefuncs.py
REPLACE_PYTHON+= gio/tests/memory-monitor-dbus.py.in
REPLACE_PYTHON+= gio/tests/memory-monitor-portal.py.in
REPLACE_PYTHON+= gio/tests/static-link.py
REPLACE_PYTHON+= glib/gtester-report.in
REPLACE_PYTHON+= glib/update-gtranslit.py
REPLACE_PYTHON+= gobject/tests/mkenums.py
REPLACE_PYTHON+= tests/gen-casefold-txt.py
REPLACE_PYTHON+= tests/gen-casemap-txt.py

SUBST_CLASSES+= python
SUBST_STAGE.python= post-build
SUBST_FILES.python+= output/glib/gtester-report
SUBST_MESSAGE.python+= Fixing path to Python.
SUBST_SED.python+= -e "s,^\(.*\)/usr/bin/env.*,\1${PYTHONBIN},"

GIO_MODULES_DIR= ${PREFIX}/lib/gio/modules
OWN_DIRS= ${GIO_MODULES_DIR}
Expand Down
4 changes: 2 additions & 2 deletions devel/glib2/Makefile.common
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# $NetBSD: Makefile.common,v 1.111 2023/09/16 03:09:01 adam Exp $
# $NetBSD: Makefile.common,v 1.112 2023/11/02 13:17:26 wiz Exp $
# used by devel/gdbus-codegen/Makefile
# used by devel/glib2/Makefile
# used by devel/glib2-tools/Makefile

DISTNAME= glib-2.76.5
DISTNAME= glib-2.78.0
PKGNAME= ${DISTNAME:S/glib/glib2/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
EXTRACT_SUFX= .tar.xz
Expand Down
19 changes: 11 additions & 8 deletions devel/glib2/PLIST
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.150 2023/09/16 03:09:01 adam Exp $
@comment $NetBSD: PLIST,v 1.151 2023/11/02 13:17:26 wiz Exp $
${PLIST.nococoa}bin/gapplication
bin/gdbus
bin/gio
Expand All @@ -9,6 +9,8 @@ bin/glib-gettextize
bin/gobject-query
bin/gresource
bin/gsettings
bin/gtester
bin/gtester-report
${PLIST.nococoa}include/gio-unix-2.0/gio/gdesktopappinfo.h
include/gio-unix-2.0/gio/gfiledescriptorbased.h
include/gio-unix-2.0/gio/gunixfdmessage.h
Expand Down Expand Up @@ -293,19 +295,19 @@ include/glib-2.0/gobject/gvaluetypes.h
lib/glib-2.0/include/glibconfig.h
lib/libgio-2.0.so
lib/libgio-2.0.so.0
lib/libgio-2.0.so.0.7600.5
lib/libgio-2.0.so.0.7800.0
lib/libglib-2.0.so
lib/libglib-2.0.so.0
lib/libglib-2.0.so.0.7600.5
lib/libglib-2.0.so.0.7800.0
lib/libgmodule-2.0.so
lib/libgmodule-2.0.so.0
lib/libgmodule-2.0.so.0.7600.5
lib/libgmodule-2.0.so.0.7800.0
lib/libgobject-2.0.so
lib/libgobject-2.0.so.0
lib/libgobject-2.0.so.0.7600.5
lib/libgobject-2.0.so.0.7800.0
lib/libgthread-2.0.so
lib/libgthread-2.0.so.0
lib/libgthread-2.0.so.0.7600.5
lib/libgthread-2.0.so.0.7800.0
lib/pkgconfig/gio-2.0.pc
lib/pkgconfig/gio-unix-2.0.pc
lib/pkgconfig/glib-2.0.pc
Expand All @@ -318,10 +320,11 @@ ${PLIST.nococoa}libexec/gio-launch-desktop
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.7600.5-gdb.py
share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.7600.5-gdb.py
share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.7800.0-gdb.py
share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.7800.0-gdb.py
share/gettext/its/gschema.its
share/gettext/its/gschema.loc
share/glib-2.0/dtds/gresource.dtd
share/glib-2.0/gdb/glib_gdb.py
share/glib-2.0/gdb/gobject_gdb.py
share/glib-2.0/gettext/po/Makefile.in.in
Expand Down
13 changes: 6 additions & 7 deletions devel/glib2/distinfo
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.314 2023/09/16 03:09:01 adam Exp $
$NetBSD: distinfo,v 1.315 2023/11/02 13:17:26 wiz Exp $

BLAKE2s (glib-2.76.5.tar.xz) = b2c01bf2b8fce596ef8cc8a9da820c382d9279096f47bacd22a4f054f1e0122c
SHA512 (glib-2.76.5.tar.xz) = 190a98e9a0ebb802a31b511e95725ed1fec9d750aed6bd87f14f3047d1f1d79458be3fa954fd6eb9af9f481a8deeaae73c95c990f5aa002a4b1166372ed4c4f1
Size (glib-2.76.5.tar.xz) = 5278804 bytes
BLAKE2s (glib-2.78.0.tar.xz) = 78edc6a5a30f54ddade7508b0005fc439fe268471db4c7a1bc292721077ca608
SHA512 (glib-2.78.0.tar.xz) = 3d06890002f4b13f831c83fbb70cfce529f9750e30888619e4d6277116be15d106379a03143412cf4b2a289c0cbdbbc299ecf17284fbffc06c791ecf7556c765
Size (glib-2.78.0.tar.xz) = 5327096 bytes
SHA1 (patch-gio_gcredentialsprivate.h) = f719ae41a9eb1d2f04d866b246fa5176543f2df9
SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = 76ed9658ac11fb33b97143938b6a60b5aa515cae
SHA1 (patch-gio_giomodule.c) = 8e12ba27d0f13f43cff9a4e2301edf67aba0d1fe
Expand All @@ -17,12 +17,11 @@ 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) = f1685d64dea7939e1b112c362fc05e849c870711
SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a
SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0
SHA1 (patch-glib_tests_meson.build) = b806c945ad3427858717c92eca5f3cbe1fc3effd
SHA1 (patch-glib_tests_meson.build) = 40ce43a49ae7084116facac6b3926c5e545f6721
SHA1 (patch-gmodule_gmodule.c) = a020920b8e5bad34550c9963eb2fc27bef24c5c9
SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
SHA1 (patch-gobject_meson.build) = a3953d33ba7e906ff1df024221ac3ab32f6c0c66
SHA1 (patch-meson.build) = 18fb6ac870718e9950cb2f1a20ad23b6b6475463
SHA1 (patch-meson.build) = d83c401359d96053a1959e90e29abbbfe27a024a
SHA1 (patch-meson_options.txt) = 7f633fbbfa9d9b2d958365891ffb9e4094d7dd54
8 changes: 5 additions & 3 deletions devel/glib2/patches/patch-glib_tests_meson.build
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
$NetBSD: patch-glib_tests_meson.build,v 1.4 2023/06/26 19:25:56 adam Exp $
$NetBSD: patch-glib_tests_meson.build,v 1.5 2023/11/02 13:17:27 wiz Exp $

Fix gtester is not defined error during configure.

--- glib/tests/meson.build.orig 2023-05-23 10:55:59.000000000 +0000
--- glib/tests/meson.build.orig 2023-09-08 13:42:18.000000000 +0000
+++ glib/tests/meson.build
@@ -475,19 +475,4 @@ endforeach
@@ -489,21 +489,6 @@ endforeach
# some testing of gtester functionality
# FIXME: Work around Meson not automatically using exe_wrapper around gtester
# https://github.com/mesonbuild/meson/issues/11029
Expand All @@ -24,3 +24,5 @@ Fix gtester is not defined error during configure.
- endif
-endif

if have_bash and have_pkg_config
prefix = get_option('prefix')
22 changes: 11 additions & 11 deletions devel/glib2/patches/patch-meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$NetBSD: patch-meson.build,v 1.18 2022/11/23 10:41:41 adam Exp $
$NetBSD: patch-meson.build,v 1.19 2023/11/02 13:17:27 wiz Exp $

- On Darwin, optionally use Cocoa (needed for X11 users).

Expand All @@ -12,18 +12,18 @@ $NetBSD: patch-meson.build,v 1.18 2022/11/23 10:41:41 adam Exp $

- Define a newer POSIX, as we build this package with -std=gnu99

--- meson.build.orig 2022-10-25 12:53:22.000000000 +0000
--- meson.build.orig 2023-09-08 13:42:18.000000000 +0000
+++ meson.build
@@ -874,7 +874,7 @@ if host_system == 'darwin'
@@ -926,7 +926,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)
endif
@@ -2167,18 +2167,17 @@ if host_system != 'windows' and get_opti
osx_ldflags += ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit']
@@ -2214,18 +2214,17 @@ if host_system != 'windows' and get_opti

# try glibc
if cc.has_function('getxattr') and cc.has_header('sys/xattr.h')
Expand All @@ -44,7 +44,7 @@ $NetBSD: patch-meson.build,v 1.18 2022/11/23 10:41:41 adam Exp $
if cc.compiles(glib_conf_prefix + '''
#include <stdio.h>
#ifdef HAVE_SYS_TYPES_H
@@ -2281,7 +2280,7 @@ glib_conf.set('HAVE_PROC_SELF_CMDLINE',
@@ -2328,7 +2327,7 @@ glib_conf.set('HAVE_PROC_SELF_CMDLINE',

python = import('python').find_installation()
# used for '#!/usr/bin/env <name>'
Expand All @@ -53,16 +53,16 @@ $NetBSD: patch-meson.build,v 1.18 2022/11/23 10:41:41 adam Exp $

python_version = python.language_version()
python_version_req = '>=3.5'
@@ -2290,7 +2289,7 @@ if not python_version.version_compare(py
endif
@@ -2338,7 +2337,7 @@ endif

# Determine which user environment-dependent files that we want to install
-have_bash = find_program('bash', required : false).found() # For completion scripts
bash = find_program('bash', required : false)
-have_bash = bash.found() # For completion scripts
+have_bash = false
bash_comp_dep = dependency('bash-completion', version: '>=2.0', required: false)
have_sh = find_program('sh', required : false).found() # For glib-gettextize

@@ -2299,8 +2298,7 @@ env_program = find_program('env', requir
have_pkg_config = find_program('pkg-config', required: false).found()
@@ -2348,8 +2347,7 @@ env_program = find_program('env', requir

# FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578
if host_system == 'sunos'
Expand Down

0 comments on commit 8724023

Please sign in to comment.