Skip to content

Commit

Permalink
Merge pull request #213 from sdroege/0.20-backports
Browse files Browse the repository at this point in the history
0.20 backports
  • Loading branch information
sdroege authored Oct 30, 2024
2 parents 4d11891 + 0706a5b commit 1dc2560
Show file tree
Hide file tree
Showing 18 changed files with 4,690 additions and 1,743 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ jobs:
- uses: actions/checkout@v4
with:
repository: gtk-rs/gir
ref: master
ref: main
path: gir
- uses: actions/checkout@v4
with:
repository: gtk-rs/gtk4-rs
ref: master
ref: main
path: gtk4-rs
- uses: actions/checkout@v4
with:
repository: gtk-rs/gtk3-rs
ref: master
ref: main
path: gtk3-rs
- working-directory: gir
run: cargo build --release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/regenerate_scheduled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
echo ::set-output name=pr_body::"This PR was auto-generated on $(date +%Y-%m-%d). Please review and manually edit before merging."
- name: Create PR
id: cpr
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
commit-message: Update GIR files
title: ${{ steps.changes.outputs.pr_title }}
Expand Down
8 changes: 5 additions & 3 deletions Atk-1.0.gir
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ A string name/value pair representing a generic attribute.</doc>
</parameters>
</function>
</record>
<constant name="BINARY_AGE" value="25210" c:type="ATK_BINARY_AGE" version="2.7.4">
<constant name="BINARY_AGE" value="25410" c:type="ATK_BINARY_AGE" version="2.7.4">
<doc xml:space="preserve">Like atk_get_binary_age(), but from the headers used at
application compile time, rather than from the library linked
against at application run time.</doc>
Expand Down Expand Up @@ -4727,7 +4727,7 @@ application compile time, rather than from the library linked
against at application run time.</doc>
<type name="gint" c:type="gint"/>
</constant>
<constant name="MINOR_VERSION" value="52" c:type="ATK_MINOR_VERSION" version="2.7.4">
<constant name="MINOR_VERSION" value="54" c:type="ATK_MINOR_VERSION" version="2.7.4">
<doc xml:space="preserve">Like atk_get_minor_version(), but from the headers used at
application compile time, rather than from the library linked
against at application run time.</doc>
Expand Down Expand Up @@ -7682,7 +7682,7 @@ in ATK. Other roles may be added at runtime, so an AtkRole &gt;=
<member name="progress_bar" value="41" c:identifier="ATK_ROLE_PROGRESS_BAR" glib:nick="progress-bar" glib:name="ATK_ROLE_PROGRESS_BAR">
<doc xml:space="preserve">An object used to indicate how much of a task has been completed</doc>
</member>
<member name="push_button" value="42" c:identifier="ATK_ROLE_PUSH_BUTTON" glib:nick="push-button" glib:name="ATK_ROLE_PUSH_BUTTON">
<member name="button" value="42" c:identifier="ATK_ROLE_BUTTON" glib:nick="button" glib:name="ATK_ROLE_BUTTON">
<doc xml:space="preserve">An object the user can manipulate to tell the application to do something</doc>
</member>
<member name="radio_button" value="43" c:identifier="ATK_ROLE_RADIO_BUTTON" glib:nick="radio-button" glib:name="ATK_ROLE_RADIO_BUTTON">
Expand Down Expand Up @@ -8018,6 +8018,8 @@ actual change is. (Since: 2.36)</doc>
<member name="last_defined" value="128" c:identifier="ATK_ROLE_LAST_DEFINED" glib:nick="last-defined" glib:name="ATK_ROLE_LAST_DEFINED">
<doc xml:space="preserve">not a valid role, used for finding end of the enumeration</doc>
</member>
<member name="push_button" value="42" c:identifier="ATK_ROLE_PUSH_BUTTON" glib:nick="push-button" glib:name="ATK_ROLE_PUSH_BUTTON">
</member>
<function name="for_name" c:identifier="atk_role_for_name">
<doc xml:space="preserve">Get the #AtkRole type corresponding to a rolew name.</doc>
<return-value transfer-ownership="none">
Expand Down
1,700 changes: 1,148 additions & 552 deletions GLib-2.0.gir

Large diffs are not rendered by default.

126 changes: 126 additions & 0 deletions GLibUnix-2.0.gir
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,132 @@ on compilers that support that feature.</doc>
<type name="gint" c:type="int"/>
</array>
</field>
<function name="clear" c:identifier="g_unix_pipe_clear" version="2.80" introspectable="0">
<doc xml:space="preserve">Close both ends of the pipe, unless they have already been closed or
stolen. Any errors are ignored: use g_unix_pipe_close() or g_clear_fd()
if error-handling is required.

