GNOME.org
 

[librsvg: 17/26] Remove references to libcroco

commit 03ce9bd7875ef2a91979bc4f7d6fa5188cfd785c
Author: Federico Mena Quintero <federico gnome org>
Date:   Fri Nov 8 18:01:49 2019 -0600

    Remove references to libcroco

 COMPILING.md              |  9 ++++-----
 Cargo.lock                | 24 ++++++++++++------------
 Makefile.am               |  1 -
 configure.ac              |  7 +++----
 librsvg_crate/build.rs    |  3 +--
 po/POTFILES.in            |  1 -
 rsvg_internals/src/lib.rs |  1 -
 win32/README.txt          |  1 -
 win32/config-msvc.mak.in  |  2 --
 9 files changed, 20 insertions(+), 29 deletions(-)
---
diff --git a/COMPILING.md b/COMPILING.md
index ffcc3ddf..392128cc 100644
--- a/COMPILING.md
+++ b/COMPILING.md
@@ -39,7 +39,6 @@ minimum version is listed here; you may use a newer version instead.
 
 * Cairo 1.16.0 with PNG support
 * Freetype2 2.8.0
-* Libcroco 0.6.1
 * Gdk-pixbuf 2.20.0
 * GIO 2.24.0
 * GObject-Introspection 0.10.8
@@ -61,7 +60,7 @@ apt-get install -y gcc make rustc cargo \
 automake autoconf libtool gettext itstool \
 libgdk-pixbuf2.0-dev libgirepository1.0-dev \
 gtk-doc-tools git \
-libxml2-dev libcroco3-dev libcairo2-dev libpango1.0-dev
+libxml2-dev libcairo2-dev libpango1.0-dev
 ```
 
 Additionally, as of September 2018 you need to add `gdk-pixbuf` utilities to your path, see #331 for more.
@@ -77,7 +76,7 @@ dnf install -y gcc rust rust-std-static cargo make \
 automake autoconf libtool gettext itstool \
 gdk-pixbuf2-devel gobject-introspection-devel \
 gtk-doc git redhat-rpm-config gettext-devel \
-libxml2-devel libcroco-devel cairo-devel pango-devel
+libxml2-devel cairo-devel pango-devel
 ```
 
 ### openSUSE based systems
@@ -86,7 +85,7 @@ libxml2-devel libcroco-devel cairo-devel pango-devel
 zypper install -y gcc rust rust-std cargo make \
 automake autoconf libtool gettext itstool git \
 gtk-doc gobject-introspection-devel \
-libxml2-devel libcroco-devel cairo-devel \
+libxml2-devel cairo-devel \
 pango-devel gdk-pixbuf-devel
 ```
 
@@ -96,7 +95,7 @@ Dependencies may be installed using [Homebrew](https://brew.sh) or another
 package manager.
 
 ```sh
