Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Regen #2

Closed
wants to merge 13 commits into from
Closed

Regen #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e77efd4
Merge pull request #5 from GuillaumeGomez/master
GuillaumeGomez Oct 8, 2017
356a643
Add build.rs
GuillaumeGomez Oct 8, 2017
41d7a9f
update crate version
GuillaumeGomez Oct 8, 2017
19ce89c
Remove call to check_init_asserts
GuillaumeGomez Oct 8, 2017
2ed838a
Update versions
GuillaumeGomez Nov 26, 2017
90f1e25
Merge pull request #6 from gtk-rs/master-release-update
GuillaumeGomez Nov 26, 2017
cbf245b
update cargo file
GuillaumeGomez Jan 19, 2018
9d6987a
Update gir
GuillaumeGomez Jan 19, 2018
02920e0
regen
GuillaumeGomez Jan 19, 2018
b8e3081
Merge pull request #8 from GuillaumeGomez/regen
GuillaumeGomez Jan 20, 2018
0839ed0
Remove gir-files from crate
EPashkin Feb 10, 2018
e4058d1
Merge pull request #9 from EPashkin/remove_gir-files_from_crate
GuillaumeGomez Feb 10, 2018
b04eb00
Regen
EPashkin Feb 17, 2018
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
1 change: 0 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 12 additions & 9 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@ 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.4.0"
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"]
Expand All @@ -26,33 +29,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"
version = "0.3.0"
git = "https://github.com/gtk-rs/cairo"
19 changes: 19 additions & 0 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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() { }
2 changes: 1 addition & 1 deletion gir
Open in desktop
Submodule gir updated 92 files
+269 −85 Cargo.lock
+4 −8 Cargo.toml
+1 −0 Gir_Gtk.toml
+27 −8 README.md
+1 −1 build.rs
+101 −36 src/analysis/bounds.rs
+2 −21 src/analysis/child_properties.rs
+2 −0 src/analysis/class_hierarchy.rs
+49 −37 src/analysis/conversion_type.rs
+37 −40 src/analysis/ffi_type.rs
+50 −11 src/analysis/function_parameters.rs
+113 −17 src/analysis/functions.rs
+1 −0 src/analysis/general.rs
+59 −31 src/analysis/imports.rs
+1 −1 src/analysis/info_base.rs
+13 −19 src/analysis/mod.rs
+0 −11 src/analysis/namespaces.rs
+18 −21 src/analysis/object.rs
+4 −3 src/analysis/out_parameters.rs
+14 −97 src/analysis/properties.rs
+9 −9 src/analysis/record.rs
+8 −2 src/analysis/record_type.rs
+28 −35 src/analysis/ref_mode.rs
+6 −9 src/analysis/return_value.rs
+70 −76 src/analysis/rust_type.rs
+2 −1 src/analysis/safety_assertion_mode.rs
+32 −6 src/analysis/signatures.rs
+30 −8 src/analysis/symbols.rs
+10 −12 src/analysis/trampoline_parameters.rs
+8 −8 src/analysis/trampolines.rs
+232 −0 src/analysis/types.rs
+32 −3 src/chunk/chunk.rs
+1 −1 src/chunk/mod.rs
+13 −1 src/chunk/parameter_ffi_call_out.rs
+8 −8 src/codegen/child_properties.rs
+4 −4 src/codegen/doc/format.rs
+85 −35 src/codegen/doc/mod.rs
+46 −41 src/codegen/enums.rs
+32 −36 src/codegen/flags.rs
+31 −12 src/codegen/function.rs
+227 −45 src/codegen/function_body_chunk.rs
+108 −11 src/codegen/general.rs
+1 −0 src/codegen/mod.rs
+2 −0 src/codegen/object.rs
+3 −2 src/codegen/parameter.rs
+12 −9 src/codegen/properties.rs
+22 −59 src/codegen/property_body.rs
+22 −1 src/codegen/record.rs
+12 −16 src/codegen/return_value.rs
+42 −45 src/codegen/signal.rs
+42 −47 src/codegen/sys/ffi_type.rs
+139 −0 src/codegen/sys/fields.rs
+17 −19 src/codegen/sys/functions.rs
+154 −295 src/codegen/sys/lib_.rs
+3 −2 src/codegen/sys/mod.rs
+3 −7 src/codegen/sys/statics.rs
+33 −10 src/codegen/trait_impls.rs
+21 −27 src/codegen/trampoline.rs
+4 −3 src/codegen/trampoline_to_glib.rs
+35 −39 src/codegen/translate_from_glib.rs
+11 −10 src/codegen/translate_to_glib.rs
+4 −2 src/config/child_properties.rs
+26 −13 src/config/config.rs
+6 −6 src/config/error.rs
+10 −13 src/config/external_libraries.rs
+20 −8 src/config/functions.rs
+72 −13 src/config/gobjects.rs
+15 −19 src/config/ident.rs
+9 −2 src/config/members.rs
+4 −2 src/config/properties.rs
+24 −8 src/config/signals.rs
+5 −3 src/config/work_mode.rs
+8 −0 src/env.rs
+68 −19 src/library.rs
+209 −4 src/library_postprocessing.rs
+59 −28 src/main.rs
+5 −3 src/nameutil.rs
+664 −1,278 src/parser.rs
+36 −7 src/update_version.rs
+1 −1 src/writer/defines.rs
+1 −1 src/writer/mod.rs
+31 −2 src/writer/to_code.rs
+426 −0 src/xmlparser.rs
+2 −2 tests/sys/atk-sys/Cargo.toml
+3 −2 tests/sys/gdk-pixbuf-sys/Cargo.toml
+5 −2 tests/sys/gdk-sys/Cargo.toml
+7 −2 tests/sys/gio-sys/Cargo.toml
+7 −2 tests/sys/glib-sys/Cargo.toml
+4 −2 tests/sys/gobject-sys/Cargo.toml
+6 −2 tests/sys/gtk-sys/Cargo.toml
+4 −2 tests/sys/pango-sys/Cargo.toml
+2 −2 tests/sys/secret-sys/Cargo.toml
2 changes: 1 addition & 1 deletion gir-files
Open in desktop
Submodule gir-files updated 18 files
+3 −3 Atk-1.0.gir
+2,240 −7,471 GLib-2.0.gir
+51 −2 Gdk-3.0.gir
+40 −3 GdkPixbuf-2.0.gir
+96 −46 Gio-2.0.gir
+287 −135 Gtk-3.0.gir
+5 −5 GtkSource-3.0.gir
+8 −4 Pango-1.0.gir
+46 −166 PangoCairo-1.0.gir
+148 −12 Soup-2.4.gir
+154 −4 Vte-2.91.gir
+6 −6 WebKit2-4.0.gir
+229 −645 cairo-1.0.gir
+2 −3 dl.sh
+0 −32 fix.py
+31 −0 fix.sh
+3 −9 freetype2-2.0.gir
+2 −4 gir-dl.sh
4 changes: 2 additions & 2 deletions src/auto/enums.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// This file was generated by gir (0fe730d) 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;
use glib::translate::*;
use std;

3 changes: 2 additions & 1 deletion src/auto/flags.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// This file was generated by gir (0fe730d) 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;
Expand Down
3 changes: 2 additions & 1 deletion src/auto/font.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// This file was generated by gir (0fe730d) 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;
Expand Down
4 changes: 3 additions & 1 deletion src/auto/font_map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// This file was generated by gir (0fe730d) 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;
Expand Down Expand Up @@ -30,6 +31,7 @@ impl FontMap {
}

pub trait FontMapExt {
#[deprecated]
fn create_context(&self) -> Option<pango::Context>;

fn get_resolution(&self) -> f64;
Expand Down
3 changes: 2 additions & 1 deletion src/auto/functions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// This file was generated by gir (0fe730d) 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;
Expand Down
3 changes: 2 additions & 1 deletion src/auto/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// This file was generated by gir (0fe730d) 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;
Expand Down
4 changes: 3 additions & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <http://opensource.org/licenses/MIT>

#![allow(deprecated)]

extern crate cairo_sys as cairo_ffi;
extern crate pango_sys as pango_ffi;
extern crate glib_sys as glib_ffi;
Expand Down