From 17dcc90af5d22844f0ca2ceedbdb71eddaf1bce0 Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Sat, 20 Jan 2024 15:37:57 +0100
Subject: [PATCH] gio/sys: Ignore ThreadResolver

Fixes the ffi tests
---
 gio/sys/Gir.toml       |  4 ++++
 gio/sys/src/lib.rs     | 14 --------------
 gio/sys/tests/abi.rs   |  7 -------
 gio/sys/tests/layout.c |  1 -
 4 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/gio/sys/Gir.toml b/gio/sys/Gir.toml
index 7e3603308f52..9210453b4f99 100644
--- a/gio/sys/Gir.toml
+++ b/gio/sys/Gir.toml
@@ -11,6 +11,10 @@ external_libraries = [
     "GObject",
 ]
 
+ignore = [
+    "Gio.ThreadedResolverClass"
+]
+
 [[object]]
 name = "Gio.SocketFamily"
 status = "manual"
diff --git a/gio/sys/src/lib.rs b/gio/sys/src/lib.rs
index fe0292f2e9c3..ddb0f91fc8de 100644
--- a/gio/sys/src/lib.rs
+++ b/gio/sys/src/lib.rs
@@ -6168,20 +6168,6 @@ pub struct _GThemedIconClass {
 
 pub type GThemedIconClass = _GThemedIconClass;
 
-#[derive(Copy, Clone)]
-#[repr(C)]
-pub struct GThreadedResolverClass {
-    pub parent_class: GResolverClass,
-}
-
-impl ::std::fmt::Debug for GThreadedResolverClass {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("GThreadedResolverClass @ {self:p}"))
-            .field("parent_class", &self.parent_class)
-            .finish()
-    }
-}
-
 #[derive(Copy, Clone)]
 #[repr(C)]
 pub struct GThreadedSocketServiceClass {
diff --git a/gio/sys/tests/abi.rs b/gio/sys/tests/abi.rs
index ae6c44559807..fd624564ba79 100644
--- a/gio/sys/tests/abi.rs
+++ b/gio/sys/tests/abi.rs
@@ -1895,13 +1895,6 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
             alignment: align_of::<GTestDBusFlags>(),
         },
     ),
-    (
-        "GThreadedResolverClass",
-        Layout {
-            size: size_of::<GThreadedResolverClass>(),
-            alignment: align_of::<GThreadedResolverClass>(),
-        },
-    ),
     (
         "GThreadedSocketService",
         Layout {
diff --git a/gio/sys/tests/layout.c b/gio/sys/tests/layout.c
index 98ede29efacd..6f6a95ad4ced 100644
--- a/gio/sys/tests/layout.c
+++ b/gio/sys/tests/layout.c
@@ -249,7 +249,6 @@ int main() {
     printf("%s;%zu;%zu\n", "GTcpWrapperConnection", sizeof(GTcpWrapperConnection), alignof(GTcpWrapperConnection));
     printf("%s;%zu;%zu\n", "GTcpWrapperConnectionClass", sizeof(GTcpWrapperConnectionClass), alignof(GTcpWrapperConnectionClass));
     printf("%s;%zu;%zu\n", "GTestDBusFlags", sizeof(GTestDBusFlags), alignof(GTestDBusFlags));
-    printf("%s;%zu;%zu\n", "GThreadedResolverClass", sizeof(GThreadedResolverClass), alignof(GThreadedResolverClass));
     printf("%s;%zu;%zu\n", "GThreadedSocketService", sizeof(GThreadedSocketService), alignof(GThreadedSocketService));
     printf("%s;%zu;%zu\n", "GThreadedSocketServiceClass", sizeof(GThreadedSocketServiceClass), alignof(GThreadedSocketServiceClass));
     printf("%s;%zu;%zu\n", "GTlsAuthenticationMode", sizeof(GTlsAuthenticationMode), alignof(GTlsAuthenticationMode));