Merge pull request #631 from sdroege/version-updates

Update minimum supported GLib version to 2.56
gtk-rs · Apr 7, 2022 · b8c9a38 · b8c9a38
2 parents 01ba402 + 8f7aa83
commit b8c9a38
Show file tree

Hide file tree

Showing 59 changed files with 41 additions and 610 deletions.
diff --git a/gdk-pixbuf/Cargo.toml b/gdk-pixbuf/Cargo.toml
@@ -19,9 +19,7 @@ rust-version = "1.57"
 name = "gdk_pixbuf"
 
 [features]
-v2_36 = ["ffi/v2_36"]
-v2_36_8 = ["v2_36", "ffi/v2_36_8"]
-v2_40 = ["v2_36_8", "ffi/v2_40"]
+v2_40 = ["ffi/v2_40"]
 v2_42 = ["v2_40", "ffi/v2_42"]
 dox = ["glib/dox", "ffi/dox"]
 

diff --git a/gdk-pixbuf/Gir.toml b/gdk-pixbuf/Gir.toml
@@ -2,7 +2,7 @@
 girs_directories = ["../gir-files"]
 library = "GdkPixbuf"
 version = "2.0"
-min_cfg_version = "2.32"
+min_cfg_version = "2.36.8"
 target_path = "."
 work_mode = "normal"
 single_version_file = true

diff --git a/gdk-pixbuf/README.md b/gdk-pixbuf/README.md
@@ -2,7 +2,7 @@
 
 __Rust__ bindings and wrappers for [GDK-Pixbuf](https://docs.gtk.org/gdk-pixbuf), part of [gtk-rs-core](https://github.com/gtk-rs/gtk-rs-core).
 
-GDK-PixBuf __2.32__ is the lowest supported version for the underlying library.
+GDK-PixBuf __2.36.8__ is the lowest supported version for the underlying library.
 
 ## Minimum supported Rust version
 

diff --git a/gdk-pixbuf/src/auto/pixbuf.rs b/gdk-pixbuf/src/auto/pixbuf.rs
@@ -322,8 +322,6 @@ impl Pixbuf {
         }
     }
 