-brew install cairo gdk-pixbuf glib libcroco pango \
+brew install cairo gdk-pixbuf glib pango \
 gobject-introspection rust
 
 export PKG_CONFIG_PATH="`brew --prefix`/lib/pkgconfig:\
diff --git a/Cargo.lock b/Cargo.lock
index 7a427141..390a81ed 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -226,7 +226,7 @@ dependencies = [
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -235,7 +235,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index";
 dependencies = [
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -276,7 +276,7 @@ dependencies = [
  "ident_case 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -286,7 +286,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
 dependencies = [
  "darling_core 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -304,7 +304,7 @@ dependencies = [
  "darling 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "synstructure 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -912,7 +912,7 @@ dependencies = [
  "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -953,7 +953,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
 dependencies = [
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1312,7 +1312,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
 dependencies = [
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1397,7 +1397,7 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index";
 dependencies = [
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1412,7 +1412,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
 dependencies = [
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1476,7 +1476,7 @@ dependencies = [
  "derive_common 0.0.1",
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "synstructure 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1728,7 +1728,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
 "checksum string_cache 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = 
"2940c75beb4e3bf3a494cef919a747a2cb81e52571e212bfbd185074add7208a"
 "checksum string_cache_codegen 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = 
"f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97"
 "checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = 
"9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-"checksum syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = 
"0e7bedb3320d0f3035594b0b723c8a28d7d336a3eda3881db79e61d676fb644c"
+"checksum syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = 
"661641ea2aa15845cddeb97dad000d22070bb5c1fb456b96c1cba883ec691e92"
 "checksum synstructure 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)" = 
"575be94ccb86e8da37efb894a87e2b660be299b41d8ef347f9d6d79fbe61b1ba"
 "checksum tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = 
"707feda9f2582d5d680d733e38755547a3e8fb471e7ba11452ecfd9ce93a5d3b"
 "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = 
"d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
diff --git a/Makefile.am b/Makefile.am
index fb05d5f0..40c3deb5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,6 @@ LIBRSVG_INTERNALS_SRC =                                               \
        rsvg_internals/src/cond.rs                              \
        rsvg_internals/src/coord_units.rs                       \
        rsvg_internals/src/create_node.rs                       \
-       rsvg_internals/src/croco.rs                             \
        rsvg_internals/src/css.rs                               \
        rsvg_internals/src/error.rs                             \
        rsvg_internals/src/document.rs                          \
diff --git a/configure.ac b/configure.ac
index 68e03e1a..dfd2f278 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,7 +69,6 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE", [Define to the gettext
 dnl ===========================================================================
 dnl Please update COMPILING.md with version numbers if these change
 CAIRO_REQUIRED=1.16.0
-CROCO_REQUIRED=0.6.1
 dnl This corresponds to Freetype2 2.8
 FREETYPE2_REQUIRED=20.0.14
 GDK_PIXBUF_REQUIRED=2.20
@@ -163,15 +162,15 @@ AC_SUBST(GLIB_MKENUMS)
 PKG_CHECK_MODULES(LIBRSVG,                     \
        cairo >= $CAIRO_REQUIRED               \
        cairo-png >= $CAIRO_REQUIRED           \
-       cairo-gobject >= $CAIRO_REQUIRED           \
+       cairo-gobject >= $CAIRO_REQUIRED       \
        freetype2 >= $FREETYPE2_REQUIRED       \
        gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED \
        gio-2.0 >= $GIO_REQUIRED               \
        glib-2.0 >= $GLIB_REQUIRED             \
        libxml-2.0 >= $LIBXML_REQUIRED         \
        pangocairo >= $PANGO_REQUIRED          \
-       pangoft2 >= $PANGO_REQUIRED            \
-        libcroco-0.6 >= $CROCO_REQUIRED)
+       pangoft2 >= $PANGO_REQUIRED            \
+)
 
 PKG_CHECK_MODULES([GTHREAD],[gthread-2.0 >= $GLIB_REQUIRED])
 
diff --git a/librsvg_crate/build.rs b/librsvg_crate/build.rs
index 2d3d66c7..f46ae432 100644
--- a/librsvg_crate/build.rs
+++ b/librsvg_crate/build.rs
@@ -8,8 +8,7 @@ use std::process;
 use pkg_config::{Config, Error};
 
 fn main() {
-    // libcroco pulls in libxml2, so the first one is enough
-    if let Err(s) = find("libcroco-0.6", "0.6.1", &["croco-0.6"]) {
+    if let Err(s) = find("libxml-2.0", "2.9.0", &["xml2"]) {
         let _ = writeln!(io::stderr(), "{}", s);
         process::exit(1);
     }
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cdba57dc..ee8ef9ff 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -23,7 +23,6 @@ rsvg_internals/src/color.rs
 rsvg_internals/src/cond.rs
 rsvg_internals/src/coord_units.rs
 rsvg_internals/src/create_node.rs
-rsvg_internals/src/croco.rs
 rsvg_internals/src/css.rs
 rsvg_internals/src/drawing_ctx.rs
 rsvg_internals/src/error.rs
diff --git a/rsvg_internals/src/lib.rs b/rsvg_internals/src/lib.rs
index c4975476..4e77b4df 100644
--- a/rsvg_internals/src/lib.rs
+++ b/rsvg_internals/src/lib.rs
@@ -88,7 +88,6 @@ mod clip_path;
 mod color;
 mod cond;
 mod create_node;
-mod croco;
 mod css;
 mod document;
 mod dpi;
diff --git a/win32/README.txt b/win32/README.txt
index 0dba971c..0cd39863 100644
--- a/win32/README.txt
+++ b/win32/README.txt
@@ -14,7 +14,6 @@ unpacked from a tarball.  For building, you will need the following libraries
 -libxml2
 -GLib
 -Cairo (The included cairo-gobject integration library is also needed)
--libcroco
 -Pango
 -Gdk-Pixbuf
 -GObject-Introspection (optional, for building/using introspection files)
diff --git a/win32/config-msvc.mak.in b/win32/config-msvc.mak.in
index a5e851dc..0c2d3fbd 100644
--- a/win32/config-msvc.mak.in
+++ b/win32/config-msvc.mak.in
@@ -71,7 +71,6 @@ LIBRSVG_INCLUDES =                    \
        /I..                            \
        /I.\$(OUTDIR)\librsvg           \
        /I$(INCLUDEDIR)\pango-1.0       \
-       /I$(INCLUDEDIR)\libcroco-0.6    \
        $(BASE_DEP_INCLUDES)            \
        /I$(INCLUDEDIR)\libxml2
 
@@ -98,7 +97,6 @@ LIBRSVG_DEP_LIBS =                    \
        $(LIBRSVG_EXTRA_DEP_LIBS)       \
        pango-1.0.lib                   \
        cairo-gobject.lib               \
-       croco-0.6.lib                   \
        $(BASE_DEP_LIBS)                \
        libxml2.lib                     \
        advapi32.lib                    \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]