From 26f4170b0173babb7c955632db7aced7bc193437 Mon Sep 17 00:00:00 2001
From: Felix Krull <f_krull@gmx.de>
Date: Tue, 25 Aug 2020 22:08:23 +0200
Subject: [PATCH] conf: disable internal Sign subtypes

---
 rust-bindings/rust/conf/ostree-sys.toml      |  4 +++
 rust-bindings/rust/src/auto/versions.txt     |  2 +-
 rust-bindings/rust/sys/src/auto/versions.txt |  2 +-
 rust-bindings/rust/sys/src/lib.rs            | 38 --------------------
 rust-bindings/rust/sys/tests/abi.rs          |  2 --
 5 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/rust-bindings/rust/conf/ostree-sys.toml b/rust-bindings/rust/conf/ostree-sys.toml
index d3ac4ba5..77a01f95 100644
--- a/rust-bindings/rust/conf/ostree-sys.toml
+++ b/rust-bindings/rust/conf/ostree-sys.toml
@@ -21,6 +21,10 @@ ignore = [
     "OSTree.LzmaDecompressorClass",
     "OSTree.RepoFileEnumeratorClass",
     "OSTree.RollsumMatches",
+    "OSTree.SignDummy",
+    "OSTree.SignDummyClass",
+    "OSTree.SignEd25519",
+    "OSTree.SignEd25519Class",
 
     # version-dependent constants
     "OSTree.RELEASE_VERSION",
diff --git a/rust-bindings/rust/src/auto/versions.txt b/rust-bindings/rust/src/auto/versions.txt
index 79591983..e216eb31 100644
--- a/rust-bindings/rust/src/auto/versions.txt
+++ b/rust-bindings/rust/src/auto/versions.txt
@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ 2d1ffab1)
-from gir-files (https://github.com/gtk-rs/gir-files @ ed7b959+)
+from gir-files (https://github.com/gtk-rs/gir-files @ 7ce8ed9)
diff --git a/rust-bindings/rust/sys/src/auto/versions.txt b/rust-bindings/rust/sys/src/auto/versions.txt
index 79591983..e216eb31 100644
--- a/rust-bindings/rust/sys/src/auto/versions.txt
+++ b/rust-bindings/rust/sys/src/auto/versions.txt
@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ 2d1ffab1)
-from gir-files (https://github.com/gtk-rs/gir-files @ ed7b959+)
+from gir-files (https://github.com/gtk-rs/gir-files @ 7ce8ed9)
diff --git a/rust-bindings/rust/sys/src/lib.rs b/rust-bindings/rust/sys/src/lib.rs
index 2498fcef..e0898c99 100644
--- a/rust-bindings/rust/sys/src/lib.rs
+++ b/rust-bindings/rust/sys/src/lib.rs
@@ -725,44 +725,6 @@ impl ::std::fmt::Debug for OstreeRepoTransactionStats {
     }
 }
 
-#[repr(C)]
-pub struct _OstreeSignDummy(c_void);
-
-pub type OstreeSignDummy = *mut _OstreeSignDummy;
-
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct OstreeSignDummyClass {
-    pub parent_class: gobject::GObjectClass,
-}
-
-impl ::std::fmt::Debug for OstreeSignDummyClass {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeSignDummyClass @ {:?}", self as *const _))
-         .field("parent_class", &self.parent_class)
-         .finish()
-    }
-}
-
-#[repr(C)]
-pub struct _OstreeSignEd25519(c_void);
-
-pub type OstreeSignEd25519 = *mut _OstreeSignEd25519;
-
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct OstreeSignEd25519Class {
-    pub parent_class: gobject::GObjectClass,
-}
-
-impl ::std::fmt::Debug for OstreeSignEd25519Class {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        f.debug_struct(&format!("OstreeSignEd25519Class @ {:?}", self as *const _))
-         .field("parent_class", &self.parent_class)
-         .finish()
-    }
-}
-
 #[repr(C)]
 #[derive(Copy, Clone)]
 pub struct OstreeSignInterface {
diff --git a/rust-bindings/rust/sys/tests/abi.rs b/rust-bindings/rust/sys/tests/abi.rs
index 5e22cb11..7f294b0d 100644
--- a/rust-bindings/rust/sys/tests/abi.rs
+++ b/rust-bindings/rust/sys/tests/abi.rs
@@ -282,8 +282,6 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
     ("OstreeRepoResolveRevExtFlags", Layout {size: size_of::<OstreeRepoResolveRevExtFlags>(), alignment: align_of::<OstreeRepoResolveRevExtFlags>()}),
     ("OstreeRepoTransactionStats", Layout {size: size_of::<OstreeRepoTransactionStats>(), alignment: align_of::<OstreeRepoTransactionStats>()}),
     ("OstreeSePolicyRestoreconFlags", Layout {size: size_of::<OstreeSePolicyRestoreconFlags>(), alignment: align_of::<OstreeSePolicyRestoreconFlags>()}),
-    ("OstreeSignDummyClass", Layout {size: size_of::<OstreeSignDummyClass>(), alignment: align_of::<OstreeSignDummyClass>()}),
-    ("OstreeSignEd25519Class", Layout {size: size_of::<OstreeSignEd25519Class>(), alignment: align_of::<OstreeSignEd25519Class>()}),
     ("OstreeSignInterface", Layout {size: size_of::<OstreeSignInterface>(), alignment: align_of::<OstreeSignInterface>()}),
     ("OstreeStaticDeltaGenerateOpt", Layout {size: size_of::<OstreeStaticDeltaGenerateOpt>(), alignment: align_of::<OstreeStaticDeltaGenerateOpt>()}),
     ("OstreeSysrootSimpleWriteDeploymentFlags", Layout {size: size_of::<OstreeSysrootSimpleWriteDeploymentFlags>(), alignment: align_of::<OstreeSysrootSimpleWriteDeploymentFlags>()}),