This function is async-signal safe if @error is %NULL and each member
of @fds are either negative or a valid open file descriptor.
As a result, it is safe to call this function or use `g_auto(GUnixPipe)`
(on compilers that support it) in a signal handler or a
#GSpawnChildSetupFunc, as long as those conditions are ensured to be true.
See [`signal(7)`](man:signal(7)) and
[`signal-safety(7)`](man:signal-safety(7)) for more details.

This function preserves the value of `errno`.</doc>
<return-value transfer-ownership="none">
<type name="none" c:type="void"/>
</return-value>
<parameters>
<parameter name="self" transfer-ownership="none">
<doc xml:space="preserve">a #GUnixPipe</doc>
<type name="GLib.UnixPipe" c:type="GUnixPipe*"/>
</parameter>
</parameters>
</function>
<function name="close" c:identifier="g_unix_pipe_close" version="2.80" introspectable="0" throws="1">
<doc xml:space="preserve">Close one of the ends of the pipe and set the relevant member of @fds
to `-1` before returning, equivalent to g_clear_fd().

Like g_close(), if closing the file descriptor fails, the error is
stored in both %errno and @error. If this function succeeds,
%errno is undefined.

This function is async-signal safe if @error is %NULL and the relevant
member of @fds is either negative or a valid open file descriptor.
This makes it safe to call from a signal handler or a #GSpawnChildSetupFunc
under those conditions.
See [`signal(7)`](man:signal(7)) and
[`signal-safety(7)`](man:signal-safety(7)) for more details.

To close both file descriptors and ignore any errors, use
g_unix_pipe_clear() instead.</doc>
<return-value transfer-ownership="none">
<doc xml:space="preserve">%TRUE on success</doc>
<type name="gboolean" c:type="gboolean"/>
</return-value>
<parameters>
<parameter name="self" transfer-ownership="none">
<doc xml:space="preserve">A pair of file descriptors</doc>
<type name="GLib.UnixPipe" c:type="GUnixPipe*"/>
</parameter>
<parameter name="end" transfer-ownership="none">
<doc xml:space="preserve">One of the ends of the pipe</doc>
<type name="GLib.UnixPipeEnd" c:type="GUnixPipeEnd"/>
</parameter>
</parameters>
</function>
<function name="get" c:identifier="g_unix_pipe_get" version="2.80" introspectable="0">
<doc xml:space="preserve">Return one of the ends of the pipe. It remains owned by @self.

This function is async-signal safe (see [`signal(7)`](man:signal(7)) and
[`signal-safety(7)`](man:signal-safety(7))), making it safe to call from a
signal handler or a #GSpawnChildSetupFunc.

This function preserves the value of `errno`.</doc>
<return-value transfer-ownership="none">
<doc xml:space="preserve">a non-negative file descriptor owned by @self, which must not
be closed by the caller, or a negative number if the corresponding
end of the pipe was already closed or stolen</doc>
<type name="gint" c:type="int"/>
</return-value>
<parameters>
<parameter name="self" transfer-ownership="none">
<doc xml:space="preserve">A pair of file descriptors</doc>
<type name="GLib.UnixPipe" c:type="GUnixPipe*"/>
</parameter>
<parameter name="end" transfer-ownership="none">
<doc xml:space="preserve">One of the ends of the pipe</doc>
<type name="GLib.UnixPipeEnd" c:type="GUnixPipeEnd"/>
</parameter>
</parameters>
</function>
<function name="open" c:identifier="g_unix_pipe_open" version="2.80" introspectable="0" throws="1">
<doc xml:space="preserve">Open a pipe. This is the same as g_unix_open_pipe(), but uses the
#GUnixPipe data structure.</doc>
<return-value transfer-ownership="none">
<doc xml:space="preserve">%TRUE on success</doc>
<type name="gboolean" c:type="gboolean"/>
</return-value>
<parameters>
<parameter name="self" transfer-ownership="none">
<doc xml:space="preserve">A pair of file descriptors</doc>
<type name="GLib.UnixPipe" c:type="GUnixPipe*"/>
</parameter>
<parameter name="flags" transfer-ownership="none">
<doc xml:space="preserve">Flags to pass to g_unix_open_pipe(), typically `O_CLOEXEC`</doc>
<type name="gint" c:type="int"/>
</parameter>
</parameters>
</function>
<function name="steal" c:identifier="g_unix_pipe_steal" version="2.80" introspectable="0">
<doc xml:space="preserve">Return one of the ends of the pipe. It becomes owned by the caller,
and the file descriptor in the data structure is set to `-1`,
similar to g_steal_fd().

