gtk-rs · sdroege · Nov 30, 2022 · Nov 30, 2022 · Nov 30, 2022 · Nov 30, 2022
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -22,10 +22,10 @@ jobs:
         conf:
           - { name: "cairo", features: "png,pdf,svg,ps,use_glib,v1_18,freetype,script,xcb,xlib,win32-surface", nightly: "--features 'png,pdf,svg,ps,use_glib,v1_18,freetype,script,xcb,xlib,win32-surface'", test_sys: true }
           - { name: "gdk-pixbuf", features: "v2_42", nightly: "--all-features", test_sys: true }
-          - { name: "gio", features: "v2_74", nightly: "--all-features", test_sys: false }
-          - { name: "glib", features: "v2_74", nightly: "--all-features", test_sys: false }
+          - { name: "gio", features: "v2_74", nightly: "--all-features", test_sys: true }
+          - { name: "glib", features: "v2_74", nightly: "--all-features", test_sys: true }
           - { name: "graphene", features: "", nightly: "", test_sys: true }
-          - { name: "pango", features: "v1_50", nightly: "--all-features", test_sys: false }
+          - { name: "pango", features: "v1_50", nightly: "--all-features", test_sys: true }
           - { name: "pangocairo", features: "", nightly: "--all-features", test_sys: true }
     steps:
       - uses: actions/checkout@v3

diff --git a/gdk-pixbuf/src/auto/enums.rs b/gdk-pixbuf/src/auto/enums.rs
@@ -207,6 +207,7 @@ pub enum PixbufAlphaMode {
     __Unknown(i32),
 }
 
