Automated PR: Changes from updating gir/gir-files #1821

github-actions · 2025-09-28T12:06:46Z

This PR contains auto-generated changes after a merge in the external gir-files repository.

bilelmoussaoui · 2025-11-21T11:38:56Z

Sorry for the big commit but i don't have the time to cleanly do it.
Here is a diff of what has to be fixed in the GIR file

user@toolbx ~/P/g/gir-files (main)> git diff
diff --git a/GLibWin32-2.0.gir b/GLibWin32-2.0.gir
index 668a6a5..2ef5188 100644
--- a/GLibWin32-2.0.gir
+++ b/GLibWin32-2.0.gir
@@ -40,7 +40,7 @@ and/or use gtk-doc annotations.  -->
           <type name="gint" c:type="const gint"/>
         </parameter>
         <parameter name="os_type" transfer-ownership="none">
-          <type name="GLib.Win32OSType" c:type="const GWin32OSType"/>
+          <type name="OSType" c:type="const GWin32OSType"/>
         </parameter>
       </parameters>
     </function>
diff --git a/GioWin32-2.0.gir b/GioWin32-2.0.gir
index 63781b4..48d914e 100644
--- a/GioWin32-2.0.gir
+++ b/GioWin32-2.0.gir
@@ -218,7 +218,7 @@ when the stream is closed.</doc>
     </function-macro>
     <record name="NetworkMonitor" c:type="GWin32NetworkMonitor">
       <field name="parent_instance" introspectable="0" writable="1">
-        <type c:type="GNetworkMonitorBase"/>
+        <type name="gpointer" c:type="GNetworkMonitorBase"/>
       </field>
       <field name="priv" writable="1">
         <type name="NetworkMonitorPrivate" c:type="GWin32NetworkMonitorPrivate*"/>
@@ -226,7 +226,7 @@ when the stream is closed.</doc>
     </record>
     <record name="NetworkMonitorClass" c:type="GWin32NetworkMonitorClass">
       <field name="parent_class" introspectable="0" writable="1">
-        <type c:type="GNetworkMonitorBaseClass"/>
+        <type name="gpointer" c:type="GNetworkMonitorBaseClass"/>
       </field>
     </record>
     <record name="NetworkMonitorPrivate" c:type="GWin32NetworkMonitorPrivate" disguised="1" opaque="1"/>
user@toolbx ~/P/g/gir-files (main)>

Other than that, we still miss README.md in those new crates, a license symlink like the others and probably a review of what I did.

We require v2.84 for it nowadays anyways

Requires fixing gir

That is part of glib-unix

Copying what we had in gio where it makes sense

We need a gsvbuild bump for that, can be done later

…ual ones

bilelmoussaoui · 2025-11-30T15:59:06Z

We need #1853 to fix the windows builds

sdroege · 2025-12-01T09:31:53Z

glib-unix/sys/src/lib.rs

    pub fn g_unix_pipe_close(
-        self_: *mut glib::GUnixPipe,
-        end: glib::GUnixPipeEnd,
+        self_: *mut GUnixPipe,


The commit glib/unix: HACK: Manually fix GIR file probably needs to be dropped and solved differently or otherwise the CI will find changes when running the generator

sdroege · 2025-12-01T09:34:14Z

.github/workflows/windows.yml

    env:
      # git revision of gvsbuild we use for to build GLib and the other dependencies
-      gvsbuildref: 230e1074047b9654b76217c5d48b10c726fbe0f6
+      gvsbuildref: 352e6772c61763af1178b1bb0c2cb0adb8f81d4b


Needs rebasing for your other PR that was merged :)

sdroege · 2025-12-01T09:39:14Z

gio/src/lib.rs

-#[cfg(windows)]
-mod win32_input_stream;
-#[cfg(windows)]
-pub use self::win32_input_stream::Win32InputStream;


For backwards compatibility reasons to backport this, we probably need some kind of pub use gio_unix::* (and the same for win32 and glib) here. I wouldn't do it for main though.

Is that somehow possible or should we just stop backporting new API until next summer?

sdroege · 2025-12-01T09:40:11Z

gio/src/socket.rs