This function is async-signal safe (see [`signal(7)`](man:signal(7)) and
[`signal-safety(7)`](man:signal-safety(7))), making it safe to call from a
signal handler or a #GSpawnChildSetupFunc.

This function preserves the value of `errno`.</doc>
<return-value transfer-ownership="none">
<doc xml:space="preserve">a non-negative file descriptor, which becomes owned by the
caller and must be closed by the caller if required, or a negative
number if the corresponding end of the pipe was already closed or stolen</doc>
<type name="gint" c:type="int"/>
</return-value>
<parameters>
<parameter name="self" transfer-ownership="none">
<doc xml:space="preserve">A pair of file descriptors</doc>
<type name="GLib.UnixPipe" c:type="GUnixPipe*"/>
</parameter>
<parameter name="end" transfer-ownership="none">
<doc xml:space="preserve">One of the ends of the pipe</doc>
<type name="GLib.UnixPipeEnd" c:type="GUnixPipeEnd"/>
</parameter>
</parameters>
</function>
</record>
<enumeration name="PipeEnd" version="2.80" c:type="GUnixPipeEnd">
<doc xml:space="preserve">Mnemonic constants for the ends of a Unix pipe.</doc>
Expand Down
136 changes: 136 additions & 0 deletions GLibWin32-2.0.gir
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
<?xml version="1.0"?>
<!-- This file was automatically generated from C sources - DO NOT EDIT!
To affect the contents of this file, edit the original C definitions,
and/or use gtk-doc annotations. -->
<repository xmlns="http://www.gtk.org/introspection/core/1.0" xmlns:c="http://www.gtk.org/introspection/c/1.0" xmlns:glib="http://www.gtk.org/introspection/glib/1.0" version="1.2">
<include name="GLib" version="2.0"/>
<package name="glib-2.0"/>
<c:include name="glib.h"/>
<namespace name="GLibWin32" version="2.0" shared-library="libgobject-2.0-0.dll,libglib-2.0-0.dll" c:identifier-prefixes="GWin32,G" c:symbol-prefixes="glib,g_win32,g">
<function-macro name="HAVE_WIDECHAR_API" c:identifier="G_WIN32_HAVE_WIDECHAR_API" introspectable="0"/>
<function-macro name="IS_NT_BASED" c:identifier="G_WIN32_IS_NT_BASED" introspectable="0"/>
<enumeration name="OSType" c:type="GWin32OSType">
<doc xml:space="preserve">Type of Windows edition to check for at run-time.</doc>
<member name="any" value="0" c:identifier="G_WIN32_OS_ANY">
<doc xml:space="preserve">The running system can be a workstation or a server edition of
Windows. The type of the running system is therefore not checked.</doc>
</member>
<member name="workstation" value="1" c:identifier="G_WIN32_OS_WORKSTATION">
<doc xml:space="preserve">The running system is a workstation edition of Windows,
such as Windows 7 Professional.</doc>
</member>
<member name="server" value="2" c:identifier="G_WIN32_OS_SERVER">
<doc xml:space="preserve">The running system is a server edition of Windows, such as
Windows Server 2008 R2.</doc>
</member>
</enumeration>
<function name="check_windows_version" c:identifier="g_win32_check_windows_version">
<return-value transfer-ownership="none">
<type name="gboolean" c:type="gboolean"/>
</return-value>
<parameters>
<parameter name="major" transfer-ownership="none">
<type name="gint" c:type="const gint"/>
</parameter>
<parameter name="minor" transfer-ownership="none">
<type name="gint" c:type="const gint"/>
</parameter>
<parameter name="spver" transfer-ownership="none">
<type name="gint" c:type="const gint"/>
</parameter>
<parameter name="os_type" transfer-ownership="none">
<type name="GLib.Win32OSType" c:type="const GWin32OSType"/>
</parameter>
</parameters>
</function>
<function name="error_message" c:identifier="g_win32_error_message">
<return-value transfer-ownership="full">
<type name="utf8" c:type="gchar*"/>
</return-value>
<parameters>
<parameter name="error" transfer-ownership="none">
<type name="gint" c:type="gint"/>
</parameter>
</parameters>
</function>
<function name="ftruncate" c:identifier="g_win32_ftruncate">
<return-value transfer-ownership="none">
<type name="gint" c:type="gint"/>
</return-value>
<parameters>
<parameter name="f" transfer-ownership="none">
<type name="gint" c:type="gint"/>
</parameter>
<parameter name="size" transfer-ownership="none">
<type name="guint" c:type="guint"/>
</parameter>
</parameters>
</function>
<function name="get_command_line" c:identifier="g_win32_get_command_line" introspectable="0">
<return-value>
<array c:type="gchar**">
<type name="utf8"/>
</array>
</return-value>
</function>
<function name="get_package_installation_directory" c:identifier="g_win32_get_package_installation_directory">
<return-value transfer-ownership="full">
<type name="utf8" c:type="gchar*"/>
</return-value>
<parameters>
<parameter name="package" transfer-ownership="none">
<type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="dll_name" transfer-ownership="none">
<type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</function>
<function name="get_package_installation_directory_of_module" c:identifier="g_win32_get_package_installation_directory_of_module">
<return-value transfer-ownership="full">
<type name="utf8" c:type="gchar*"/>
</return-value>
<parameters>
<parameter name="hmodule" transfer-ownership="none" nullable="1" allow-none="1">
<type name="gpointer" c:type="gpointer"/>
</parameter>
</parameters>
</function>
<function name="get_package_installation_subdirectory" c:identifier="g_win32_get_package_installation_subdirectory">
<return-value transfer-ownership="full">
<type name="utf8" c:type="gchar*"/>
</return-value>
<parameters>
<parameter name="package" transfer-ownership="none">
<type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="dll_name" transfer-ownership="none">
<type name="utf8" c:type="const gchar*"/>
</parameter>
<parameter name="subdir" transfer-ownership="none">
<type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</function>
<function name="get_windows_version" c:identifier="g_win32_get_windows_version">
<return-value transfer-ownership="none">
<type name="guint" c:type="guint"/>
</return-value>
</function>
<function name="getlocale" c:identifier="g_win32_getlocale">
<return-value transfer-ownership="full">
<type name="utf8" c:type="gchar*"/>
</return-value>
</function>
<function name="locale_filename_from_utf8" c:identifier="g_win32_locale_filename_from_utf8">
<return-value transfer-ownership="full">
<type name="utf8" c:type="gchar*"/>
</return-value>
<parameters>
<parameter name="utf8filename" transfer-ownership="none">
<type name="utf8" c:type="const gchar*"/>
</parameter>
</parameters>
</function>
</namespace>
</repository>
24 changes: 24 additions & 0 deletions GModule-2.0.gir
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,12 @@ and/or use gtk-doc annotations. -->
</parameter>
</parameters>
</function-macro>
<function-macro name="DEPRECATED_ENUMERATOR_IN_2_84_FOR" c:identifier="GMODULE_DEPRECATED_ENUMERATOR_IN_2_84_FOR" introspectable="0">
<parameters>
<parameter name="f">
</parameter>
</parameters>
</function-macro>
<function-macro name="DEPRECATED_FOR" c:identifier="GMODULE_DEPRECATED_FOR" introspectable="0">
<parameters>
<parameter name="f">
Expand Down Expand Up @@ -361,6 +367,12 @@ and/or use gtk-doc annotations. -->
</parameter>
</parameters>
</function-macro>
<function-macro name="DEPRECATED_IN_2_84_FOR" c:identifier="GMODULE_DEPRECATED_IN_2_84_FOR" introspectable="0">
<parameters>
<parameter name="f">
</parameter>
</parameters>
</function-macro>
<function-macro name="DEPRECATED_MACRO_IN_2_26_FOR" c:identifier="GMODULE_DEPRECATED_MACRO_IN_2_26_FOR" introspectable="0">
<parameters>
<parameter name="f">
Expand Down Expand Up @@ -535,6 +547,12 @@ and/or use gtk-doc annotations. -->
</parameter>
</parameters>
</function-macro>
<function-macro name="DEPRECATED_MACRO_IN_2_84_FOR" c:identifier="GMODULE_DEPRECATED_MACRO_IN_2_84_FOR" introspectable="0">
<parameters>
<parameter name="f">
</parameter>
</parameters>
</function-macro>
<function-macro name="DEPRECATED_TYPE_IN_2_26_FOR" c:identifier="GMODULE_DEPRECATED_TYPE_IN_2_26_FOR" introspectable="0">
<parameters>
<parameter name="f">
Expand Down Expand Up @@ -709,6 +727,12 @@ and/or use gtk-doc annotations. -->
</parameter>
</parameters>
</function-macro>
<function-macro name="DEPRECATED_TYPE_IN_2_84_FOR" c:identifier="GMODULE_DEPRECATED_TYPE_IN_2_84_FOR" introspectable="0">
<parameters>
<parameter name="f">
</parameter>
</parameters>
</function-macro>
<constant name="MODULE_IMPL_AR" value="7" c:type="G_MODULE_IMPL_AR">
<type name="gint" c:type="gint"/>
</constant>
Expand Down
Loading

0 comments on commit 1dc2560

Please sign in to comment.