pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel
Module Name: pkgsrc
Committed By: wiz
Date: Tue Apr 9 16:57:18 UTC 2024
Modified Files:
pkgsrc/devel/gdbus-codegen: distinfo
pkgsrc/devel/gdbus-codegen/patches: patch-meson.build
pkgsrc/devel/glib2: Makefile Makefile.common PLIST distinfo
pkgsrc/devel/glib2/patches: patch-gio_gdbus-2.0_codegen_meson.build
patch-gio_tests_meson.build patch-meson.build
Added Files:
pkgsrc/devel/glib2/patches: patch-glib_gthread.c
patch-glib_tests_thread.c
Log Message:
glib2*: update to 2.80.0
Overview of changes in GLib 2.80.0, 2024-03-07
==============================================
* Bugs fixed:
- #3271 GLib: string malformed for gettext (Philip Withnall)
- !3940 tests: Don’t run check-missing-install-tag.py test under valgrind
(Philip Withnall)
- !3946 Add missing argument placeholders to several command-line tools (Simon
McVittie)
- !3947 docs: Fix a typo in the macros docs page (Philip Withnall)
- !3951 g_warn_if_fail: Document as always evaluating expr (Simon McVittie)
- !3953 docs: Specify gi-docgen as a native dependency (Bobby Rong)
- !3955 docs: Fix building with docs enabled and introspection disabled (Bobby
Rong)
- !3956 docs: Minor improvements to GSignal documentation (Philip Withnall)
Overview of changes in GLib 2.79.3, 2024-02-27
==============================================
* Various consistency improvements to the command line libgirepository tools
(!3926, !3927, !3928, !3930, work by Simon McVittie)
* Bugs fixed:
- #3080 Gimp GTK file chooser hang when a remote file is open (Luca Bacci)
- #3210 Critical using Open location: GWinHttpFile doesn’t set
G_FILE_ATTRIBUTE_STANDARD_TYPE (Luca Bacci)
- #3252 [2.79.1] gdatetime installed tests fails on s390x (Simon McVittie)
- #3255 g_base_info_clear on zero-initialized stack-allocated introspection
info (Philip Withnall)
- #3258 Possible memory leak in GUnixVolumeMonitor (Ondrej Holy)
- #3260 Add man pages for girepository tools
- #3262 msys2-mingw32 build failing with error code 3221225785 (0xc0000139)
(Philip Withnall)
- #3263 Ensure girepository tools are translatable (Philip Withnall)
- #3266 Use-after-free in gsocketclient.c:connection_attempt_remove() (Philip
Withnall)
- #3271 GLib: string malformed for gettext (Philip Withnall)
- !3918 tests: Don’t run lint tests under valgrind
- !3919 tests: Speed up threaded toggle notify test unless -m slow is passed
- !3921 ci: Fix printing the execution environment
- !3922 gdatetime test: Produce more helpful output on mismatches
- !3923 girepository test: Don't assume doubles are naturally-aligned
- !3925 girwriter: Take the GIRepository as a parameter
- !3926 gi- tools: Remove unused options, improve --debug/--verbose
- !3927 g-ir-compiler: Only accept one input file
- !3928 gi-decompile-typelib: Interpret --includedir as most-important-first
- !3930 migrating-gi: Document command-line option removals
- !3935 Restrict macOS CI to origin
- !3937 girepository: Fix static build under Windows
- !3945 tests: Remove variable-length lookbehind tests for GRegex
Overview of changes in GLib 2.79.2, 2024-02-12
==============================================
* More work to reduce lock contention and improve performance in GObject (#743,
!3869, !3873, work by Thomas Haller)
* More API changes to libgirepository, which is now stable as of this release
(#3155, #3217, #3218, #3231, #3234, #3243, #3244, #3245, #3246, work by
Philip Chimento, Evan Welsh, Philip Withnall)
* Import `g-ir-compiler`, `g-ir-generate` and `g-ir-inspect` from
gobject-introspection.git and update them to work with girepository-2.0,
renaming them to `gi-compile-repository`, `gi-decompile-typelib` and
`gi-inspect-typelib` (see docs/reference/girepository/migrating-gi.md) (!3853,
!3909, work by Evan Welsh, Philip Withnall)
* Add new `GLibUnix-2.0.gir`, `GLibWin32-2.0.gir`, `GioUnix-2.0.gir` and
`GioWin32-2.0.gir` GIRs which contain platform specific APIs, and are the
preferred way for third parties to access those APIs in future; although
platform specific APIs which were already exposed in `GLib-2.0.gir` and
`Gio-2.0.gir` continue to be listed there; the underlying `.so` files have not
changed (!3892, work by Philip Withnall)
* Bugs fixed:
- #743 GLib weak refs depend on cascade of locks, including global ones, which
makes them non-scalable
- #2887 memory-monitor-dbus.test fails in installed-tests suite (Philip
Withnall)
- #3198 Support --version in standard GApplication command line arguments
(Maxim Moskalets)
- #3217 Feedback on gobject-introspection: APIs for stack-allocated
introspection info (Philip Withnall)
- #3218 Segfault in gi_function_info_prep_invoker (Philip Withnall)
- #3231 New functions in the glib introspection data (Philip Withnall)
- #3234 Reference cycle between GIRepository and GIBaseInfos cached by it
(Philip Withnall)
- #3236 threaded_resolver_worker_cb leaks memory when lookup fails and
connection is already canceled (Philip Withnall)
- #3238 Python packaging module is missing on Hurd CI runner (Philip Withnall)
- #3240 Missing preconditions checks in GArray (Tobias Stoeckmann)
- #3242 Memory leak in gresources over libelf (Maxim Moskalets)
- #3243 Feedback on girepository 2.0: Naming of get_type_info vs load_type
(Philip Withnall)
- #3244 Feedback on girepository 2.0: Where to find uninstalled typelibs
(Philip Withnall)
- #3245 Feedback on girepository 2.0: GIBoxedInfo's place in the type
hierarchy (Philip Withnall)
- #3246 Wrong out parameter type in
gi_object_info_find_method_using_interfaces (Philip Withnall)
- #3247 safe_closefrom(), safe_fdwalk_set_cloexec() as public API (Simon
McVittie)
- !3797 Refactor GIRepository GIR generation to avoid cyclical dependency
- !3807 gprintf/gstrfuncs: Improve and port doc comments to gi-docgen
- !3824 gconvert: match GNU iconv behaviour on FreeBSD
- !3838 build: Add thorough test setup
- !3843 Add more test coverage for girepository
- !3845 gunixmounts: Use libmnt_monitor API for monitoring
- !3847 ci: Add ability to run manually some specific jobs
- !3848 Fix build with introspection on Windows
- !3849 girepository: Remove GI_FUNCTION_THROWS and GI_VFUNC_THROWS flags
- !3850 [th/strdup-in-ascii-strdown] glib: use g_strdup() in
g_ascii_strdown(),g_ascii_strup()
- !3851 ci: Fix post-merge CI pipelines
- !3853 girepository: Update gir-compiler and use it to compile GIRs
- !3854 girnode: Document ownership and element types of internal structs
- !3855 gitypelib: Replace multiple constructors with
gi_typelib_new_from_bytes()
- !3856 girepository: Drop gi_repository_get_default()
- !3859 [th/glib-private-const] glib: return const pointer from
glib__private__()
- !3860 tests: Fix typo in memory-monitor-portal.py.in
- !3861 girepository: Fix a memory leak of a mapped file
- !3865 [th/test-weak-notify] gobject/tests: add test checking that GWeakRef
is cleared in GWeakNotify
- !3866 [th/gobject-carray-comment] gobject: remove obsolete code comment
about CArray
- !3868 Link to the main context tutorial from the main loop docs
- !3869 [th/optimize-weak-ref-list] rework GObject's `WeakRefData` to track
references in an array instead of GSList
- !3870 Revert "Don't skip dbus-codegen tests on Win32"
- !3871 docs: Fix include path for the build
- !3872 gio: tests: Use slightly more explicit assert functions
- !3873 [th/datalist-shrink] shrink the interal buffer of `GData`
- !3874 Don't skip dbus-codegen tests on Win32
- !3876 build: Only override g-ir-compiler when GIR generation is enabled
- !3877 Various girepository fixes
- !3879 [th/gdataset-comment] gdataset: add code comment to
g_datalist_get_data()
- !3881 docs: Add migration guide for libgirepository
- !3886 codegen: Use `-` instead of `stdout` for output to stdout
- !3887 gtestutils: Ensure test_data is freed even if a test is skipped
- !3888 gitypes: Fix integer values of GIInfoType and add unit tests for
GIUnionInfo
- !3892 introspection: Generate separate GIR files and documentation for
platform specific APIs
- !3893 glocalfile: Support statvfs.f_type
- !3894 Minor fixes/docs changes to GFileDescriptorBased and GTask
- !3895 [th/meson-werror-fixes] some fixes for meson detection failure with
-Werror
- !3896 reuse: Add dep5 lines for gnulib and libcharset
- !3897 reuse: Fix screen-scraping expression for version 2.x
- !3898 Incorporate some lint checks into `meson test`
- !3900 gitypelib: Switch to refcounting
- !3901 girepository: Add length ‘out’ arguments to several getter methods
- !3902 gicallableinfo: Clarify docs for callables with no return type
- !3903 gibaseinfo: Rename gi_info_new() to gi_base_info_new()
- !3904 [th/meson-werror-fixes-2] more workarounds for compiler warnings in
meson compiler checks
- !3909 Rename g-ir-generate and g-ir-inspect and update to girepository-2.0
- !3911 glib/tests/unix: Mostly pass O_CLOEXEC to g_unix_pipe_open()
- !3912 glib-unix: Fix reference to FD_CLOEXEC in docs for g_unix_pipe_open()
- !3913 cmph: Fix a typo
- !3914 Revert "ci: Remove not-printable chars from generated junit file"
- !3916 tests: Skip lint tests if bash is not available
- !3917 ci: Build and tar libgirepository documentation
Overview of changes in GLib 2.79.1, 2024-01-22
==============================================
* Fix a race condition in `g_object_unref()` (#3064, work by Thomas Haller)
* Various API and build changes to libgirepository as it is not yet API-stable
(#3216, !3780, !3805, !3823, !3833, !3840)
* Build fixes on big-endian 64-bit systems and mips64el (#3225, #3226, work by
Simon McVittie)
* Reduce contention on global locks within GObject (!3774, work by Thomas
Haller)
* Allow building man pages without the reference documentation (!3817, work by
Simon McVittie)
* Bugs fixed:
- #1010 g_get_num_processor does not respect cpuset/affinity
- #3064 Crash under g_object_unref()
- #3093 GDBusMessage: should validate the type of all known headers (Philip
Withnall)
- #3207 Add support for syslog to Structured Logging
- #3216 Feedback on gobject-introspection: Casting to and from GIBaseInfo*
(Philip Withnall)
- #3222 pthread_t usages lack type name (Emmanuele Bassi)
- #3223 CLang, GMutexLocker: error: unused variable 'locker'
[-Werror,-Wunused-variable]
- #3225 2.79 regression: gdatetime test failing on 64-bit big-endian since
#3119
- #3226 resource test fails on Debian mips64el: test5.gresource is not linked
but the test assumes it should be (Simon McVittie)
- !3774 [th/g-object-priv] add private data to GObject and use per-object
locking
- !3780 girepository: Use standard types instead of glib specific
- !3789 gdatetime: Fix title of documentation comment
- !3792 build: Tell gi-docgen where to find the GIR files
- !3793 Shorten the title for D-Bus interface docs
- !3794 Add boxed GType for GRand
- !3795 girepository: Skip GIRepository versions not matching GIRepository-3.0
- !3798 docs: Drop outdated .gitignore files
- !3799 tests: Fix a minor leak in the new GParamSpecPool test
- !3800 ci: Re-enable and fix FreeBSD CI
- !3801 gmessages: Port all doc comments to gi-docgen
- !3802 [th/g-pointer-bit-lock-ext] glib: add g_pointer_bit_unlock_and_set()
and g_pointer_bit_lock_mask_ptr()
- !3803 ci: Fix tarballing the docs on dist
- !3805 girepository: Various small API cleanups
- !3806 gsignal.c: drop an optimization that is undefined behaviour
- !3808 glib/deprecated: Skip all the deprecated gthread api
- !3809 docs: Fix links to symbols outside the allowed namsepace
- !3810 gstrfuncs: Improve and port g_set_str() docs to gi-docgen
- !3811 gvariant-parser: Mention annotated types
- !3812 brz.c: Use uintptr_t instead of a hardcoded list of 64-bit arches
- !3813 gobject: define HAVE_OPTIONAL_FLAGS for sizeof(void*) > 8
- !3814 Fix typo in GPOINTER_TO_SIZE documentation
- !3817 docs: Allow building man pages without the reference documentation
- !3818 docs: Clarify >=2.76 changes to g_module_open()
- !3821 tests: Fix a minor leak in the socket test
- !3823 girepository: Misc cleanups
- !3826 genums: use g_once_init_enter_pointer for GType initializers
- !3827 array-test: Don't assume sizeof(void*)==sizeof(gsize)
- !3831 gvariant-core: Don’t call posix_memalign() with size==0
- !3833 girepository: Change various alignments to use size_t
- !3835 build: Ignore branches in g_clear_*() functions under lcov
- !3837 tests: A couple of test isolation improvements
- !3839 gvarianttype: Fix typos
- !3840 girepository: Exclude private symbols from the ABI
- !3841 docs: Fix member names of GLib.LogLevelFlags
- !3842 gio, gmodule, gthread: compile windows resources only in shared build
Overview of changes in GLib 2.79.0, 2023-12-22
==============================================
* Port to gi-docgen and drop gtk-doc support — dependencies have changed, and
Meson needs `-Ddocumentation` now rather than `-Dgtk_doc` (#3037, work by
multiple people)
* Move libgirepository into glib.git from gobject-introspection.git — but tools
like `g-ir-scanner` are currently still in gobject-introspection.git. For the
moment, glib.git needs to be built twice, once with `-Dintrospection=false`,
then build gobject-introspection.git, then re-build glib.git with
`-Dintrospection=true`. This process will evolve throughout the GLib 2.80
cycle. The API and ABI of libgirepository has changed, and accordingly its
version number has been bumped from 1.0 to 2.0 (note: the version number of
`GIRepository-*.gir` has been bumped from 2.0 to 3.0; see !3786). The GIR and
typelib file formats have not been changed, and are still at version 1.0.
(#3155, work by multiple people)
* Match behaviour for `GAppInfo` searches has changed (#3082, work by Nelson
Benítez León)
* Rename `GTK_USE_PORTAL` environment variable to `GIO_USE_PORTALS` (#3107,
work by Philip Withnall)
* Bump Meson dependency to 1.2.0 and depend on Python `packaging` module
(!3666, !3752)
Bugs fixed:
- #596 GApplication in Garbage Collected environments would benefit from a
g_application_command_line_exit() to enable remote instances to exit.
(Aleksandr Mezin)
- #791 Wish: Add a "nodelay" property to GSocket or GTcpConnection (Philip
Withnall)
- #2810 thread-pool-slow intermittent assertion failure in
test_thread_sort_entry_func() (Philip Withnall)
- #2824 G_REGEX_OPTIMIZE causes incorrect regex behaviour
- #2991 Drop translatable pspec nick/blurbs from properties in GIO (Sophie
Herold)
- #3082 Investigate prioritising prefix matches on GAppInfo keywords over
substring matches on names (Nelson Benítez León)
- #3087 glib doesn't cleanly unload on Windows (Luca Bacci)
- #3098 Make invalid escape sequences in GKeyFile fatal (Philip Withnall)
- #3103 mkenums: Can't parse an enum value with value ',' (Lukáš Tyrychtr)
- #3105 NetworkManager 1.44.0 crashes repeatedly with glib 2.78.0 (Philip
Withnall)
- #3107 Rename GTK_USE_PORTAL to avoid portal services being run with portals
force-enabled (Philip Withnall)
- #3111 gsubprocess-testprog.c: build error with cygwin (sys/ptrace.h: No such
file or directory) (Philip Withnall)
- #3112 Update to Unicode 15.1 (Philip Withnall)
- #3115 Support for additional strftime formatting capabilities
- #3116 gio clears modification time in microseconds when setting with
`set_modification_date_time` (Lukáš Tyrychtr)
- #3119 Add support for `%Ey` to g_date_time_format() (Philip Withnall)
- #3120 Build of glib 2.78.0 ignores -Dlibelf=disabled (Philip Withnall)
- #3128 glib-2.78.0 fails at gio/tests/gsubprocess.p/gsubprocess.c.o
- #3130 Segfault when creating GIO GPropertyAction without properties
- #3134 glib incompatible with Python 3.12 due to distutils usage
- #3135 Add GNU/Hurd CI
- #3140 Add a flag to not copy modification time when copying files (Khalid
Abu Shawarib)
- #3144 `g_file_set_contents_full()` doesn't truncate the file (without
`G_FILE_SET_CONTENTS_CONSISTENT`) (Philip Withnall)
- #3156 check for #ifdef PTRACE_O_EXITKILL will always fail since it isn't a
macro (Alessandro Bono)
- #3157 gsubprocess build-time test intermittently timing out since 2.78.1
(Simon McVittie)
- #3158 "CRITICAL" log when using --attributes option for "gio info" (Philip
Withnall)
- #3159 glib regex test fails JIT compiler tests under musl libc (Pablo Correa
Gómez)
- #3161 codegen installation is broken
- #3168 gvfs-udisks2-volume-monitor SIGSEGV in g_content_type_guess_for_tree()
due to filename with bad encoding (Ondrej Holy)
- #3183 g_dbus_connection_signal_subscribe with flag
G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH doesn't work with an arg0 that is an
object path (Philip Withnall)
- #3185 g_utf8_collate_key() segfaults when passed an invalid length
- #3186 [RFE] Increase gio sniff buffer for mime type magic detection to 16K
or so (Philip Withnall)
- #3187 g_vasprintf crashes when passed invalid UTF-8 (Philip Withnall)
- #3191 Crash in __gio_xdg_cache_mime_type_subclass (Philip Withnall)
- #3203 Fdo notification fails without AppID (Michael Catanzaro)
- !3143 gatomic: Use g(u)intptr where appropriate
- !3316 gobject: Separate GWeakRef from GWeakNotify
- !3394 gsocketclient: Document delays/timeouts better
- !3457 glib-unix: Add convenience API for pipes
- !3524 add muslc ci
- !3552 gutils: Use international symbol for bits
- !3566 Update annotations for GAsyncQueue and GDir
- !3567 Update annotations for GHmac
- !3568 Update GOptionContext annotations
- !3569 Small fixes and cleanups for Vectored Exception Handlers
- !3571 Update GStringChunk annotations
- !3572 Update GRand annotations
- !3573 Update GTimer annotations
- !3576 guniprop.c: Avoid creating (temporarily) out-of-bounds pointers
- !3577 gthread: introduce g_once_init_{enter,leave}_pointer
- !3578 GType: Use guintptr as the underlying storage if larger than gsize
- !3579 Fixes for integer cast warnings when targeting CHERI
- !3580 Fix test_find_program on FreeBSD
- !3581 gthread: Fix optional/nullable annotations for g_once_init_*()
- !3582 Buffer needs to be aligned correctly to receive linux_dirent64.
- !3589 gconstructor.h: Ensure [c|d]tor prototypes are present for MSVC
(Chun-wei Fan)
- !3590 gtestutils.h: Fix warning with -Wsign-conversion caused by
g_assert_cmpint
- !3591 Switch to using gi-docgen for docs (batch 1)
- !3594 Fix gutils-user-database test on macOS
- !3595 gobject: cache flags needed for g_type_create_instance()
- !3596 Add value annotation to G_TYPE_FUNDAMENTAL_MAX
- !3597 Expand security policy to cover previous stable branch
- !3598 Document NULL pointer pitfall in toolchain requirements
- !3601 meson: Fix Windows build with PCRE2 as sibling subproject
- !3603 Add GBytes variants for GSocket receive methods
- !3605 build: Post-release version bump
- !3607 Make sure the `GTask` is freed on a graceful disconnect
- !3610 gdesktopappinfo: Do not search Comment field
- !3611 tests/constructor: Fix "unknown pragma ignored" warning on clang
- !3612 Update GStrv annotations
- !3613 tests: Fix gdatetime test on non-UTC systems
- !3620 gmain: avoid a GList traversal when removing source
- !3621 wakeup: do single read when using eventfd()
- !3623 Windows: Compile with the UNICODE / _UNICODE macros
- !3624 wakeup: Fix g_wakeup_acknowledge if signal comes in
- !3627 Add Hurd code owners
- !3628 glib-unix: Use full path to gstdio.h include
- !3629 glib/tests/meson.build: remove identical build targets
- !3630 glib-compile-resources: ensure alignment is at least sizeof(void *)
- !3632 Stop using enums in bitfields
- !3633 Use g_task_return in task threads
- !3634 Switch to using gi-docgen for docs (batch 2)
- !3635 Fix warnings with Clang on Windows and enable --Werror in CI
- !3636 Generate introspection data
- !3637 gstrvbuilder: Add g_strv_builder_take
- !3638 Cleanup and add content to glib debugging using gdb scripts
- !3640 GIO/tests: skip test_resources_binary on MIPS platforms
- !3641 build: Simplify MIPS test check
- !3645 Switch to using gi-docgen for docs (batch 3)
- !3646 ci: Update from clang-format-11 to clang-format-14
- !3647 Switch to using gi-docgen for docs (batch 4)
- !3652 GApplicationCommandLine: add print[err]_literal()
- !3654 gdatetime: Fix minor leaks from strup/strdown calls
- !3655 gdatetime: Fix incorrect alt-digits being used after changing locale
- !3656 gmodule-dl: Use RTLD_DEFAULT on FreeBSD too
- !3660 Switch to using gi-docgen for docs (batch 5)
- !3661 Switch to using gi-docgen for docs (batch 6)
- !3662 Switch to using gi-docgen for docs (batch 7)
- !3663 gdbusconnection: don't cache G_IO_ERROR_CANCELLED errors
- !3664 gmain: optimize "context->sources" hash table to use as set
- !3665 ci: Remove .build-linux from Hurd CI scheduled job
- !3666 build: Bump Meson dependency to 1.2.0
- !3667 Switch to using gi-docgen for docs (batch 8)
- !3668 Socket & readiness fixes
- !3671 gio/tests: Add test generated txt as the resources test dependency
- !3672 glib-private: Check for LSAN support at runtime when controlling it
- !3674 gtask: Add g_task_return_prefixed_error()
- !3677 Make GQuark register intentional leaks
- !3678 gsignalgroup: Avoid function call with side effect in g_return_* macro
- !3679 gmessages: fix dropping irrelevant log domains
- !3682 tests: Fix dependency of test.gresource on test-generated.txt
- !3683 glib: Disable dynamic asan loading on macOS
- !3687 fix: about libproc.h and PROC_PIDLISTFD_SIZE
- !3688 build: Fix the inclusion paths for GIR files in gi-docgen
- !3689 meson: Add missing dependencies for utility files for gdbus-codegen
- !3690 Switch to using gi-docgen for docs (batch 9)
- !3695 gvalue: add "steal_string"
- !3699 [th/prgname] use atomic pointers for g_prgname/g_application_name and
add g_set_prgname_once()
- !3701 tests: Fix gio-tool.py test on macOS
- !3702 glib.supp: Suppress the global_mime_dirs allocations
- !3703 Port GIRepository to GTypeInstance and add introspection
- !3704 girepository: Rename symbols to the GI namespace
- !3707 girepository: Ignore set-but-not-used warnings with G_DISABLE_ASSERT
- !3708 Fix various leaks in cmph-bdz-test and gutils
- !3709 Switch to using gi-docgen for docs (batch 10)
- !3710 gmessages: introduce g_log_writer_default_set_debug_domains()
- !3711 ghmac: Add a boxed type for GHmac and fix introspection build
accordingly
- !3712 Switch to using gi-docgen for docs (batch 11)
- !3713 gfileutils: Fix g_file_get_contents() silent under-read of large files
when off_t is wider than size_t
- !3714 xdgmime: Handle buggy type definitions with circular inheritance
- !3715 goption: Fix a typo
- !3716 tests: Improve build of cmph tests in girepository
- !3717 tests: provide reason for disabling convert test under musl
- !3721 gtestutils: Add g_test_trap_subprocess_with_envp() for testing envs
- !3722 gdir, gstrvbuilder: Add refcounting support and a boxed type
- !3723 gwin32: Un-hide symbols when building GIR
- !3726 tests: Fix fileutils build on FreeBSD and macOS
- !3731 tests: Fix string test failure on BSDs
- !3732 gspawn: Stop spewing debug messages
- !3733 ci: Make the Alpine CI name more consistent
- !3734 gdatetime: Disable ERA support on platforms which don’t support this
- !3735 ci: Fix printing info message at end of run-style-check-diff.sh
- !3736 build: Rename -Dgtk_doc option to -Ddocumentation and fix some
g-ir-scanner warnings
- !3739 Documentation only: Added clarification about GWeakNotify and removed
ambiguous text
- !3741 hash: Explicitly annotate key in iter_next as nullable
- !3743 ci: Install correct version of Meson on Alpine CI image
- !3745 tests: Assert there no errors first in gdbus-test-codegen
- !3751 Fix generated RST anchors for methods, signals and properties
- !3752 build: Make packaging module required
- !3753 gobject_gdb.py: Do not break bt on optimized build
- !3755 tests: Use textwrap.dedent to indent expected strings pleasingly
- !3757 ci: Re-add explicit Meson version to Alpine CI image
- !3758 docs: Add a section on version checking macros
- !3760 girepository: Various API cleanups
- !3761 gerror: Fix an old allow-none annotation
- !3762 [th/notify-queue] some optimization around
g_object_freeze_notify()/g_object_thaw_notify()
- !3763 girepository: Drop libgio dependency from gdump.c
- !3764 gsignal: fix reference to signals documentation page
- !3765 gapplication: Fix minor typo in docs
- !3767 girepository: Port documentation to gi-docgen and update
- !3768 ci: Build docs artifacts for deployment to docs.gtk.org
- !3770 GDateTime: Add usec precision API for unix time
- !3771 gtask: Add g_task_return_new_error_literal()
- !3772 gobject: Make GLib-2.0 gir build depend on GObject dependency
- !3773 girepository: Return enumerated versions and search paths as a GStrv
- !3776 glocalvfs: Remove unnecessary and buggy code
- !3777 Fix detecting size_t size when `-Wmissing-prototypes` is in CFLAGS
- !3779 gtypemodule: Add assertions in finalize()
- !3782 docs: fix a typo
- !3786 girepository: Re-number GIR file from 2.0 to 3.0
- !3787 docs: Install the gi-docgen docs
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/devel/gdbus-codegen/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/gdbus-codegen/patches/patch-meson.build
cvs rdiff -u -r1.300 -r1.301 pkgsrc/devel/glib2/Makefile
cvs rdiff -u -r1.115 -r1.116 pkgsrc/devel/glib2/Makefile.common
cvs rdiff -u -r1.153 -r1.154 pkgsrc/devel/glib2/PLIST
cvs rdiff -u -r1.321 -r1.322 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/devel/glib2/patches/patch-gio_gdbus-2.0_codegen_meson.build
cvs rdiff -u -r1.8 -r1.9 \
pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/glib2/patches/patch-glib_gthread.c \
pkgsrc/devel/glib2/patches/patch-glib_tests_thread.c
cvs rdiff -u -r1.20 -r1.21 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.
Modified files:
Index: pkgsrc/devel/gdbus-codegen/distinfo
diff -u pkgsrc/devel/gdbus-codegen/distinfo:1.46 pkgsrc/devel/gdbus-codegen/distinfo:1.47
--- pkgsrc/devel/gdbus-codegen/distinfo:1.46 Fri Feb 9 09:31:45 2024
+++ pkgsrc/devel/gdbus-codegen/distinfo Tue Apr 9 16:57:17 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.46 2024/02/09 09:31:45 adam Exp $
+$NetBSD: distinfo,v 1.47 2024/04/09 16:57:17 wiz Exp $
-BLAKE2s (glib-2.78.4.tar.xz) = 99e73c55068a1eb95703d3df83019a5bb6b5d22e7922f5230a56df5ed5194037
-SHA512 (glib-2.78.4.tar.xz) = 6f3a06e10e7373a2dbf0688512de4126472fb73cbec488b7983b5ffecff09c64d7e1ca462f892e8f215d3d277d103ca802bad7ef0bd0f91edf26fc6ce67187b6
-Size (glib-2.78.4.tar.xz) = 5331892 bytes
-SHA1 (patch-meson.build) = 4f9d178950414e1537b48a552d63c9e551801999
+BLAKE2s (glib-2.80.0.tar.xz) = 606bc10df34172dfe419dd293fe6f51ab2f7e7b951dc4e53d86bc812db604293
+SHA512 (glib-2.80.0.tar.xz) = 1514d62aeb4c4a1a1048ae0f84f7db7f0dbf355772b2dadf6a34ec547045b163a5e28331b096e7616fe3c9c19bed98025a0202b05073f5d7ee901d0efaffe143
+Size (glib-2.80.0.tar.xz) = 5510536 bytes
+SHA1 (patch-meson.build) = 5f0643d176cf3494157fb77e5d5c398c49935742
Index: pkgsrc/devel/gdbus-codegen/patches/patch-meson.build
diff -u pkgsrc/devel/gdbus-codegen/patches/patch-meson.build:1.2 pkgsrc/devel/gdbus-codegen/patches/patch-meson.build:1.3
--- pkgsrc/devel/gdbus-codegen/patches/patch-meson.build:1.2 Wed Mar 4 15:11:49 2020
+++ pkgsrc/devel/gdbus-codegen/patches/patch-meson.build Tue Apr 9 16:57:17 2024
@@ -1,17 +1,19 @@
-$NetBSD: patch-meson.build,v 1.2 2020/03/04 15:11:49 wiz Exp $
+$NetBSD: patch-meson.build,v 1.3 2024/04/09 16:57:17 wiz Exp $
Turn into a meson.build file which meson will accept, and
subsitute some variables.
---- meson.build.orig 2020-02-27 16:12:52.000000000 +0000
+--- meson.build.orig 2024-03-07 21:35:05.000000000 +0000
+++ meson.build
-@@ -1,3 +1,5 @@
+@@ -1,3 +1,7 @@
+project('gdbus_codegen')
+
++fs=import('fs')
++
gdbus_codegen_files = [
'__init__.py',
'codegen.py',
-@@ -9,11 +11,11 @@ gdbus_codegen_files = [
+@@ -11,11 +15,11 @@ gdbus_codegen_files = [
]
gdbus_codegen_conf = configuration_data()
@@ -28,7 +30,7 @@ subsitute some variables.
# Install gdbus-codegen executable
gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
-@@ -24,7 +26,7 @@ gdbus_codegen = configure_file(input : '
+@@ -27,7 +31,7 @@ gdbus_codegen = configure_file(input : '
# Provide tools for others when we're a subproject and they use the Meson GNOME module
meson.override_find_program('gdbus-codegen', gdbus_codegen)
@@ -36,4 +38,4 @@ subsitute some variables.
+codegen_dir = join_paths('@DATADIR@', 'glib-2.0', 'codegen')
gdbus_codegen_built_files = []
- gdbus_codegen_built_files += configure_file(input : 'config.py.in',
+ gdbus_codegen_built_targets = []
Index: pkgsrc/devel/glib2/Makefile
diff -u pkgsrc/devel/glib2/Makefile:1.300 pkgsrc/devel/glib2/Makefile:1.301
--- pkgsrc/devel/glib2/Makefile:1.300 Fri Feb 9 09:31:45 2024
+++ pkgsrc/devel/glib2/Makefile Tue Apr 9 16:57:18 2024
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.300 2024/02/09 09:31:45 adam Exp $
+# $NetBSD: Makefile,v 1.301 2024/04/09 16:57:18 wiz Exp $
.include "Makefile.common"
CATEGORIES= devel gnome
COMMENT= Some useful routines for C programming (glib2)
+TOOL_DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
+
.include "options.mk"
MESON_ARGS+= -Dinstalled_tests=false
Index: pkgsrc/devel/glib2/Makefile.common
diff -u pkgsrc/devel/glib2/Makefile.common:1.115 pkgsrc/devel/glib2/Makefile.common:1.116
--- pkgsrc/devel/glib2/Makefile.common:1.115 Fri Feb 9 09:31:45 2024
+++ pkgsrc/devel/glib2/Makefile.common Tue Apr 9 16:57:18 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.115 2024/02/09 09:31:45 adam Exp $
+# $NetBSD: Makefile.common,v 1.116 2024/04/09 16:57:18 wiz Exp $
# used by devel/gdbus-codegen/Makefile
# used by devel/glib2/Makefile
# used by devel/glib2-tools/Makefile
-DISTNAME= glib-2.78.4
+DISTNAME= glib-2.80.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.153 pkgsrc/devel/glib2/PLIST:1.154
--- pkgsrc/devel/glib2/PLIST:1.153 Fri Feb 9 09:31:45 2024
+++ pkgsrc/devel/glib2/PLIST Tue Apr 9 16:57:18 2024
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.153 2024/02/09 09:31:45 adam Exp $
+@comment $NetBSD: PLIST,v 1.154 2024/04/09 16:57:18 wiz Exp $
${PLIST.nococoa}bin/gapplication
bin/gdbus
+bin/gi-compile-repository
+bin/gi-decompile-typelib
+bin/gi-inspect-typelib
bin/gio
bin/gio-querymodules
bin/glib-compile-resources
@@ -176,6 +179,32 @@ include/glib-2.0/gio/gvolume.h
include/glib-2.0/gio/gvolumemonitor.h
include/glib-2.0/gio/gzlibcompressor.h
include/glib-2.0/gio/gzlibdecompressor.h
+include/glib-2.0/girepository/gi-visibility.h
+include/glib-2.0/girepository/giarginfo.h
+include/glib-2.0/girepository/gibaseinfo.h
+include/glib-2.0/girepository/gicallableinfo.h
+include/glib-2.0/girepository/gicallbackinfo.h
+include/glib-2.0/girepository/giconstantinfo.h
+include/glib-2.0/girepository/gienuminfo.h
+include/glib-2.0/girepository/gifieldinfo.h
+include/glib-2.0/girepository/giflagsinfo.h
+include/glib-2.0/girepository/gifunctioninfo.h
+include/glib-2.0/girepository/giinterfaceinfo.h
+include/glib-2.0/girepository/giobjectinfo.h
+include/glib-2.0/girepository/gipropertyinfo.h
+include/glib-2.0/girepository/giregisteredtypeinfo.h
+include/glib-2.0/girepository/girepository-autocleanups.h
+include/glib-2.0/girepository/girepository.h
+include/glib-2.0/girepository/girffi.h
+include/glib-2.0/girepository/gisignalinfo.h
+include/glib-2.0/girepository/gistructinfo.h
+include/glib-2.0/girepository/gitypeinfo.h
+include/glib-2.0/girepository/gitypelib.h
+include/glib-2.0/girepository/gitypes.h
+include/glib-2.0/girepository/giunioninfo.h
+include/glib-2.0/girepository/giunresolvedinfo.h
+include/glib-2.0/girepository/givalueinfo.h
+include/glib-2.0/girepository/givfuncinfo.h
include/glib-2.0/glib-object.h
include/glib-2.0/glib-unix.h
include/glib-2.0/glib.h
@@ -265,7 +294,6 @@ include/glib-2.0/glib/gvariant.h
include/glib-2.0/glib/gvarianttype.h
include/glib-2.0/glib/gversion.h
include/glib-2.0/glib/gversionmacros.h
-include/glib-2.0/glib/gwin32.h
include/glib-2.0/gmodule.h
include/glib-2.0/gmodule/gmodule-visibility.h
include/glib-2.0/gobject/gbinding.h
@@ -295,21 +323,25 @@ 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.7800.4
+lib/libgio-2.0.so.0.8000.0
+lib/libgirepository-2.0.so
+lib/libgirepository-2.0.so.0
+lib/libgirepository-2.0.so.0.8000.0
lib/libglib-2.0.so
lib/libglib-2.0.so.0
-lib/libglib-2.0.so.0.7800.4
+lib/libglib-2.0.so.0.8000.0
lib/libgmodule-2.0.so
lib/libgmodule-2.0.so.0
-lib/libgmodule-2.0.so.0.7800.4
+lib/libgmodule-2.0.so.0.8000.0
lib/libgobject-2.0.so
lib/libgobject-2.0.so.0
-lib/libgobject-2.0.so.0.7800.4
+lib/libgobject-2.0.so.0.8000.0
lib/libgthread-2.0.so
lib/libgthread-2.0.so.0
-lib/libgthread-2.0.so.0.7800.4
+lib/libgthread-2.0.so.0.8000.0
lib/pkgconfig/gio-2.0.pc
lib/pkgconfig/gio-unix-2.0.pc
+lib/pkgconfig/girepository-2.0.pc
lib/pkgconfig/glib-2.0.pc
lib/pkgconfig/gmodule-2.0.pc
lib/pkgconfig/gmodule-export-2.0.pc
@@ -320,8 +352,8 @@ ${PLIST.nococoa}libexec/gio-launch-deskt
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.7800.4-gdb.py
-share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.7800.4-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.8000.0-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.8000.0-gdb.py
share/gettext/its/gschema.its
share/gettext/its/gschema.loc
share/glib-2.0/dtds/gresource.dtd
Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.321 pkgsrc/devel/glib2/distinfo:1.322
--- pkgsrc/devel/glib2/distinfo:1.321 Mon Apr 1 23:43:13 2024
+++ pkgsrc/devel/glib2/distinfo Tue Apr 9 16:57:18 2024
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.321 2024/04/01 23:43:13 charlotte Exp $
+$NetBSD: distinfo,v 1.322 2024/04/09 16:57:18 wiz Exp $
-BLAKE2s (glib-2.78.4.tar.xz) = 99e73c55068a1eb95703d3df83019a5bb6b5d22e7922f5230a56df5ed5194037
-SHA512 (glib-2.78.4.tar.xz) = 6f3a06e10e7373a2dbf0688512de4126472fb73cbec488b7983b5ffecff09c64d7e1ca462f892e8f215d3d277d103ca802bad7ef0bd0f91edf26fc6ce67187b6
-Size (glib-2.78.4.tar.xz) = 5331892 bytes
+BLAKE2s (glib-2.80.0.tar.xz) = 606bc10df34172dfe419dd293fe6f51ab2f7e7b951dc4e53d86bc812db604293
+SHA512 (glib-2.80.0.tar.xz) = 1514d62aeb4c4a1a1048ae0f84f7db7f0dbf355772b2dadf6a34ec547045b163a5e28331b096e7616fe3c9c19bed98025a0202b05073f5d7ee901d0efaffe143
+Size (glib-2.80.0.tar.xz) = 5510536 bytes
SHA1 (patch-gio_gcredentialsprivate.h) = f719ae41a9eb1d2f04d866b246fa5176543f2df9
-SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = 76ed9658ac11fb33b97143938b6a60b5aa515cae
+SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = 9bd0befe0dd547f6f2d818e52bee14e31a017ac7
SHA1 (patch-gio_giomodule.c) = 8e12ba27d0f13f43cff9a4e2301edf67aba0d1fe
SHA1 (patch-gio_glib-compile-schemas.c) = 4fc8e8ba62bef01762007ebf21569053374808d0
SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc
@@ -12,16 +12,18 @@ SHA1 (patch-gio_gunixcredentialsmessage.
SHA1 (patch-gio_gunixmounts.c) = 48b6945fde5b1721ca246eb7e79f73b5b480e816
SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4
SHA1 (patch-gio_meson.build) = 317da05e008d7bbdbc4c02c3057e8bef514fafae
-SHA1 (patch-gio_tests_meson.build) = 9fa1bdc65768c288d273298a75280485b7bff350
+SHA1 (patch-gio_tests_meson.build) = 771a8f9c6ad23850388d038eed9b281b6490ba3f
SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6
SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8
SHA1 (patch-glib_genviron.c) = 45e382a4b5412c69b310fd26482eff6faffa2c0d
SHA1 (patch-glib_gspawn.c) = 77177c2575a205fde3f00d6773254ee017963d64
+SHA1 (patch-glib_gthread.c) = f169f00c56e65829f8211d72c327286e25d25dd8
SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a
SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0
SHA1 (patch-glib_tests_meson.build) = 40ce43a49ae7084116facac6b3926c5e545f6721
+SHA1 (patch-glib_tests_thread.c) = 84f46a31cbc7cdfd9503da73f8b4f9654201964f
SHA1 (patch-gmodule_gmodule.c) = a020920b8e5bad34550c9963eb2fc27bef24c5c9
SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
SHA1 (patch-gobject_meson.build) = a3953d33ba7e906ff1df024221ac3ab32f6c0c66
-SHA1 (patch-meson.build) = a1f8a63a27c49c30b179f5590eeca247901eccd8
+SHA1 (patch-meson.build) = ee33f8889bdc03e329a9f70d77a478ae365bfa55
SHA1 (patch-meson_options.txt) = 7f633fbbfa9d9b2d958365891ffb9e4094d7dd54
Index: pkgsrc/devel/glib2/patches/patch-gio_gdbus-2.0_codegen_meson.build
diff -u pkgsrc/devel/glib2/patches/patch-gio_gdbus-2.0_codegen_meson.build:1.3 pkgsrc/devel/glib2/patches/patch-gio_gdbus-2.0_codegen_meson.build:1.4
--- pkgsrc/devel/glib2/patches/patch-gio_gdbus-2.0_codegen_meson.build:1.3 Wed Nov 23 10:41:41 2022
+++ pkgsrc/devel/glib2/patches/patch-gio_gdbus-2.0_codegen_meson.build Tue Apr 9 16:57:18 2024
@@ -1,30 +1,31 @@
-$NetBSD: patch-gio_gdbus-2.0_codegen_meson.build,v 1.3 2022/11/23 10:41:41 adam Exp $
+$NetBSD: patch-gio_gdbus-2.0_codegen_meson.build,v 1.4 2024/04/09 16:57:18 wiz Exp $
Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package.
---- gio/gdbus-2.0/codegen/meson.build.orig 2022-10-25 12:53:22.000000000 +0000
+--- gio/gdbus-2.0/codegen/meson.build.orig 2024-04-09 16:54:03.439379421 +0000
+++ gio/gdbus-2.0/codegen/meson.build
@@ -20,6 +20,7 @@ gdbus_codegen_conf.set('DATADIR', glib_d
+ # Install gdbus-codegen executable
gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
output : 'gdbus-codegen',
- install_dir : get_option('bindir'),
+ install : false,
+ install_dir : get_option('bindir'),
install_tag : 'bin-devel',
configuration : gdbus_codegen_conf
- )
-@@ -32,6 +33,7 @@ gdbus_codegen_built_files = []
+@@ -33,6 +34,7 @@ gdbus_codegen_built_files = []
+ gdbus_codegen_built_targets = []
gdbus_codegen_built_files += configure_file(input : 'config.py.in',
output : 'config.py',
- install_dir : codegen_dir,
+ install : false,
+ install_dir : codegen_dir,
install_tag : 'bin-devel',
configuration : gdbus_codegen_conf)
-
-@@ -40,6 +42,7 @@ foreach f : gdbus_codegen_files
+@@ -41,7 +43,7 @@ foreach f : gdbus_codegen_files
+ # Copy these into the builddir so that gdbus-codegen can be used uninstalled
# and then install it too so that it can be used after installation
- gdbus_codegen_built_files += configure_file(input : f, output : f,
- install_dir : codegen_dir,
-+ install : false,
- install_tag : 'bin-devel',
- copy : true)
+ gdbus_codegen_built_targets += fs.copyfile(f, f,
+- install : true,
++ install : false,
+ install_dir : codegen_dir,
+ install_tag : 'bin-devel')
endforeach
Index: pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build
diff -u pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build:1.8 pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build:1.9
--- pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build:1.8 Tue Aug 22 14:09:37 2023
+++ pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build Tue Apr 9 16:57:18 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-gio_tests_meson.build,v 1.8 2023/08/22 14:09:37 schmonz Exp $
+$NetBSD: patch-gio_tests_meson.build,v 1.9 2024/04/09 16:57:18 wiz Exp $
Work around PR pkg/57399. + DYLD_LIBRARY_PATH for macOS
---- gio/tests/meson.build.orig 2023-07-06 15:39:47.000000000 +0000
+--- gio/tests/meson.build.orig 2024-03-07 21:35:05.000000000 +0000
+++ gio/tests/meson.build
-@@ -756,6 +756,10 @@ if not meson.is_cross_build()
+@@ -798,6 +798,10 @@ if not meson.is_cross_build()
plugin_resources_c = custom_target('plugin-resources.c',
input : 'test4.gresource.xml',
output : 'plugin-resources.c',
@@ -15,9 +15,9 @@ Work around PR pkg/57399. + DYLD_LIBRARY
command : [glib_compile_resources,
compiler_type,
'--target=@OUTPUT@',
-@@ -785,6 +789,10 @@ if not meson.is_cross_build()
- test_gresource = custom_target('test.gresource',
+@@ -831,6 +835,10 @@ if not meson.is_cross_build()
input : 'test.gresource.xml',
+ depends : test_generated_txt,
output : 'test.gresource',
+ env : {
+ 'LC_ALL': 'en_US.UTF-8',
@@ -26,7 +26,7 @@ Work around PR pkg/57399. + DYLD_LIBRARY
command : [glib_compile_resources,
compiler_type,
'--target=@OUTPUT@',
-@@ -799,6 +807,10 @@ if not meson.is_cross_build()
+@@ -845,6 +853,10 @@ if not meson.is_cross_build()
test_resources2_c = custom_target('test_resources2.c',
input : 'test3.gresource.xml',
output : 'test_resources2.c',
@@ -37,7 +37,7 @@ Work around PR pkg/57399. + DYLD_LIBRARY
command : [glib_compile_resources,
compiler_type,
'--target=@OUTPUT@',
-@@ -812,6 +824,10 @@ if not meson.is_cross_build()
+@@ -858,6 +870,10 @@ if not meson.is_cross_build()
test_resources2_h = custom_target('test_resources2.h',
input : 'test3.gresource.xml',
output : 'test_resources2.h',
@@ -48,7 +48,7 @@ Work around PR pkg/57399. + DYLD_LIBRARY
command : [glib_compile_resources,
compiler_type,
'--target=@OUTPUT@',
-@@ -826,6 +842,10 @@ if not meson.is_cross_build()
+@@ -872,6 +888,10 @@ if not meson.is_cross_build()
input : 'test2.gresource.xml',
depends : big_test_resource,
output : 'test_resources.c',
@@ -59,7 +59,7 @@ Work around PR pkg/57399. + DYLD_LIBRARY
command : [glib_compile_resources,
compiler_type,
'--target=@OUTPUT@',
-@@ -839,6 +859,10 @@ if not meson.is_cross_build()
+@@ -885,6 +905,10 @@ if not meson.is_cross_build()
digit_test_resources_c = custom_target('digit_test_resources.c',
input : '111_digit_test.gresource.xml',
output : 'digit_test_resources.c',
@@ -70,7 +70,7 @@ Work around PR pkg/57399. + DYLD_LIBRARY
command : [glib_compile_resources,
compiler_type,
'--target=@OUTPUT@',
-@@ -852,6 +876,10 @@ if not meson.is_cross_build()
+@@ -898,6 +922,10 @@ if not meson.is_cross_build()
digit_test_resources_h = custom_target('digit_test_resources.h',
input : '111_digit_test.gresource.xml',
output : 'digit_test_resources.h',
Index: pkgsrc/devel/glib2/patches/patch-meson.build
diff -u pkgsrc/devel/glib2/patches/patch-meson.build:1.20 pkgsrc/devel/glib2/patches/patch-meson.build:1.21
--- pkgsrc/devel/glib2/patches/patch-meson.build:1.20 Fri Nov 3 18:32:32 2023
+++ pkgsrc/devel/glib2/patches/patch-meson.build Tue Apr 9 16:57:18 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.20 2023/11/03 18:32:32 otis Exp $
+$NetBSD: patch-meson.build,v 1.21 2024/04/09 16:57:18 wiz Exp $
- On Darwin, optionally use Cocoa (needed for X11 users).
@@ -14,9 +14,9 @@ $NetBSD: patch-meson.build,v 1.20 2023/1
- Check also for sys/ptrace.h header file.
---- meson.build.orig 2023-09-08 13:42:18.000000000 +0000
+--- meson.build.orig 2024-03-07 21:35:05.000000000 +0000
+++ meson.build
-@@ -383,6 +383,7 @@ headers = [
+@@ -412,6 +412,7 @@ headers = [
'sys/mount.h',
'sys/param.h',
'sys/prctl.h',
@@ -24,7 +24,7 @@ $NetBSD: patch-meson.build,v 1.20 2023/1
'sys/resource.h',
'sys/select.h',
'sys/statfs.h',
-@@ -926,7 +927,7 @@ if host_system == 'darwin'
+@@ -967,7 +968,7 @@ if host_system == 'darwin'
#error "Detected GNUstep, not Cocoa"
#endif''',
name : 'Mac OS X Cocoa support')
@@ -33,7 +33,7 @@ $NetBSD: patch-meson.build,v 1.20 2023/1
if glib_have_cocoa
glib_conf.set('HAVE_COCOA', true)
osx_ldflags += ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit']
-@@ -2214,18 +2215,17 @@ if host_system != 'windows' and get_opti
+@@ -2307,18 +2308,17 @@ if host_system != 'windows' and get_opti
# try glibc
if cc.has_function('getxattr') and cc.has_header('sys/xattr.h')
@@ -54,16 +54,16 @@ $NetBSD: patch-meson.build,v 1.20 2023/1
if cc.compiles(glib_conf_prefix + '''
#include <stdio.h>
#ifdef HAVE_SYS_TYPES_H
-@@ -2328,7 +2328,7 @@ glib_conf.set('HAVE_PROC_SELF_CMDLINE',
+@@ -2421,7 +2421,7 @@ glib_conf.set('HAVE_PROC_SELF_CMDLINE',
- python = import('python').find_installation()
+ python = import('python').find_installation(modules: ['packaging'])
# used for '#!/usr/bin/env <name>'
-python_name = 'python3'
+python_name = python.path()
python_version = python.language_version()
- python_version_req = '>=3.5'
-@@ -2338,7 +2338,7 @@ endif
+ python_version_req = '>=3.7'
+@@ -2431,7 +2431,7 @@ endif
# Determine which user environment-dependent files that we want to install
bash = find_program('bash', required : false)
@@ -72,7 +72,7 @@ $NetBSD: patch-meson.build,v 1.20 2023/1
bash_comp_dep = dependency('bash-completion', version: '>=2.0', required: false)
have_sh = find_program('sh', required : false).found() # For glib-gettextize
have_pkg_config = find_program('pkg-config', required: false).found()
-@@ -2348,8 +2348,7 @@ env_program = find_program('env', requir
+@@ -2441,8 +2441,7 @@ env_program = find_program('env', requir
# FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578
if host_system == 'sunos'
Added files:
Index: pkgsrc/devel/glib2/patches/patch-glib_gthread.c
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-glib_gthread.c:1.1
--- /dev/null Tue Apr 9 16:57:18 2024
+++ pkgsrc/devel/glib2/patches/patch-glib_gthread.c Tue Apr 9 16:57:18 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-glib_gthread.c,v 1.1 2024/04/09 16:57:18 wiz Exp $
+
+Fix build on NetBSD.
+
+--- glib/gthread.c.orig 2024-04-09 16:24:39.087896412 +0000
++++ glib/gthread.c
+@@ -1090,7 +1090,7 @@ g_get_num_processors (void)
+
+ if (count > 0)
+ return count;
+-#elif defined(_SC_NPROCESSORS_ONLN) && defined(THREADS_POSIX) && defined(HAVE_PTHREAD_GETAFFINITY_NP)
++#elif defined(_SC_NPROCESSORS_ONLN) && defined(THREADS_POSIX) && defined(HAVE_PTHREAD_GETAFFINITY_NP) && defined(CPU_ZERO)
+ {
+ int idx;
+ int ncores = MIN (sysconf (_SC_NPROCESSORS_ONLN), CPU_SETSIZE);
Index: pkgsrc/devel/glib2/patches/patch-glib_tests_thread.c
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-glib_tests_thread.c:1.1
--- /dev/null Tue Apr 9 16:57:18 2024
+++ pkgsrc/devel/glib2/patches/patch-glib_tests_thread.c Tue Apr 9 16:57:18 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-glib_tests_thread.c,v 1.1 2024/04/09 16:57:18 wiz Exp $
+
+Fix build on NetBSD.
+
+--- glib/tests/thread.c.orig 2024-04-09 15:41:08.886542793 +0000
++++ glib/tests/thread.c
+@@ -212,7 +212,7 @@ test_thread6 (void)
+ g_thread_join (thread);
+ }
+
+-#if defined(_SC_NPROCESSORS_ONLN) && defined(THREADS_POSIX) && defined(HAVE_PTHREAD_GETAFFINITY_NP)
++#if defined(_SC_NPROCESSORS_ONLN) && defined(THREADS_POSIX) && defined(HAVE_PTHREAD_GETAFFINITY_NP) && defined(CPU_ZERO)
+ static gpointer
+ thread7_func (gpointer data)
+ {
+@@ -243,7 +243,7 @@ thread7_func (gpointer data)
+ static void
+ test_thread7 (void)
+ {
+-#if defined(_SC_NPROCESSORS_ONLN) && defined(THREADS_POSIX) && defined(HAVE_PTHREAD_GETAFFINITY_NP)
++#if defined(_SC_NPROCESSORS_ONLN) && defined(THREADS_POSIX) && defined(HAVE_PTHREAD_GETAFFINITY_NP) && defined(CPU_ZERO)
+ GThread *thread = g_thread_new ("mask", thread7_func, NULL);
+ gpointer result = g_thread_join (thread);
+
Home |
Main Index |
Thread Index |
Old Index