-    #[cfg(any(feature = "v2_36", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_36")))]
     #[doc(alias = "gdk_pixbuf_copy_options")]
     pub fn copy_options(&self, dest_pixbuf: &Pixbuf) -> bool {
         unsafe {
@@ -436,8 +434,6 @@ impl Pixbuf {
         unsafe { from_glib_full(ffi::gdk_pixbuf_read_pixel_bytes(self.to_glib_none().0)) }
     }
 
-    #[cfg(any(feature = "v2_36", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_36")))]
     #[doc(alias = "gdk_pixbuf_remove_option")]
     pub fn remove_option(&self, key: &str) -> bool {
         unsafe {
@@ -584,8 +580,6 @@ impl Pixbuf {
         glib::ObjectExt::property(self, "pixel-bytes")
     }
 
-    #[cfg(any(feature = "v2_36_8", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_36_8")))]
     #[doc(alias = "gdk_pixbuf_calculate_rowstride")]
     pub fn calculate_rowstride(
         colorspace: Colorspace,

diff --git a/gdk-pixbuf/src/auto/pixbuf_format.rs b/gdk-pixbuf/src/auto/pixbuf_format.rs
@@ -75,8 +75,6 @@ impl PixbufFormat {
         }
     }
 
-    #[cfg(any(feature = "v2_36", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_36")))]
     #[doc(alias = "gdk_pixbuf_format_is_save_option_supported")]
     pub fn is_save_option_supported(&self, option_key: &str) -> bool {
         unsafe {

diff --git a/gdk-pixbuf/src/pixbuf.rs b/gdk-pixbuf/src/pixbuf.rs
@@ -478,8 +478,6 @@ impl Pixbuf {
         }
     }
 
-    #[cfg(any(feature = "v2_36", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_36")))]
     #[doc(alias = "gdk_pixbuf_save_to_streamv")]
     pub fn save_to_streamv<P: IsA<gio::OutputStream>, Q: IsA<gio::Cancellable>>(
         &self,
@@ -510,8 +508,6 @@ impl Pixbuf {
         }
     }
 
-    #[cfg(any(feature = "v2_36", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_36")))]
     #[doc(alias = "gdk_pixbuf_save_to_streamv_async")]
     pub fn save_to_streamv_async<
         P: IsA<gio::OutputStream>,
@@ -574,8 +570,6 @@ impl Pixbuf {
         }
     }
 
-    #[cfg(any(feature = "v2_36", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_36")))]
     pub fn save_to_streamv_future<P: IsA<gio::OutputStream> + Clone + 'static>(
         &self,
         stream: &P,

diff --git a/gdk-pixbuf/sys/Cargo.toml b/gdk-pixbuf/sys/Cargo.toml
@@ -21,10 +21,8 @@ shell-words = "1.0.0"
 tempfile = "3"
 
 [features]
-v2_36 = []
-v2_36_8 = ["v2_36"]
-v2_40 = ["v2_36_8"]
 dox = []
+v2_40 = []
 v2_42 = ["v2_40"]
 
 [lib]
@@ -46,12 +44,6 @@ rust-version = "1.57"
 features = ["dox"]
 [package.metadata.system-deps.gdk_pixbuf_2_0]
 name = "gdk-pixbuf-2.0"
-version = "2.32"
-
-[package.metadata.system-deps.gdk_pixbuf_2_0.v2_36]
-version = "2.36"
-
-[package.metadata.system-deps.gdk_pixbuf_2_0.v2_36_8]
 version = "2.36.8"
 
 [package.metadata.system-deps.gdk_pixbuf_2_0.v2_40]

diff --git a/gdk-pixbuf/sys/Gir.toml b/gdk-pixbuf/sys/Gir.toml
@@ -2,7 +2,7 @@
 work_mode = "sys"
 library = "GdkPixbuf"
 version = "2.0"
-min_cfg_version = "2.32"
+min_cfg_version = "2.36.8"
 single_version_file = "."
 girs_directories = ["../../gir-files"]
 

diff --git a/gdk-pixbuf/sys/src/lib.rs b/gdk-pixbuf/sys/src/lib.rs
@@ -425,8 +425,6 @@ extern "C" {
     pub fn gdk_pixbuf_format_get_mime_types(format: *mut GdkPixbufFormat) -> *mut *mut c_char;
     pub fn gdk_pixbuf_format_get_name(format: *mut GdkPixbufFormat) -> *mut c_char;
     pub fn gdk_pixbuf_format_is_disabled(format: *mut GdkPixbufFormat) -> gboolean;
-    #[cfg(any(feature = "v2_36", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_36")))]
     pub fn gdk_pixbuf_format_is_save_option_supported(
         format: *mut GdkPixbufFormat,
         option_key: *const c_char,
@@ -541,8 +539,6 @@ extern "C" {
         error: *mut *mut glib::GError,
     ) -> *mut GdkPixbuf;
     pub fn gdk_pixbuf_new_from_xpm_data(data: *mut *const c_char) -> *mut GdkPixbuf;
-    #[cfg(any(feature = "v2_36_8", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_36_8")))]
     pub fn gdk_pixbuf_calculate_rowstride(
         colorspace: GdkColorspace,
         has_alpha: gboolean,
@@ -652,8 +648,6 @@ extern "C" {
         dest_x: c_int,
         dest_y: c_int,
     );
-    #[cfg(any(feature = "v2_36", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_36")))]
     pub fn gdk_pixbuf_copy_options(
         src_pixbuf: *mut GdkPixbuf,
         dest_pixbuf: *mut GdkPixbuf,
@@ -685,8 +679,6 @@ extern "C" {
     pub fn gdk_pixbuf_read_pixel_bytes(pixbuf: *const GdkPixbuf) -> *mut glib::GBytes;
     pub fn gdk_pixbuf_read_pixels(pixbuf: *const GdkPixbuf) -> *const u8;
     pub fn gdk_pixbuf_ref(pixbuf: *mut GdkPixbuf) -> *mut GdkPixbuf;
-    #[cfg(any(feature = "v2_36", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_36")))]
     pub fn gdk_pixbuf_remove_option(pixbuf: *mut GdkPixbuf, key: *const c_char) -> gboolean;
     pub fn gdk_pixbuf_rotate_simple(
         src: *const GdkPixbuf,
@@ -765,8 +757,6 @@ extern "C" {
         user_data: gpointer,
         ...
     );
-    #[cfg(any(feature = "v2_36", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_36")))]
     pub fn gdk_pixbuf_save_to_streamv(
         pixbuf: *mut GdkPixbuf,
         stream: *mut gio::GOutputStream,
@@ -776,8 +766,6 @@ extern "C" {
         cancellable: *mut gio::GCancellable,
         error: *mut *mut glib::GError,
     ) -> gboolean;
-    #[cfg(any(feature = "v2_36", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_36")))]
     pub fn gdk_pixbuf_save_to_streamv_async(
         pixbuf: *mut GdkPixbuf,
         stream: *mut gio::GOutputStream,

diff --git a/gio/Cargo.toml b/gio/Cargo.toml
@@ -20,11 +20,7 @@ build = "build.rs"
 name = "gio"
 
 [features]
-v2_50 = ["ffi/v2_50", "glib/v2_50"]
-v2_52 = ["v2_50", "ffi/v2_52", "glib/v2_52"]
-v2_54 = ["v2_52", "ffi/v2_54", "glib/v2_54"]
-v2_56 = ["v2_54", "ffi/v2_56", "glib/v2_56"]
-v2_58 = ["v2_56", "ffi/v2_58", "glib/v2_58"]
+v2_58 = ["ffi/v2_58", "glib/v2_58"]
 v2_60 = ["v2_58", "ffi/v2_60", "glib/v2_60"]
 v2_62 = ["v2_60", "ffi/v2_62", "glib/v2_62"]
 v2_64 = ["v2_62", "ffi/v2_64", "glib/v2_64"]

diff --git a/gio/Gir.toml b/gio/Gir.toml
@@ -2,7 +2,7 @@
 girs_directories = ["../gir-files"]
 library = "Gio"
 version = "2.0"
-min_cfg_version = "2.48"
+min_cfg_version = "2.56"
 target_path = "."
 work_mode = "normal"
 single_version_file = true

diff --git a/gio/README.md b/gio/README.md
@@ -2,7 +2,7 @@
 
 __Rust__ bindings and wrappers for [GIO](https://docs.gtk.org/gio/), part of [gtk-rs-core](https://github.com/gtk-rs/gtk-rs-core).
 
-GIO __2.48__ is the lowest supported version for the underlying library.
+GIO __2.56__ is the lowest supported version for the underlying library.
 
 ## Minimum supported Rust version
 

diff --git a/gio/src/auto/app_info.rs b/gio/src/auto/app_info.rs
@@ -4,22 +4,14 @@
 
 use crate::AppInfoCreateFlags;
 use crate::AppLaunchContext;
-#[cfg(any(feature = "v2_50", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_50")))]
 use crate::AsyncResult;
-#[cfg(any(feature = "v2_50", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_50")))]
 use crate::Cancellable;
 use crate::File;
 use crate::Icon;
 use glib::object::IsA;
 use glib::translate::*;
-#[cfg(any(feature = "v2_50", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_50")))]
 use std::boxed::Box as Box_;
 use std::fmt;
-#[cfg(any(feature = "v2_50", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_50")))]
 use std::pin::Pin;
 use std::ptr;
 
@@ -135,8 +127,6 @@ impl AppInfo {
         }
     }
 
-    #[cfg(any(feature = "v2_50", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_50")))]
     #[doc(alias = "g_app_info_launch_default_for_uri_async")]
     pub fn launch_default_for_uri_async<P: FnOnce(Result<(), glib::Error>) + 'static>(
         uri: &str,
@@ -187,8 +177,6 @@ impl AppInfo {
         }
     }
 
-    #[cfg(any(feature = "v2_50", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_50")))]
     pub fn launch_default_for_uri_future(
         uri: &str,
         context: Option<&(impl IsA<AppLaunchContext> + Clone + 'static)>,

diff --git a/gio/src/auto/application.rs b/gio/src/auto/application.rs
@@ -239,18 +239,12 @@ pub trait ApplicationExt: 'static {
     #[doc(alias = "g_application_set_inactivity_timeout")]
     fn set_inactivity_timeout(&self, inactivity_timeout: u32);
 
-    #[cfg(any(feature = "v2_56", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_56")))]
     #[doc(alias = "g_application_set_option_context_description")]
     fn set_option_context_description(&self, description: Option<&str>);
 
-    #[cfg(any(feature = "v2_56", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_56")))]
     #[doc(alias = "g_application_set_option_context_parameter_string")]
     fn set_option_context_parameter_string(&self, parameter_string: Option<&str>);
 
-    #[cfg(any(feature = "v2_56", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_56")))]
     #[doc(alias = "g_application_set_option_context_summary")]
     fn set_option_context_summary(&self, summary: Option<&str>);
 
@@ -524,8 +518,6 @@ impl<O: IsA<Application>> ApplicationExt for O {
         }
     }
 
-    #[cfg(any(feature = "v2_56", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_56")))]
     fn set_option_context_description(&self, description: Option<&str>) {
         unsafe {
             ffi::g_application_set_option_context_description(
@@ -535,8 +527,6 @@ impl<O: IsA<Application>> ApplicationExt for O {
         }
     }
 
-    #[cfg(any(feature = "v2_56", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_56")))]
     fn set_option_context_parameter_string(&self, parameter_string: Option<&str>) {
         unsafe {
             ffi::g_application_set_option_context_parameter_string(
@@ -546,8 +536,6 @@ impl<O: IsA<Application>> ApplicationExt for O {
         }
     }
 
-    #[cfg(any(feature = "v2_56", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_56")))]
     fn set_option_context_summary(&self, summary: Option<&str>) {
         unsafe {
             ffi::g_application_set_option_context_summary(

diff --git a/gio/src/auto/constants.rs b/gio/src/auto/constants.rs
@@ -285,8 +285,6 @@ pub static FILE_ATTRIBUTE_PREVIEW_ICON: once_cell::sync::Lazy<&'static str> =
             .to_str()
             .unwrap()
     });
-#[cfg(any(feature = "v2_52", feature = "dox"))]
-#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_52")))]
 #[doc(alias = "G_FILE_ATTRIBUTE_RECENT_MODIFIED")]
 pub static FILE_ATTRIBUTE_RECENT_MODIFIED: once_cell::sync::Lazy<&'static str> =
     once_cell::sync::Lazy::new(|| unsafe {

diff --git a/gio/src/auto/desktop_app_info.rs b/gio/src/auto/desktop_app_info.rs
@@ -112,8 +112,6 @@ impl DesktopAppInfo {
         }
     }
 
-    #[cfg(any(feature = "v2_56", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_56")))]
     #[doc(alias = "g_desktop_app_info_get_locale_string")]
     #[doc(alias = "get_locale_string")]
     pub fn locale_string(&self, key: &str) -> Option<glib::GString> {

diff --git a/gio/src/auto/drive.rs b/gio/src/auto/drive.rs
@@ -108,8 +108,6 @@ pub trait DriveExt: 'static {
     #[doc(alias = "g_drive_is_media_removable")]
     fn is_media_removable(&self) -> bool;
 
-    #[cfg(any(feature = "v2_50", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_50")))]
     #[doc(alias = "g_drive_is_removable")]
     fn is_removable(&self) -> bool;
 
@@ -346,8 +344,6 @@ impl<O: IsA<Drive>> DriveExt for O {
         }
     }
 
-    #[cfg(any(feature = "v2_50", feature = "dox"))]
-    #[cfg_attr(feature = "dox", doc(cfg(feature = "v2_50")))]
     fn is_removable(&self) -> bool {
         unsafe { from_glib(ffi::g_drive_is_removable(self.as_ref().to_glib_none().0)) }
     }