From 356a6438dee843f9775ceae291346fdbd73f195b Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sun, 8 Oct 2017 17:24:55 +0200 Subject: [PATCH 1/9] Add build.rs --- build.rs | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 build.rs diff --git a/build.rs b/build.rs new file mode 100644 index 0000000..72cb7cd --- /dev/null +++ b/build.rs @@ -0,0 +1,19 @@ +fn main() { + manage_docs(); +} + +#[cfg(any(feature = "embed-lgpl-docs", feature = "purge-lgpl-docs"))] +fn manage_docs () { + extern crate lgpl_docs; + const PATH: &'static str = "src"; + const IGNORES: &'static [&'static str] = &[ + "lib.rs", + ]; + lgpl_docs::purge(PATH, IGNORES); + if cfg!(feature = "embed-lgpl-docs") { + lgpl_docs::embed(lgpl_docs::Library::PangoCairo, PATH, IGNORES); + } +} + +#[cfg(not(any(feature = "embed-lgpl-docs", feature = "purge-lgpl-docs")))] +fn manage_docs() { } From 41d7a9fe26e8a55cd8cf925da7a752138e2a5598 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sun, 8 Oct 2017 17:25:15 +0200 Subject: [PATCH 2/9] update crate version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index adce99b..2e34325 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ homepage = "http://gtk-rs.org/" authors = ["The Gtk-rs Project Developers"] keywords = ["pango", "cairo", "gtk-rs", "gnome"] readme = "README.md" -version = "0.3.1" +version = "0.3.2" description = "Rust bindings for the PangoCairo library" repository = "/~https://github.com/gtk-rs/pangocairo" license = "MIT" From 19ce89cbdffa4328cfca320b5b7da23ae918d084 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sun, 8 Oct 2017 18:41:25 +0200 Subject: [PATCH 3/9] Remove call to check_init_asserts --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9cdaf49..09b201b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ addons: - libgtk-3-dev script: - rustc --version - - ./check_init_asserts - cargo install clippy || touch clippy_failed - if [ ! -f clippy_failed ]; then cargo clippy; fi - cargo test --features embed-lgpl-docs --jobs 1 From 2ed838ab97b1c0c6149999e359938bb2b4984d71 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Sun, 26 Nov 2017 16:39:29 +0100 Subject: [PATCH 4/9] Update versions --- Cargo.toml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2e34325..2aa7d7d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ homepage = "http://gtk-rs.org/" authors = ["The Gtk-rs Project Developers"] keywords = ["pango", "cairo", "gtk-rs", "gnome"] readme = "README.md" -version = "0.3.2" +version = "0.4.0" description = "Rust bindings for the PangoCairo library" repository = "/~https://github.com/gtk-rs/pangocairo" license = "MIT" @@ -26,33 +26,33 @@ libc = "0.2" bitflags = "0.9" [dependencies.pango-sys] -version = "0.4.0" +version = "0.5.0" git = "/~https://github.com/gtk-rs/sys" [dependencies.glib] -version = "0.3.0" +version = "0.4.0" git = "/~https://github.com/gtk-rs/glib" [dependencies.glib-sys] -version = "0.4.0" +version = "0.5.0" git = "/~https://github.com/gtk-rs/sys" [dependencies.gobject-sys] -version = "0.4.0" +version = "0.5.0" git = "/~https://github.com/gtk-rs/sys" [dependencies.cairo-sys-rs] -version = "0.4.0" +version = "0.5.0" git = "/~https://github.com/gtk-rs/cairo" [dependencies.pangocairo-sys] -version = "0.5.0" +version = "0.6.0" git = "/~https://github.com/gtk-rs/sys" [dependencies.pango] -version = "0.2.0" +version = "0.3.0" git = "/~https://github.com/gtk-rs/pango" [dependencies.cairo-rs] -version = "0.2.0" -git = "/~https://github.com/gtk-rs/cairo" +version = "0.3.0" +git = "/~https://github.com/gtk-rs/cairo" \ No newline at end of file From cbf245b05bfc2aa60c15c2eba6b699478e47586c Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Fri, 19 Jan 2018 22:34:32 +0100 Subject: [PATCH 5/9] update cargo file --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 2aa7d7d..14971fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,4 +55,4 @@ git = "/~https://github.com/gtk-rs/pango" [dependencies.cairo-rs] version = "0.3.0" -git = "/~https://github.com/gtk-rs/cairo" \ No newline at end of file +git = "/~https://github.com/gtk-rs/cairo" From 9d6987a0e4ad497328a81fbb4b92307817df1c88 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Fri, 19 Jan 2018 22:34:38 +0100 Subject: [PATCH 6/9] Update gir --- gir | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gir b/gir index 0fe730d..c6b70b0 160000 --- a/gir +++ b/gir @@ -1 +1 @@ -Subproject commit 0fe730d9547f263ef5a3fdae9f00e06e64875d3b +Subproject commit c6b70b00ac5b3de2defc59da54685aa488a34e3d From 02920e0263ab541476f5ea04e70999d2a7f1a053 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Fri, 19 Jan 2018 22:39:10 +0100 Subject: [PATCH 7/9] regen --- src/auto/enums.rs | 3 +-- src/auto/flags.rs | 2 +- src/auto/font.rs | 2 +- src/auto/font_map.rs | 3 ++- src/auto/functions.rs | 2 +- src/auto/mod.rs | 2 +- src/lib.rs | 4 +++- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/auto/enums.rs b/src/auto/enums.rs index 8c9df91..cd5e771 100644 --- a/src/auto/enums.rs +++ b/src/auto/enums.rs @@ -1,7 +1,6 @@ -// This file was generated by gir (0fe730d) from gir-files (469db10) +// This file was generated by gir (c6b70b0) from gir-files (469db10) // DO NOT EDIT use ffi; use glib::translate::*; -use std; diff --git a/src/auto/flags.rs b/src/auto/flags.rs index 7ea398a..cd5e771 100644 --- a/src/auto/flags.rs +++ b/src/auto/flags.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (0fe730d) from gir-files (469db10) +// This file was generated by gir (c6b70b0) from gir-files (469db10) // DO NOT EDIT use ffi; diff --git a/src/auto/font.rs b/src/auto/font.rs index f7f95f0..f464da5 100644 --- a/src/auto/font.rs +++ b/src/auto/font.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (0fe730d) from gir-files (469db10) +// This file was generated by gir (c6b70b0) from gir-files (469db10) // DO NOT EDIT use cairo; diff --git a/src/auto/font_map.rs b/src/auto/font_map.rs index eef0800..e9484de 100644 --- a/src/auto/font_map.rs +++ b/src/auto/font_map.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (0fe730d) from gir-files (469db10) +// This file was generated by gir (c6b70b0) from gir-files (469db10) // DO NOT EDIT use ffi; @@ -30,6 +30,7 @@ impl FontMap { } pub trait FontMapExt { + #[deprecated] fn create_context(&self) -> Option; fn get_resolution(&self) -> f64; diff --git a/src/auto/functions.rs b/src/auto/functions.rs index 036c847..3b174f3 100644 --- a/src/auto/functions.rs +++ b/src/auto/functions.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (0fe730d) from gir-files (469db10) +// This file was generated by gir (c6b70b0) from gir-files (469db10) // DO NOT EDIT use cairo; diff --git a/src/auto/mod.rs b/src/auto/mod.rs index f9e5226..7dbb192 100644 --- a/src/auto/mod.rs +++ b/src/auto/mod.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (0fe730d) from gir-files (469db10) +// This file was generated by gir (c6b70b0) from gir-files (469db10) // DO NOT EDIT mod font; diff --git a/src/lib.rs b/src/lib.rs index 1a37520..5bdf5ea 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,7 +1,9 @@ -// Copyright 2017, The Gtk-rs Project Developers. +// Copyright 2018, The Gtk-rs Project Developers. // See the COPYRIGHT file at the top-level directory of this distribution. // Licensed under the MIT license, see the LICENSE file or +#![allow(deprecated)] + extern crate cairo_sys as cairo_ffi; extern crate pango_sys as pango_ffi; extern crate glib_sys as glib_ffi; From 0839ed0d2f0cb94099f309b1648ed3754b728aa4 Mon Sep 17 00:00:00 2001 From: Evgenii Pashkin Date: Sat, 10 Feb 2018 20:31:40 +0300 Subject: [PATCH 8/9] Remove gir-files from crate --- Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 14971fa..3e5437b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,6 +10,9 @@ description = "Rust bindings for the PangoCairo library" repository = "/~https://github.com/gtk-rs/pangocairo" license = "MIT" build = "build.rs" +exclude = [ + "gir-files/*", +] [features] dox = ["glib/dox", "pango/dox", "cairo-rs/dox"] From b04eb0042e8bd81d5e8be3ed43208eb1b6463ec0 Mon Sep 17 00:00:00 2001 From: Evgenii Pashkin Date: Sat, 17 Feb 2018 15:26:07 +0300 Subject: [PATCH 9/9] Regen --- gir | 2 +- gir-files | 2 +- src/auto/enums.rs | 3 ++- src/auto/flags.rs | 3 ++- src/auto/font.rs | 3 ++- src/auto/font_map.rs | 3 ++- src/auto/functions.rs | 3 ++- src/auto/mod.rs | 3 ++- 8 files changed, 14 insertions(+), 8 deletions(-) diff --git a/gir b/gir index c6b70b0..8b9d0bb 160000 --- a/gir +++ b/gir @@ -1 +1 @@ -Subproject commit c6b70b00ac5b3de2defc59da54685aa488a34e3d +Subproject commit 8b9d0bb32ed3b76ff9931ee283c07d32af955b60 diff --git a/gir-files b/gir-files index 469db10..77d1f70 160000 --- a/gir-files +++ b/gir-files @@ -1 +1 @@ -Subproject commit 469db1018320ebda8f82b144e411fba8b2373549 +Subproject commit 77d1f70a9c4804961897d64827794442becb07d5 diff --git a/src/auto/enums.rs b/src/auto/enums.rs index cd5e771..7274e5e 100644 --- a/src/auto/enums.rs +++ b/src/auto/enums.rs @@ -1,4 +1,5 @@ -// This file was generated by gir (c6b70b0) from gir-files (469db10) +// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb) +// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70) // DO NOT EDIT use ffi; diff --git a/src/auto/flags.rs b/src/auto/flags.rs index cd5e771..7274e5e 100644 --- a/src/auto/flags.rs +++ b/src/auto/flags.rs @@ -1,4 +1,5 @@ -// This file was generated by gir (c6b70b0) from gir-files (469db10) +// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb) +// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70) // DO NOT EDIT use ffi; diff --git a/src/auto/font.rs b/src/auto/font.rs index f464da5..8884af7 100644 --- a/src/auto/font.rs +++ b/src/auto/font.rs @@ -1,4 +1,5 @@ -// This file was generated by gir (c6b70b0) from gir-files (469db10) +// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb) +// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70) // DO NOT EDIT use cairo; diff --git a/src/auto/font_map.rs b/src/auto/font_map.rs index e9484de..85f35ca 100644 --- a/src/auto/font_map.rs +++ b/src/auto/font_map.rs @@ -1,4 +1,5 @@ -// This file was generated by gir (c6b70b0) from gir-files (469db10) +// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb) +// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70) // DO NOT EDIT use ffi; diff --git a/src/auto/functions.rs b/src/auto/functions.rs index 3b174f3..3c0d78a 100644 --- a/src/auto/functions.rs +++ b/src/auto/functions.rs @@ -1,4 +1,5 @@ -// This file was generated by gir (c6b70b0) from gir-files (469db10) +// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb) +// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70) // DO NOT EDIT use cairo; diff --git a/src/auto/mod.rs b/src/auto/mod.rs index 7dbb192..29b41de 100644 --- a/src/auto/mod.rs +++ b/src/auto/mod.rs @@ -1,4 +1,5 @@ -// This file was generated by gir (c6b70b0) from gir-files (469db10) +// This file was generated by gir (/~https://github.com/gtk-rs/gir @ 8b9d0bb) +// from gir-files (/~https://github.com/gtk-rs/gir-files @ 77d1f70) // DO NOT EDIT mod font;