[librsvg: 11/11] Merge branch 'librsvg-cargo-workspace'

[Federico Mena Quintero <federico src gnome org>]

commit 900b31fa105089c186ee688a4ef87a3411169512
Merge: 2c306032 caceae34
Author: Federico Mena Quintero <federico gnome org>
Date:   Thu Feb 22 20:25:22 2018 -0600

    Merge branch 'librsvg-cargo-workspace'

 .gitignore                                         |   4 +
 rust/Cargo.lock => Cargo.lock                      |   6 +-
 Cargo.toml                                         |   7 +
 Makefile.am                                        | 237 +++++++++++----------
 Rsvg-2.0-custom.vala                               |  26 +--
 rust/cargo-vendor-config => cargo-vendor-config    |   0
 configure.ac                                       |   7 +-
 doc/Makefile.am                                    |   9 +-
 gdk-pixbuf-loader/io-svg.c                         |   2 +-
 librsvg-features.c => librsvg/librsvg-features.c   |   0
 .../librsvg-features.h.in                          |   0
 rsvg-attributes.h => librsvg/rsvg-attributes.h     |   0
 .../rsvg-base-file-util.c                          |   0
 rsvg-base.c => librsvg/rsvg-base.c                 |   0
 rsvg-cairo-clip.c => librsvg/rsvg-cairo-clip.c     |   0
 rsvg-cairo-clip.h => librsvg/rsvg-cairo-clip.h     |   0
 rsvg-cairo-draw.c => librsvg/rsvg-cairo-draw.c     |   0
 rsvg-cairo-draw.h => librsvg/rsvg-cairo-draw.h     |   0
 rsvg-cairo-render.c => librsvg/rsvg-cairo-render.c |   0
 rsvg-cairo-render.h => librsvg/rsvg-cairo-render.h |   0
 rsvg-cairo.h => librsvg/rsvg-cairo.h               |   0
 rsvg-cond.c => librsvg/rsvg-cond.c                 |   0
 rsvg-css.c => librsvg/rsvg-css.c                   |   0
 rsvg-css.h => librsvg/rsvg-css.h                   |   0
 rsvg-defs.c => librsvg/rsvg-defs.c                 |   0
 rsvg-defs.h => librsvg/rsvg-defs.h                 |   0
 rsvg-file-util.c => librsvg/rsvg-file-util.c       |   0
 rsvg-filter.c => librsvg/rsvg-filter.c             |   0
 rsvg-filter.h => librsvg/rsvg-filter.h             |   0
 rsvg-handle.c => librsvg/rsvg-handle.c             |   0
 rsvg-io.c => librsvg/rsvg-io.c                     |   0
 rsvg-io.h => librsvg/rsvg-io.h                     |   0
 rsvg-marker.h => librsvg/rsvg-marker.h             |   0
 rsvg-mask.h => librsvg/rsvg-mask.h                 |   0
 rsvg-paint-server.h => librsvg/rsvg-paint-server.h |   0
 rsvg-path-builder.h => librsvg/rsvg-path-builder.h |   0
 rsvg-private.h => librsvg/rsvg-private.h           |   0
 rsvg-shapes.h => librsvg/rsvg-shapes.h             |   0
 .../rsvg-size-callback.c                           |   0
 .../rsvg-size-callback.h                           |   0
 rsvg-structure.h => librsvg/rsvg-structure.h       |   0
 rsvg-styles.c => librsvg/rsvg-styles.c             |   0
 rsvg-styles.h => librsvg/rsvg-styles.h             |   0
 rsvg-text.c => librsvg/rsvg-text.c                 |   0
 rsvg-text.h => librsvg/rsvg-text.h                 |   0
 rsvg-xml.c => librsvg/rsvg-xml.c                   |   0
 rsvg-xml.h => librsvg/rsvg-xml.h                   |   0
 rsvg.h => librsvg/rsvg.h                           |   0
 rsvg-convert.c                                     |   6 +-
 rsvg-view.c                                        |   4 +-
 {rust => rsvg_internals}/Cargo.toml                |   3 +-
 {rust => rsvg_internals}/build.rs                  |   0
 {rust => rsvg_internals}/src/aspect_ratio.rs       |   0
 {rust => rsvg_internals}/src/attributes.rs         |   0
 {rust => rsvg_internals}/src/bbox.rs               |   0
 {rust => rsvg_internals}/src/chars.rs              |   0
 {rust => rsvg_internals}/src/clip_path.rs          |   0
 {rust => rsvg_internals}/src/cnode.rs              |   0
 {rust => rsvg_internals}/src/color.rs              |   0
 {rust => rsvg_internals}/src/coord_units.rs        |   0
 {rust => rsvg_internals}/src/drawing_ctx.rs        |   0
 {rust => rsvg_internals}/src/error.rs              |   0
 {rust => rsvg_internals}/src/gradient.rs           |   0
 {rust => rsvg_internals}/src/handle.rs             |   0
 {rust => rsvg_internals}/src/image.rs              |   0
 {rust => rsvg_internals}/src/length.rs             |   0
 {rust => rsvg_internals}/src/lib.rs                |   0
 {rust => rsvg_internals}/src/marker.rs             |   0
 {rust => rsvg_internals}/src/mask.rs               |   0
 {rust => rsvg_internals}/src/node.rs               |   0
 {rust => rsvg_internals}/src/opacity.rs            |   0
 {rust => rsvg_internals}/src/paint_server.rs       |   0
 .../src/parse_transform.lalrpop                    |   0
 {rust => rsvg_internals}/src/parsers.rs            |   0
 {rust => rsvg_internals}/src/path_builder.rs       |   0
 {rust => rsvg_internals}/src/path_parser.rs        |   0
 {rust => rsvg_internals}/src/pattern.rs            |   0
 {rust => rsvg_internals}/src/property_bag.rs       |   0
 {rust => rsvg_internals}/src/shapes.rs             |   0
 {rust => rsvg_internals}/src/space.rs              |   0
 {rust => rsvg_internals}/src/state.rs              |   0
 {rust => rsvg_internals}/src/stop.rs               |   0
 {rust => rsvg_internals}/src/structure.rs          |   0
 {rust => rsvg_internals}/src/text.rs               |   0
 {rust => rsvg_internals}/src/transform.rs          |   0
 {rust => rsvg_internals}/src/util.rs               |   0
 {rust => rsvg_internals}/src/viewbox.rs            |   0
 {rust => rsvg_internals}/src/viewport.rs           |   0
 tests/Makefile.am                                  |  19 +-
 tests/api.c                                        |   2 +-
 tests/crash.c                                      |   2 +-
 tests/dimensions.c                                 |   2 +-
 tests/loading.c                                    |   2 +-
 tests/render-crash.c                               |   2 +-
 tests/rsvg-test.c                                  |   2 +-
 tests/styles.c                                     |  10 +-
 tools/Makefile.am                                  |   2 +-
 tools/rsvg-dimensions.c                            |   2 +-
 tools/rsvg-tools-main.c                            |   4 +-
 win32/rsvg-rust.mak                                |   4 +-
 100 files changed, 189 insertions(+), 175 deletions(-)
---