From 1fe061e7c9a2a78b9f4ba1fb879cb2fffa5f47aa Mon Sep 17 00:00:00 2001
From: Martin Robinson <mrobinson@igalia.com>
Date: Tue, 23 Apr 2024 10:10:53 +0200
Subject: [PATCH] Release a new version of `harfbuzz` and consolidate more
 Cargo configuration (#253)

I managed to publish this crate without checking out the git submodules
first, which breaks the `bundled` build. This version bump will ensure
that the latest version on crates.io can build.
---
 Cargo.toml                 |  9 +++++++++
 harfbuzz-sys/Cargo.toml    | 19 +++++++++----------
 harfbuzz-traits/Cargo.toml | 20 ++++++++------------
 harfbuzz/Cargo.toml        | 19 +++++++++----------
 4 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ea649977..699341f9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,3 +1,12 @@
 [workspace]
 resolver = "2"
 members = ["harfbuzz", "harfbuzz-sys", "harfbuzz-traits"]
+
+[workspace.package]
+edition = "2021"
+authors = ["The Servo Project Developers"]
+license = "MIT OR Apache-2.0"
+documentation = "https://docs.rs/harfbuzz/"
+keywords = ["opentype", "font", "text", "unicode", "shaping"]
+categories = ["text-processing"]
+repository = "https://github.com/servo/rust-harfbuzz"
diff --git a/harfbuzz-sys/Cargo.toml b/harfbuzz-sys/Cargo.toml
index df9871b6..d3c3e124 100644
--- a/harfbuzz-sys/Cargo.toml
+++ b/harfbuzz-sys/Cargo.toml
@@ -1,17 +1,16 @@
 [package]
 name = "harfbuzz-sys"
-version = "0.6.0"
-edition = "2021"
-
-authors = ["The Servo Project Developers"]
-license = "MIT OR Apache-2.0"
+version = "0.6.1"
 readme = "README.md"
-
-description = "Rust bindings to the HarfBuzz text shaping engine"
-repository = "https://github.com/servo/rust-harfbuzz"
-documentation = "https://docs.rs/harfbuzz-sys/"
-keywords = ["opentype", "font", "text", "unicode", "shaping"]
 categories = ["external-ffi-bindings", "internationalization", "text-processing"]
+description = "Rust bindings to the HarfBuzz text shaping engine"
+
+authors = { workspace = true }
+documentation = { workspace = true }
+edition = { workspace = true }
+keywords = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
 
 exclude = [
     "harfbuzz/docs/*",
diff --git a/harfbuzz-traits/Cargo.toml b/harfbuzz-traits/Cargo.toml
index 8c86bb03..48db9e0d 100644
--- a/harfbuzz-traits/Cargo.toml
+++ b/harfbuzz-traits/Cargo.toml
@@ -1,16 +1,12 @@
 [package]
 name = "harfbuzz-traits"
 version = "0.6.0"
-edition = "2021"
+description = "Rust traits for the HarfBuzz text shaping engine bindings"
 
-authors = ["The Servo Project Developers"]
-license = "MIT OR Apache-2.0"
-readme = "README.md"
-
-description = "Rust Traits for the HarfBuzz text shaping engine"
-repository = "https://github.com/servo/rust-harfbuzz"
-documentation = "https://docs.rs/harfbuzz/"
-keywords = ["opentype", "font", "text", "unicode", "shaping"]
-categories = ["text-processing"]
-
-[features]
+authors = { workspace = true }
+categories = { workspace = true }
+documentation = { workspace = true }
+edition = { workspace = true }
+keywords = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
diff --git a/harfbuzz/Cargo.toml b/harfbuzz/Cargo.toml
index 553653a4..ef755cef 100644
--- a/harfbuzz/Cargo.toml
+++ b/harfbuzz/Cargo.toml
@@ -1,21 +1,20 @@
 [package]
 name = "harfbuzz"
 version = "0.6.0"
-edition = "2021"
-
-authors = ["The Servo Project Developers"]
-license = "MIT OR Apache-2.0"
 readme = "README.md"
+description = "High-level Rust bindings to the HarfBuzz text shaping engine"
 
-description = "Rust bindings to the HarfBuzz text shaping engine"
-repository = "https://github.com/servo/rust-harfbuzz"
-documentation = "https://docs.rs/harfbuzz/"
-keywords = ["opentype", "font", "text", "unicode", "shaping"]
-categories = ["text-processing"]
+authors = { workspace = true }
+categories = { workspace = true }
+documentation = { workspace = true }
+edition = { workspace = true }
+keywords = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
 
 [dependencies.harfbuzz-sys]
 path = "../harfbuzz-sys"
-version = "0.6.0"
+version = "0.6.1"
 default-features = false
 
 [dependencies.harfbuzz-traits]