-            (
-                Socket::from_fd(OwnedFd::from_raw_fd(fds[0])).unwrap(),
-                Socket::from_fd(OwnedFd::from_raw_fd(fds[1])).unwrap(),
+    /*


Some commented out code is leftover here

sdroege · 2025-12-01T09:41:30Z

gio-unix/src/lib.rs

 pub use ffi;

 #[allow(unused_imports)]
+#[allow(clippy::derived_hash_with_manual_eq)]


Which type is that for? That's potentially a bug

sdroege · 2025-12-01T09:42:43Z

gdk-pixbuf/src/lib.rs


 #[allow(clippy::too_many_arguments)]
 #[allow(unused_imports)]
+#[allow(clippy::empty_line_after_outer_attr)]


Is fixed now :)

sdroege · 2025-12-01T09:44:12Z

.github/workflows/windows.yml

          - { name: "gdk-pixbuf", test: true, args: "--features v2_42" }
          - { name: "gio", test: true, args: "--features v2_80" }
-          - { name: "gio-win32", test: true, args: "--features v2_84" }
+          - { name: "gio-win32", test: true, args: "--features v2_66" }


sdroege · 2025-12-01T09:46:59Z

This generally looks good to me apart from the above. I guess my main question left here is how to handle backports, but we don't have to answer that as part of this PR.

github-actions bot force-pushed the auto-pr-branch branch 3 times, most recently from c501c72 to 1770de7 Compare October 12, 2025 07:29

github-actions bot force-pushed the auto-pr-branch branch 2 times, most recently from abc9b30 to 9b240a2 Compare October 26, 2025 02:32

github-actions bot force-pushed the auto-pr-branch branch from 9b240a2 to 17decdb Compare November 2, 2025 07:33

github-actions bot force-pushed the auto-pr-branch branch 2 times, most recently from c9868a6 to 7e62964 Compare November 16, 2025 01:40

bilelmoussaoui force-pushed the auto-pr-branch branch from 7e62964 to aa23d6a Compare November 21, 2025 11:37

bilelmoussaoui force-pushed the auto-pr-branch branch 7 times, most recently from 6a5f921 to f41f3c5 Compare November 21, 2025 13:18

github-actions bot force-pushed the auto-pr-branch branch 2 times, most recently from 80d9c57 to dffad11 Compare November 27, 2025 08:50

bilelmoussaoui force-pushed the auto-pr-branch branch from dffad11 to f41f3c5 Compare November 27, 2025 08:50

github-actions bot and others added 10 commits November 27, 2025 10:02

Regenerate with latest gir

d47e40e

Generate bindings for win32/unix GLib/Gio

848cbd7

Build new crates on CI

1f7724b

gio/unix: Remove the manual fallback for MountEntry

623a450

We require v2.84 for it nowadays anyways

glib: Lower host dep requirement

d621f11

glib/unix: Add missing futures feature

e4fadff

gio/unix: Ignore a clippy lint

35a85e5

gio: Comment out a test & drop UnixFdMessage

82abb51

gdk-pixbuf: Ignore another clippy lint

140bece

Requires fixing gir

gio/tests: Remove no longer useful headers

f4f74b3

glib/sys: Don't generate UnixPipe

bd5573f

That is part of glib-unix

bilelmoussaoui force-pushed the auto-pr-branch branch from ee1d1ce to bd5573f Compare November 27, 2025 09:02

bilelmoussaoui added 5 commits November 27, 2025 10:07

glib/unix: HACK: Manually fix GIR file

4f862db

glib/source: Fix imoports on Win32

ceea97f

glib/win32: Add missing imports

a61fbca

gio/win32: Manually implement streams

81715f1

Copying what we had in gio where it makes sense

ci/windows: Don't build latest feature of gio-win32

654d642

We need a gsvbuild bump for that, can be done later

bilelmoussaoui force-pushed the auto-pr-branch branch 2 times, most recently from 74981ff to c2aacc5 Compare November 27, 2025 09:58

bilelmoussaoui added 4 commits November 27, 2025 11:12

gio/win32: Add a type for GNetworkMonitorBase and drop duplicated man…

8a1eb84

…ual ones

gio/win32: Add missing dep

4762c60

deny: Drop no longer needed skips

b53e260

Add missing licenses

f9883ab

bilelmoussaoui force-pushed the auto-pr-branch branch from c2aacc5 to f9883ab Compare November 27, 2025 10:12

github-actions bot force-pushed the auto-pr-branch branch from f9883ab to 46e5fcc Compare November 30, 2025 07:49

bilelmoussaoui force-pushed the auto-pr-branch branch from 46e5fcc to 41ef29d Compare November 30, 2025 08:05

Regenerate with latest gir files

ecca590

github-actions bot force-pushed the auto-pr-branch branch from 41ef29d to 038b0a7 Compare November 30, 2025 11:04

bilelmoussaoui force-pushed the auto-pr-branch branch from 038b0a7 to ecca590 Compare November 30, 2025 11:05

bilelmoussaoui added 2 commits November 30, 2025 12:19

Adapt to rust nightly docs changes

c68c30d

ci/windows: Bump gsvbuild ref

0f99d90

sdroege reviewed Dec 1, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Automated PR: Changes from updating gir/gir-files #1821

Automated PR: Changes from updating gir/gir-files #1821

github-actions bot commented Sep 28, 2025

Uh oh!

bilelmoussaoui commented Nov 21, 2025

Uh oh!

bilelmoussaoui commented Nov 30, 2025

Uh oh!

sdroege Dec 1, 2025

Uh oh!

sdroege Dec 1, 2025

Uh oh!

sdroege Dec 1, 2025

Uh oh!

sdroege Dec 1, 2025

Uh oh!

sdroege Dec 1, 2025

Uh oh!

sdroege Dec 1, 2025

Uh oh!

sdroege Dec 1, 2025

Uh oh!

sdroege commented Dec 1, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Automated PR: Changes from updating gir/gir-files #1821

Are you sure you want to change the base?

Automated PR: Changes from updating gir/gir-files #1821

Conversation

github-actions bot commented Sep 28, 2025

Uh oh!

bilelmoussaoui commented Nov 21, 2025

Uh oh!

bilelmoussaoui commented Nov 30, 2025

Uh oh!

sdroege Dec 1, 2025

Choose a reason for hiding this comment

Uh oh!

sdroege Dec 1, 2025

Choose a reason for hiding this comment

Uh oh!

sdroege Dec 1, 2025

Choose a reason for hiding this comment

Uh oh!

sdroege Dec 1, 2025

Choose a reason for hiding this comment

Uh oh!

sdroege Dec 1, 2025

Choose a reason for hiding this comment

Uh oh!

sdroege Dec 1, 2025

Choose a reason for hiding this comment

Uh oh!

sdroege Dec 1, 2025

Choose a reason for hiding this comment

Uh oh!

sdroege commented Dec 1, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants