Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gdk-pixbuf/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 59e3912ac141)
from gir-files (https://github.com/gtk-rs/gir-files @ a79d23cd6a42)
Generated by gir (https://github.com/gtk-rs/gir @ 35461d70ac74)
from gir-files (https://github.com/gtk-rs/gir-files @ fcba74747d79)
4 changes: 2 additions & 2 deletions gdk-pixbuf/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 59e3912ac141)
from gir-files (https://github.com/gtk-rs/gir-files @ a79d23cd6a42)
Generated by gir (https://github.com/gtk-rs/gir @ 35461d70ac74)
from gir-files (https://github.com/gtk-rs/gir-files @ fcba74747d79)
4 changes: 2 additions & 2 deletions gio/src/auto/enums.rs
Original file line number Diff line number Diff line change
Expand Up @@ -471,12 +471,12 @@ impl DBusError {
//}

//#[doc(alias = "g_dbus_error_set_dbus_error")]
//pub fn set_dbus_error(error: &mut glib::Error, dbus_error_name: &str, dbus_error_message: &str, format: Option<&str>, : /*Unknown conversion*//*Unimplemented*/Basic: VarArgs) {
//pub fn set_dbus_error(dbus_error_name: &str, dbus_error_message: &str, format: Option<&str>, : /*Unknown conversion*//*Unimplemented*/Basic: VarArgs) -> Option<glib::Error> {
// unsafe { TODO: call ffi:g_dbus_error_set_dbus_error() }
//}

//#[doc(alias = "g_dbus_error_set_dbus_error_valist")]
//pub fn set_dbus_error_valist(error: &mut glib::Error, dbus_error_name: &str, dbus_error_message: &str, format: Option<&str>, var_args: /*Unknown conversion*//*Unimplemented*/Unsupported) {
//pub fn set_dbus_error_valist(dbus_error_name: &str, dbus_error_message: &str, format: Option<&str>, var_args: /*Unknown conversion*//*Unimplemented*/Unsupported) -> Option<glib::Error> {
// unsafe { TODO: call ffi:g_dbus_error_set_dbus_error_valist() }
//}

Expand Down
4 changes: 2 additions & 2 deletions gio/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 59e3912ac141)
from gir-files (https://github.com/gtk-rs/gir-files @ a79d23cd6a42)
Generated by gir (https://github.com/gtk-rs/gir @ 35461d70ac74)
from gir-files (https://github.com/gtk-rs/gir-files @ fcba74747d79)
4 changes: 2 additions & 2 deletions gio/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 59e3912ac141)
from gir-files (https://github.com/gtk-rs/gir-files @ a79d23cd6a42)
Generated by gir (https://github.com/gtk-rs/gir @ 35461d70ac74)
from gir-files (https://github.com/gtk-rs/gir-files @ fcba74747d79)
2 changes: 1 addition & 1 deletion gir-files
4 changes: 2 additions & 2 deletions glib/gobject-sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 59e3912ac141)
from gir-files (https://github.com/gtk-rs/gir-files @ a79d23cd6a42)
Generated by gir (https://github.com/gtk-rs/gir @ 35461d70ac74)
from gir-files (https://github.com/gtk-rs/gir-files @ fcba74747d79)
4 changes: 2 additions & 2 deletions glib/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 59e3912ac141)
from gir-files (https://github.com/gtk-rs/gir-files @ a79d23cd6a42)
Generated by gir (https://github.com/gtk-rs/gir @ 35461d70ac74)
from gir-files (https://github.com/gtk-rs/gir-files @ fcba74747d79)
4 changes: 2 additions & 2 deletions glib/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 59e3912ac141)
from gir-files (https://github.com/gtk-rs/gir-files @ a79d23cd6a42)
Generated by gir (https://github.com/gtk-rs/gir @ 35461d70ac74)
from gir-files (https://github.com/gtk-rs/gir-files @ fcba74747d79)
4 changes: 2 additions & 2 deletions graphene/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 59e3912ac141)
from gir-files (https://github.com/gtk-rs/gir-files @ a79d23cd6a42)
Generated by gir (https://github.com/gtk-rs/gir @ 35461d70ac74)
from gir-files (https://github.com/gtk-rs/gir-files @ fcba74747d79)
4 changes: 2 additions & 2 deletions graphene/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 59e3912ac141)
from gir-files (https://github.com/gtk-rs/gir-files @ a79d23cd6a42)
Generated by gir (https://github.com/gtk-rs/gir @ 35461d70ac74)
from gir-files (https://github.com/gtk-rs/gir-files @ fcba74747d79)
4 changes: 4 additions & 0 deletions pango/src/auto/flags.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ bitflags! {
#[cfg_attr(docsrs, doc(cfg(feature = "v1_56")))]
#[doc(alias = "PANGO_FONT_MASK_FEATURES")]
const FEATURES = ffi::PANGO_FONT_MASK_FEATURES as _;
#[cfg(feature = "v1_57")]
#[cfg_attr(docsrs, doc(cfg(feature = "v1_57")))]
#[doc(alias = "PANGO_FONT_MASK_COLOR")]
const COLOR = ffi::PANGO_FONT_MASK_COLOR as _;
}
}

Expand Down
15 changes: 15 additions & 0 deletions pango/src/auto/font_description.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@ impl FontDescription {
}
}

//#[cfg(feature = "v1_57")]
//#[cfg_attr(docsrs, doc(cfg(feature = "v1_57")))]
//#[doc(alias = "pango_font_description_get_color")]
//#[doc(alias = "get_color")]
//pub fn color(&self) -> /*Ignored*/FontColor {
// unsafe { TODO: call ffi:pango_font_description_get_color() }
//}

#[doc(alias = "pango_font_description_get_family")]
#[doc(alias = "get_family")]
pub fn family(&self) -> Option<glib::GString> {
Expand Down Expand Up @@ -176,6 +184,13 @@ impl FontDescription {
}
}

//#[cfg(feature = "v1_57")]
//#[cfg_attr(docsrs, doc(cfg(feature = "v1_57")))]
//#[doc(alias = "pango_font_description_set_color")]
//pub fn set_color(&mut self, color: /*Ignored*/FontColor) {
// unsafe { TODO: call ffi:pango_font_description_set_color() }
//}

#[doc(alias = "pango_font_description_set_family")]
pub fn set_family(&mut self, family: &str) {
unsafe {
Expand Down
4 changes: 2 additions & 2 deletions pango/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 59e3912ac141)
from gir-files (https://github.com/gtk-rs/gir-files @ a79d23cd6a42)
Generated by gir (https://github.com/gtk-rs/gir @ 35461d70ac74)
from gir-files (https://github.com/gtk-rs/gir-files @ fcba74747d79)
4 changes: 4 additions & 0 deletions pango/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ v1_50 = ["v1_48"]
v1_52 = ["v1_50"]
v1_54 = ["v1_52"]
v1_56 = ["v1_54"]
v1_57 = ["v1_56"]

[lib]
name = "pango_sys"
Expand Down Expand Up @@ -85,6 +86,9 @@ version = "1.54"
[package.metadata.system-deps.pango.v1_56]
version = "1.55"

[package.metadata.system-deps.pango.v1_57]
version = "1.57"

[package.metadata.docs.rs]
rustc-args = ["--cfg", "docsrs"]
rustdoc-args = ["--cfg", "docsrs", "--generate-link-to-definition"]
Expand Down
21 changes: 21 additions & 0 deletions pango/sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,11 @@ pub const PANGO_ELLIPSIZE_START: PangoEllipsizeMode = 1;
pub const PANGO_ELLIPSIZE_MIDDLE: PangoEllipsizeMode = 2;
pub const PANGO_ELLIPSIZE_END: PangoEllipsizeMode = 3;

pub type PangoFontColor = c_int;
pub const PANGO_FONT_COLOR_FORBIDDEN: PangoFontColor = 0;
pub const PANGO_FONT_COLOR_REQUIRED: PangoFontColor = 1;
pub const PANGO_FONT_COLOR_DONT_CARE: PangoFontColor = 2;

pub type PangoFontScale = c_int;
pub const PANGO_FONT_SCALE_NONE: PangoFontScale = 0;
pub const PANGO_FONT_SCALE_SUPERSCRIPT: PangoFontScale = 1;
Expand Down Expand Up @@ -378,6 +383,9 @@ pub const PANGO_FONT_MASK_VARIATIONS: PangoFontMask = 128;
#[cfg(feature = "v1_56")]
#[cfg_attr(docsrs, doc(cfg(feature = "v1_56")))]
pub const PANGO_FONT_MASK_FEATURES: PangoFontMask = 256;
#[cfg(feature = "v1_57")]
#[cfg_attr(docsrs, doc(cfg(feature = "v1_57")))]
pub const PANGO_FONT_MASK_COLOR: PangoFontMask = 512;

pub type PangoLayoutDeserializeFlags = c_uint;
pub const PANGO_LAYOUT_DESERIALIZE_DEFAULT: PangoLayoutDeserializeFlags = 0;
Expand Down Expand Up @@ -1449,6 +1457,13 @@ extern "C" {
//=========================================================================
pub fn pango_ellipsize_mode_get_type() -> GType;

//=========================================================================
// PangoFontColor
//=========================================================================
#[cfg(feature = "v1_57")]
#[cfg_attr(docsrs, doc(cfg(feature = "v1_57")))]
pub fn pango_font_color_get_type() -> GType;

//=========================================================================
// PangoFontScale
//=========================================================================
Expand Down Expand Up @@ -1767,6 +1782,9 @@ extern "C" {
desc2: *const PangoFontDescription,
) -> gboolean;
pub fn pango_font_description_free(desc: *mut PangoFontDescription);
#[cfg(feature = "v1_57")]
#[cfg_attr(docsrs, doc(cfg(feature = "v1_57")))]
pub fn pango_font_description_get_color(desc: *const PangoFontDescription) -> PangoFontColor;
pub fn pango_font_description_get_family(desc: *const PangoFontDescription) -> *const c_char;
#[cfg(feature = "v1_56")]
#[cfg_attr(docsrs, doc(cfg(feature = "v1_56")))]
Expand Down Expand Up @@ -1803,6 +1821,9 @@ extern "C" {
desc: *mut PangoFontDescription,
size: c_double,
);
#[cfg(feature = "v1_57")]
#[cfg_attr(docsrs, doc(cfg(feature = "v1_57")))]
pub fn pango_font_description_set_color(desc: *mut PangoFontDescription, color: PangoFontColor);
pub fn pango_font_description_set_family(
desc: *mut PangoFontDescription,
family: *const c_char,
Expand Down
11 changes: 11 additions & 0 deletions pango/sys/tests/abi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,13 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
alignment: align_of::<PangoFontClass>(),
},
),
(
"PangoFontColor",
Layout {
size: size_of::<PangoFontColor>(),
alignment: align_of::<PangoFontColor>(),
},
),
(
"PangoFontFace",
Layout {
Expand Down Expand Up @@ -746,6 +753,10 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
("(gint) PANGO_ELLIPSIZE_MIDDLE", "2"),
("(gint) PANGO_ELLIPSIZE_NONE", "0"),
("(gint) PANGO_ELLIPSIZE_START", "1"),
("(gint) PANGO_FONT_COLOR_DONT_CARE", "2"),
("(gint) PANGO_FONT_COLOR_FORBIDDEN", "0"),
("(gint) PANGO_FONT_COLOR_REQUIRED", "1"),
("(guint) PANGO_FONT_MASK_COLOR", "512"),
("(guint) PANGO_FONT_MASK_FAMILY", "1"),
("(guint) PANGO_FONT_MASK_FEATURES", "256"),
("(guint) PANGO_FONT_MASK_GRAVITY", "64"),
Expand Down
4 changes: 4 additions & 0 deletions pango/sys/tests/constant.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ int main() {
PRINT_CONSTANT((gint) PANGO_ELLIPSIZE_MIDDLE);
PRINT_CONSTANT((gint) PANGO_ELLIPSIZE_NONE);
PRINT_CONSTANT((gint) PANGO_ELLIPSIZE_START);
PRINT_CONSTANT((gint) PANGO_FONT_COLOR_DONT_CARE);
PRINT_CONSTANT((gint) PANGO_FONT_COLOR_FORBIDDEN);
PRINT_CONSTANT((gint) PANGO_FONT_COLOR_REQUIRED);
PRINT_CONSTANT((guint) PANGO_FONT_MASK_COLOR);
PRINT_CONSTANT((guint) PANGO_FONT_MASK_FAMILY);
PRINT_CONSTANT((guint) PANGO_FONT_MASK_FEATURES);
PRINT_CONSTANT((guint) PANGO_FONT_MASK_GRAVITY);
Expand Down
1 change: 1 addition & 0 deletions pango/sys/tests/layout.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ int main() {
printf("%s;%zu;%zu\n", "PangoEllipsizeMode", sizeof(PangoEllipsizeMode), alignof(PangoEllipsizeMode));
printf("%s;%zu;%zu\n", "PangoFont", sizeof(PangoFont), alignof(PangoFont));
printf("%s;%zu;%zu\n", "PangoFontClass", sizeof(PangoFontClass), alignof(PangoFontClass));
printf("%s;%zu;%zu\n", "PangoFontColor", sizeof(PangoFontColor), alignof(PangoFontColor));
printf("%s;%zu;%zu\n", "PangoFontFace", sizeof(PangoFontFace), alignof(PangoFontFace));
printf("%s;%zu;%zu\n", "PangoFontFaceClass", sizeof(PangoFontFaceClass), alignof(PangoFontFaceClass));
printf("%s;%zu;%zu\n", "PangoFontFamily", sizeof(PangoFontFamily), alignof(PangoFontFamily));
Expand Down
4 changes: 2 additions & 2 deletions pango/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 59e3912ac141)
from gir-files (https://github.com/gtk-rs/gir-files @ a79d23cd6a42)
Generated by gir (https://github.com/gtk-rs/gir @ 35461d70ac74)
from gir-files (https://github.com/gtk-rs/gir-files @ fcba74747d79)
4 changes: 2 additions & 2 deletions pangocairo/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 59e3912ac141)
from gir-files (https://github.com/gtk-rs/gir-files @ a79d23cd6a42)
Generated by gir (https://github.com/gtk-rs/gir @ 35461d70ac74)
from gir-files (https://github.com/gtk-rs/gir-files @ fcba74747d79)
4 changes: 2 additions & 2 deletions pangocairo/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 59e3912ac141)
from gir-files (https://github.com/gtk-rs/gir-files @ a79d23cd6a42)
Generated by gir (https://github.com/gtk-rs/gir @ 35461d70ac74)
from gir-files (https://github.com/gtk-rs/gir-files @ fcba74747d79)