Merge pull request #698 from gtk-rs/bilelmoussaoui/regen

regenerate with latest gir-files

Author: sdroege

.github/workflows/CI.yml

@@ -19,7 +19,7 @@ jobs:
           - nightly
           - "1.56.0"
         conf:
-          - { name: "atk", features: "v2_34", test_sys: true }
+          - { name: "atk", features: "v2_34", test_sys: false } # disable for now, until we get 2.38 on the docker image
           - { name: "gdk", features: "v3_24", test_sys: true }
           - { name: "gdkx11", features: "v3_24", test_sys: true }
           - { name: "gdkwayland", features: "v3_24", test_sys: false }

atk/Cargo.toml

@@ -25,6 +25,7 @@ dox = ["ffi/dox"]
 v2_30 = ["ffi/v2_30"]
 v2_32 = ["v2_30", "ffi/v2_32"]
 v2_34 = ["v2_32", "ffi/v2_34"]
+v2_38 = ["v2_34", "ffi/v2_38"]
 
 [package.metadata.docs.rs]
 features = ["dox"]

atk/Gir.toml

@@ -160,6 +160,12 @@ status = "generate"
 [[object]]
 name = "Atk.StateType"
 status = "generate"
+    [[object.member]]
+    name = "collapsed"
+    version = "2.38"
+    [[object.member]]
+    name = "last_defined"
+    alias = true # not useful
     [[object.function]]
     name = "register"
     # Problematic function needs manual implementation

atk/src/auto/enums.rs

@@ -1362,8 +1362,10 @@ pub enum StateType {
     HasTooltip,
     #[doc(alias = "ATK_STATE_READ_ONLY")]
     ReadOnly,
-    #[doc(alias = "ATK_STATE_LAST_DEFINED")]
-    LastDefined,
+    #[cfg(any(feature = "v2_38", feature = "dox"))]
+    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_38")))]
+    #[doc(alias = "ATK_STATE_COLLAPSED")]
+    Collapsed,
     #[doc(hidden)]
     __Unknown(i32),
 }
@@ -1432,7 +1434,8 @@ impl fmt::Display for StateType {
                 Self::HasPopup => "HasPopup",
                 Self::HasTooltip => "HasTooltip",
                 Self::ReadOnly => "ReadOnly",
-                Self::LastDefined => "LastDefined",
+                #[cfg(any(feature = "v2_38", feature = "dox"))]
+                Self::Collapsed => "Collapsed",
                 _ => "Unknown",
             }
         )
@@ -1488,7 +1491,8 @@ impl IntoGlib for StateType {
             Self::HasPopup => ffi::ATK_STATE_HAS_POPUP,
             Self::HasTooltip => ffi::ATK_STATE_HAS_TOOLTIP,
             Self::ReadOnly => ffi::ATK_STATE_READ_ONLY,
-            Self::LastDefined => ffi::ATK_STATE_LAST_DEFINED,
+            #[cfg(any(feature = "v2_38", feature = "dox"))]
+            Self::Collapsed => ffi::ATK_STATE_COLLAPSED,
             Self::__Unknown(value) => value,
         }
     }
@@ -1542,7 +1546,8 @@ impl FromGlib<ffi::AtkStateType> for StateType {
             ffi::ATK_STATE_HAS_POPUP => Self::HasPopup,
             ffi::ATK_STATE_HAS_TOOLTIP => Self::HasTooltip,
             ffi::ATK_STATE_READ_ONLY => Self::ReadOnly,
-            ffi::ATK_STATE_LAST_DEFINED => Self::LastDefined,
+            #[cfg(any(feature = "v2_38", feature = "dox"))]
+            ffi::ATK_STATE_COLLAPSED => Self::Collapsed,
             value => Self::__Unknown(value),
         }
     }

atk/src/auto/versions.txt

@@ -1,2 +1,2 @@
 Generated by gir (https://github.com/gtk-rs/gir @ 79e747a1a188)
-from gir-files (https://github.com/gtk-rs/gir-files @ 898f6c1fb177)
+from gir-files (https://github.com/gtk-rs/gir-files @ b4887eac499d)

atk/sys/Cargo.toml

@@ -21,6 +21,7 @@ v2_30 = []
 v2_32 = ["v2_30"]
 v2_34 = ["v2_32"]
 dox = []
+v2_38 = ["v2_34"]
 
 [lib]
 name = "atk_sys"
@@ -53,3 +54,6 @@ version = "2.32"
 
 [package.metadata.system-deps.atk.v2_34]
 version = "2.34"
+
+[package.metadata.system-deps.atk.v2_38]
+version = "2.38"

atk/sys/Gir.toml

@@ -19,3 +19,17 @@ ignore = [
     "Atk.MINOR_VERSION",
     "Atk.VERSION_MIN_REQUIRED",
 ]
+
+extra_versions = [
+    "2.38"
+]
+
+[[object]]
+name = "Atk.StateType"
+status = "generate"
+    [[object.member]]
+    name = "collapsed"
+    version = "2.38"
+    [[object.member]]
+    name = "last_defined"
+    alias = true # not useful and should fix -sys tests

atk/sys/src/lib.rs

@@ -252,7 +252,9 @@ pub const ATK_STATE_CHECKABLE: AtkStateType = 39;
 pub const ATK_STATE_HAS_POPUP: AtkStateType = 40;
 pub const ATK_STATE_HAS_TOOLTIP: AtkStateType = 41;
 pub const ATK_STATE_READ_ONLY: AtkStateType = 42;
-pub const ATK_STATE_LAST_DEFINED: AtkStateType = 43;
+#[cfg(any(feature = "v2_38", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_38")))]
+pub const ATK_STATE_COLLAPSED: AtkStateType = 43;
 
 pub type AtkTextAttribute = c_int;
 pub const ATK_TEXT_ATTR_INVALID: AtkTextAttribute = 0;

atk/sys/tests/abi.rs

@@ -829,6 +829,7 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("(gint) ATK_STATE_BUSY", "3"),
     ("(gint) ATK_STATE_CHECKABLE", "39"),
     ("(gint) ATK_STATE_CHECKED", "4"),
+    ("(gint) ATK_STATE_COLLAPSED", "43"),
     ("(gint) ATK_STATE_DEFAULT", "36"),
     ("(gint) ATK_STATE_DEFUNCT", "5"),
     ("(gint) ATK_STATE_EDITABLE", "6"),
@@ -844,7 +845,7 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
     ("(gint) ATK_STATE_INDETERMINATE", "30"),
     ("(gint) ATK_STATE_INVALID", "0"),
     ("(gint) ATK_STATE_INVALID_ENTRY", "33"),
-    ("(gint) ATK_STATE_LAST_DEFINED", "43"),
+    ("(gint) ATK_STATE_LAST_DEFINED", "44"),
     ("(gint) ATK_STATE_MANAGES_DESCENDANTS", "29"),
     ("(gint) ATK_STATE_MODAL", "14"),
     ("(gint) ATK_STATE_MULTISELECTABLE", "16"),

atk/sys/tests/constant.c

@@ -203,6 +203,7 @@ int main() {
     PRINT_CONSTANT((gint) ATK_STATE_BUSY);
     PRINT_CONSTANT((gint) ATK_STATE_CHECKABLE);
     PRINT_CONSTANT((gint) ATK_STATE_CHECKED);
+    PRINT_CONSTANT((gint) ATK_STATE_COLLAPSED);
     PRINT_CONSTANT((gint) ATK_STATE_DEFAULT);
     PRINT_CONSTANT((gint) ATK_STATE_DEFUNCT);
     PRINT_CONSTANT((gint) ATK_STATE_EDITABLE);