atk: version guard AtkState::Collapsed

Also ignore the last_defined member, it is not useful

Author: bilelmoussaoui

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

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,8 +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;
+#[cfg(any(feature = "v2_38", feature = "dox"))]
+#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_38")))]
 pub const ATK_STATE_COLLAPSED: AtkStateType = 43;
-pub const ATK_STATE_LAST_DEFINED: AtkStateType = 44;
 
 pub type AtkTextAttribute = c_int;
 pub const ATK_TEXT_ATTR_INVALID: AtkTextAttribute = 0;