diff options
| author | Marge Bot <marge-bot@gnome.org> | 2023-05-03 22:47:37 +0000 |
|---|---|---|
| committer | Marge Bot <marge-bot@gnome.org> | 2023-05-03 22:47:37 +0000 |
| commit | 93cbfe3db84c636146091fb109f4ff45a47d1100 (patch) | |
| tree | 5ca2db4eaed0f88f04431c51d75e0369cf485550 | |
| parent | 4f84d301fe037a071ea3f794e596e9e124440ef7 (diff) | |
| parent | 26ad012e5034bcf28f027860e4ae0f8ab7bcda8d (diff) | |
| download | librsvg-93cbfe3db84c636146091fb109f4ff45a47d1100.tar.gz | |
Merge branch 'windows-no-fontconfig' into 'main'
(#958): Do not include yeslogic-config-sys on Windows
Closes #958
See merge request GNOME/librsvg!825
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | ci/container_builds.yml | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | devel-docs/devel_environment.rst | 2 | ||||
| -rw-r--r-- | rsvg/Cargo.toml | 2 |
5 files changed, 7 insertions, 5 deletions
@@ -6,7 +6,7 @@ license = "LGPL-2.1-or-later" homepage = "https://wiki.gnome.org/Projects/LibRsvg" repository = "https://gitlab.gnome.org/GNOME/librsvg/" edition = "2021" -rust-version = "1.64.0" +rust-version = "1.65.0" [profile.overflow] inherits = "release" diff --git a/ci/container_builds.yml b/ci/container_builds.yml index 64addb73..4bef9f10 100644 --- a/ci/container_builds.yml +++ b/ci/container_builds.yml @@ -6,9 +6,9 @@ include: variables: # When branching change the suffix to avoid conflicts with images # from the main branch - BASE_TAG: "2023-04-21.0-main" + BASE_TAG: "2023-05-03.0-main" RUST_STABLE: "1.68.2" - RUST_MINIMUM: "1.64.0" + RUST_MINIMUM: "1.65.0" .container.opensuse@common: stage: "container-build" diff --git a/configure.ac b/configure.ac index e84e294f..23b393c8 100644 --- a/configure.ac +++ b/configure.ac @@ -108,7 +108,7 @@ AS_IF(test x$RUSTC = xno, dnl MSRV - Minimum Supported Rust Version dnl If you change this, please update the "_manual_setup" section of devel-docs/devel_environment.rst dnl keep in sync with Cargo.toml -MINIMUM_RUST_VER=1.64.0 +MINIMUM_RUST_VER=1.65.0 rust_version=`$RUSTC --version | sed -e 's/^rustc //g'` AX_COMPARE_VERSION([$rust_version],[lt],[$MINIMUM_RUST_VER], [ AC_MSG_ERROR([librsvg needs at least rustc version $MINIMUM_RUST_VER]) diff --git a/devel-docs/devel_environment.rst b/devel-docs/devel_environment.rst index 5c944909..2ba47f0a 100644 --- a/devel-docs/devel_environment.rst +++ b/devel-docs/devel_environment.rst @@ -103,7 +103,7 @@ minimum version is listed here; you may use a newer version instead. **Compilers and build tools:** * a C compiler and `make` tool; we recommend GNU `make`. -* rust 1.64.0 or later +* rust 1.65.0 or later * cargo * autoconf, automake, libtool, itstool * vala (optional) diff --git a/rsvg/Cargo.toml b/rsvg/Cargo.toml index d78e0efd..566ccf29 100644 --- a/rsvg/Cargo.toml +++ b/rsvg/Cargo.toml @@ -78,6 +78,8 @@ string_cache = "0.8.0" tinyvec = { version = "1.2.0", features = ["alloc", "rustc_1_55"] } url = "2" xml5ever = "0.17.0" + +[target.'cfg(not(windows))'.dependencies] yeslogic-fontconfig-sys = { version = "4.0.1", optional = true } [dev-dependencies] |