+#[allow(deprecated)]
 impl fmt::Display for PixbufAlphaMode {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(
@@ -221,6 +222,7 @@ impl fmt::Display for PixbufAlphaMode {
     }
 }
 
+#[allow(deprecated)]
 #[doc(hidden)]
 impl IntoGlib for PixbufAlphaMode {
     type GlibType = ffi::GdkPixbufAlphaMode;
@@ -234,6 +236,7 @@ impl IntoGlib for PixbufAlphaMode {
     }
 }
 
+#[allow(deprecated)]
 #[doc(hidden)]
 impl FromGlib<ffi::GdkPixbufAlphaMode> for PixbufAlphaMode {
     unsafe fn from_glib(value: ffi::GdkPixbufAlphaMode) -> Self {
@@ -245,16 +248,19 @@ impl FromGlib<ffi::GdkPixbufAlphaMode> for PixbufAlphaMode {
     }
 }
 
+#[allow(deprecated)]
 impl StaticType for PixbufAlphaMode {
     fn static_type() -> Type {
         unsafe { from_glib(ffi::gdk_pixbuf_alpha_mode_get_type()) }
     }
 }
 
+#[allow(deprecated)]
 impl glib::value::ValueType for PixbufAlphaMode {
     type Type = Self;
 }
 
+#[allow(deprecated)]
 unsafe impl<'a> FromValue<'a> for PixbufAlphaMode {
     type Checker = glib::value::GenericValueTypeChecker<Self>;
 
@@ -263,6 +269,7 @@ unsafe impl<'a> FromValue<'a> for PixbufAlphaMode {
     }
 }
 
+#[allow(deprecated)]
 impl ToValue for PixbufAlphaMode {
     fn to_value(&self) -> glib::Value {
         let mut value = glib::Value::for_value_type::<Self>();
@@ -277,6 +284,7 @@ impl ToValue for PixbufAlphaMode {
     }
 }
 
+#[allow(deprecated)]
 impl From<PixbufAlphaMode> for glib::Value {
     #[inline]
     fn from(v: PixbufAlphaMode) -> Self {

diff --git a/gdk-pixbuf/src/auto/mod.rs b/gdk-pixbuf/src/auto/mod.rs
@@ -23,6 +23,7 @@ pub use self::pixbuf_format::PixbufFormat;
 mod enums;
 pub use self::enums::Colorspace;
 pub use self::enums::InterpType;
+#[allow(deprecated)]
 pub use self::enums::PixbufAlphaMode;
 pub use self::enums::PixbufError;
 pub use self::enums::PixbufRotation;

diff --git a/gdk-pixbuf/src/auto/versions.txt b/gdk-pixbuf/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 0eeebbdf9d4d)
-from gir-files (https://github.com/gtk-rs/gir-files @ d8382a5920b8)
+Generated by gir (https://github.com/gtk-rs/gir @ 6ec1537f60e3)
+from gir-files (https://github.com/gtk-rs/gir-files @ 4c173afc6395)
diff --git a/gdk-pixbuf/sys/tests/abi.rs b/gdk-pixbuf/sys/tests/abi.rs
@@ -2,6 +2,8 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+#![cfg(target_os = "linux")]
+
 use gdk_pixbuf_sys::*;
 use std::env;
 use std::error::Error;
@@ -110,7 +112,6 @@ impl Results {
 }
 
 #[test]
-#[cfg(target_os = "linux")]
 fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
@@ -145,7 +146,6 @@ fn cross_validate_constants_with_c() {
 }
 
 #[test]
-#[cfg(target_os = "linux")]
 fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 

diff --git a/gdk-pixbuf/sys/versions.txt b/gdk-pixbuf/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 0eeebbdf9d4d)
-from gir-files (https://github.com/gtk-rs/gir-files @ d8382a5920b8)
+Generated by gir (https://github.com/gtk-rs/gir @ 6ec1537f60e3)
+from gir-files (https://github.com/gtk-rs/gir-files @ 4c173afc6395)
diff --git a/gio/src/auto/enums.rs b/gio/src/auto/enums.rs
@@ -4043,6 +4043,7 @@ pub enum TlsRehandshakeMode {
     __Unknown(i32),
 }
 
+#[allow(deprecated)]
 impl fmt::Display for TlsRehandshakeMode {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(
@@ -4058,6 +4059,7 @@ impl fmt::Display for TlsRehandshakeMode {
     }
 }
 
+#[allow(deprecated)]
 #[doc(hidden)]
 impl IntoGlib for TlsRehandshakeMode {
     type GlibType = ffi::GTlsRehandshakeMode;
@@ -4072,6 +4074,7 @@ impl IntoGlib for TlsRehandshakeMode {
     }
 }
 
+#[allow(deprecated)]
 #[doc(hidden)]
 impl FromGlib<ffi::GTlsRehandshakeMode> for TlsRehandshakeMode {
     unsafe fn from_glib(value: ffi::GTlsRehandshakeMode) -> Self {
@@ -4084,16 +4087,19 @@ impl FromGlib<ffi::GTlsRehandshakeMode> for TlsRehandshakeMode {
     }
 }
 
+#[allow(deprecated)]
 impl StaticType for TlsRehandshakeMode {
     fn static_type() -> Type {
         unsafe { from_glib(ffi::g_tls_rehandshake_mode_get_type()) }
     }
 }
 
+#[allow(deprecated)]
 impl glib::value::ValueType for TlsRehandshakeMode {
     type Type = Self;
 }
 
+#[allow(deprecated)]
 unsafe impl<'a> FromValue<'a> for TlsRehandshakeMode {
     type Checker = glib::value::GenericValueTypeChecker<Self>;
 
@@ -4102,6 +4108,7 @@ unsafe impl<'a> FromValue<'a> for TlsRehandshakeMode {
     }
 }
 
+#[allow(deprecated)]
 impl ToValue for TlsRehandshakeMode {
     fn to_value(&self) -> glib::Value {
         let mut value = glib::Value::for_value_type::<Self>();
@@ -4116,6 +4123,7 @@ impl ToValue for TlsRehandshakeMode {
     }
 }
 
+#[allow(deprecated)]
 impl From<TlsRehandshakeMode> for glib::Value {
     #[inline]
     fn from(v: TlsRehandshakeMode) -> Self {

diff --git a/gio/src/auto/file_info.rs b/gio/src/auto/file_info.rs
@@ -1,6 +1,7 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
+#![allow(deprecated)]
 
 use crate::FileAttributeMatcher;
 use crate::FileAttributeStatus;

diff --git a/gio/src/auto/mod.rs b/gio/src/auto/mod.rs
@@ -502,6 +502,7 @@ pub use self::enums::TlsInteractionResult;
 #[cfg(any(feature = "v2_70", feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_70")))]
 pub use self::enums::TlsProtocolVersion;
+#[allow(deprecated)]
 pub use self::enums::TlsRehandshakeMode;
 #[cfg(any(unix, feature = "dox"))]
 #[cfg_attr(feature = "dox", doc(cfg(unix)))]
@@ -676,6 +677,7 @@ pub use self::constants::TLS_DATABASE_PURPOSE_AUTHENTICATE_CLIENT;
 pub use self::constants::TLS_DATABASE_PURPOSE_AUTHENTICATE_SERVER;
 pub use self::constants::VFS_EXTENSION_POINT_NAME;
 pub use self::constants::VOLUME_IDENTIFIER_KIND_CLASS;
+#[allow(deprecated)]
 pub use self::constants::VOLUME_IDENTIFIER_KIND_HAL_UDI;
 pub use self::constants::VOLUME_IDENTIFIER_KIND_LABEL;
 pub use self::constants::VOLUME_IDENTIFIER_KIND_NFS_MOUNT;

diff --git a/gio/src/auto/socket_client.rs b/gio/src/auto/socket_client.rs
@@ -1,6 +1,7 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
+#![allow(deprecated)]
 
 use crate::AsyncResult;
 use crate::Cancellable;
@@ -177,6 +178,7 @@ pub trait SocketClientExt: 'static {
     fn is_tls(&self) -> bool;
 
     #[cfg_attr(feature = "v2_72", deprecated = "Since 2.72")]
+    #[allow(deprecated)]
     #[doc(alias = "g_socket_client_get_tls_validation_flags")]
     #[doc(alias = "get_tls_validation_flags")]
     fn tls_validation_flags(&self) -> TlsCertificateFlags;
@@ -206,6 +208,7 @@ pub trait SocketClientExt: 'static {
     fn set_tls(&self, tls: bool);
 
     #[cfg_attr(feature = "v2_72", deprecated = "Since 2.72")]
+    #[allow(deprecated)]
     #[doc(alias = "g_socket_client_set_tls_validation_flags")]
     fn set_tls_validation_flags(&self, flags: TlsCertificateFlags);
 
@@ -696,6 +699,7 @@ impl<O: IsA<SocketClient>> SocketClientExt for O {
         unsafe { from_glib(ffi::g_socket_client_get_tls(self.as_ref().to_glib_none().0)) }
     }
 
+    #[allow(deprecated)]
     fn tls_validation_flags(&self) -> TlsCertificateFlags {
         unsafe {
             from_glib(ffi::g_socket_client_get_tls_validation_flags(
@@ -761,6 +765,7 @@ impl<O: IsA<SocketClient>> SocketClientExt for O {
         }
     }
 
+    #[allow(deprecated)]
     fn set_tls_validation_flags(&self, flags: TlsCertificateFlags) {
         unsafe {
             ffi::g_socket_client_set_tls_validation_flags(

diff --git a/gio/src/auto/tls_client_connection.rs b/gio/src/auto/tls_client_connection.rs
@@ -1,6 +1,7 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
+#![allow(deprecated)]
 
 use crate::IOStream;
 use crate::SocketConnectable;
@@ -62,6 +63,7 @@ pub trait TlsClientConnectionExt: 'static {
     fn server_identity(&self) -> Option<SocketConnectable>;
 
     #[cfg_attr(feature = "v2_72", deprecated = "Since 2.72")]
+    #[allow(deprecated)]
     #[doc(alias = "g_tls_client_connection_get_validation_flags")]
     #[doc(alias = "get_validation_flags")]
     fn validation_flags(&self) -> TlsCertificateFlags;
@@ -70,6 +72,7 @@ pub trait TlsClientConnectionExt: 'static {
     fn set_server_identity(&self, identity: &impl IsA<SocketConnectable>);
 
     #[cfg_attr(feature = "v2_72", deprecated = "Since 2.72")]
+    #[allow(deprecated)]
     #[doc(alias = "g_tls_client_connection_set_validation_flags")]
     fn set_validation_flags(&self, flags: TlsCertificateFlags);
 
@@ -110,6 +113,7 @@ impl<O: IsA<TlsClientConnection>> TlsClientConnectionExt for O {
         }
     }
 
+    #[allow(deprecated)]
     fn validation_flags(&self) -> TlsCertificateFlags {
         unsafe {
             from_glib(ffi::g_tls_client_connection_get_validation_flags(
@@ -127,6 +131,7 @@ impl<O: IsA<TlsClientConnection>> TlsClientConnectionExt for O {
         }
     }
 
+    #[allow(deprecated)]
     fn set_validation_flags(&self, flags: TlsCertificateFlags) {
         unsafe {
             ffi::g_tls_client_connection_set_validation_flags(

diff --git a/gio/src/auto/tls_connection.rs b/gio/src/auto/tls_connection.rs
@@ -1,6 +1,7 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
+#![allow(deprecated)]
 
 use crate::AsyncResult;
 use crate::Cancellable;
@@ -85,6 +86,7 @@ pub trait TlsConnectionExt: 'static {
     fn protocol_version(&self) -> TlsProtocolVersion;
 
     #[cfg_attr(feature = "v2_60", deprecated = "Since 2.60")]
+    #[allow(deprecated)]
     #[doc(alias = "g_tls_connection_get_rehandshake_mode")]
     #[doc(alias = "get_rehandshake_mode")]
     fn rehandshake_mode(&self) -> TlsRehandshakeMode;
@@ -124,6 +126,7 @@ pub trait TlsConnectionExt: 'static {
     fn set_interaction(&self, interaction: Option<&impl IsA<TlsInteraction>>);
 
     #[cfg_attr(feature = "v2_60", deprecated = "Since 2.60")]
+    #[allow(deprecated)]
     #[doc(alias = "g_tls_connection_set_rehandshake_mode")]
     fn set_rehandshake_mode(&self, mode: TlsRehandshakeMode);
 
@@ -277,6 +280,7 @@ impl<O: IsA<TlsConnection>> TlsConnectionExt for O {
         }
     }
 
+    #[allow(deprecated)]
     fn rehandshake_mode(&self) -> TlsRehandshakeMode {
         unsafe {
             from_glib(ffi::g_tls_connection_get_rehandshake_mode(
@@ -412,6 +416,7 @@ impl<O: IsA<TlsConnection>> TlsConnectionExt for O {
         }
     }
 
+    #[allow(deprecated)]
     fn set_rehandshake_mode(&self, mode: TlsRehandshakeMode) {
         unsafe {
             ffi::g_tls_connection_set_rehandshake_mode(

diff --git a/gio/src/auto/versions.txt b/gio/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 0eeebbdf9d4d)
-from gir-files (https://github.com/gtk-rs/gir-files @ d8382a5920b8)
+Generated by gir (https://github.com/gtk-rs/gir @ 6ec1537f60e3)
+from gir-files (https://github.com/gtk-rs/gir-files @ 4c173afc6395)
diff --git a/gio/sys/tests/abi.rs b/gio/sys/tests/abi.rs
@@ -2,6 +2,8 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
+#![cfg(target_os = "linux")]
+
 use gio_sys::*;
 use std::env;
 use std::error::Error;
@@ -12,7 +14,7 @@ use std::process::Command;
 use std::str;
 use tempfile::Builder;
 
-static PACKAGES: &[&str] = &["gio-2.0"];
+static PACKAGES: &[&str] = &["gio-2.0", "gio-unix-2.0"];
 
 #[derive(Clone, Debug)]
 struct Compiler {
@@ -110,7 +112,6 @@ impl Results {
 }
 
 #[test]
-#[cfg(target_os = "linux")]
 fn cross_validate_constants_with_c() {
     let mut c_constants: Vec<(String, String)> = Vec::new();
 
@@ -145,7 +146,6 @@ fn cross_validate_constants_with_c() {
 }
 
 #[test]
-#[cfg(target_os = "linux")]
 fn cross_validate_layout_with_c() {
     let mut c_layouts = Vec::new();
 

diff --git a/gio/sys/tests/manual.h b/gio/sys/tests/manual.h
@@ -11,3 +11,5 @@
 #include <gio/gunixmounts.h>
 #include <gio/gunixoutputstream.h>
 #include <gio/gunixsocketaddress.h>
+#define G_SETTINGS_ENABLE_BACKEND 1
+#include <gio/gsettingsbackend.h>
diff --git a/gio/sys/versions.txt b/gio/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 0eeebbdf9d4d)
-from gir-files (https://github.com/gtk-rs/gir-files @ d8382a5920b8)
+Generated by gir (https://github.com/gtk-rs/gir @ 6ec1537f60e3)
+from gir-files (https://github.com/gtk-rs/gir-files @ 4c173afc6395)
diff --git a/gir b/gir
diff --git a/gir-files b/gir-files
+7 −1		src/analysis/function_parameters.rs
+2 −2		src/analysis/namespaces.rs
+8 −1		src/codegen/constants.rs
+24 −4		src/codegen/enums.rs
+17 −3		src/codegen/flags.rs
+3 −2		src/codegen/function.rs
+18 −0		src/codegen/general.rs
+7 −0		src/codegen/object.rs
+1 −1		src/codegen/sys/cargo_toml.rs
+12 −5		src/codegen/sys/tests.rs
+1 −1		src/library.rs
+11 −11		src/parser.rs
+1 −1		Gdk-3.0.gir
+3 −3		Gtk-3.0.gir
+80 −25		Gtk-4.0.gir
+3 −3		Pango-1.0.gir