From df6221ae92b1904cabc106a7628b21ce2a69d4e0 Mon Sep 17 00:00:00 2001
From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
Date: Tue, 27 Jun 2023 13:49:54 +0200
Subject: [PATCH] Cargo.*: use xkbcommon v0.5 for "newer" builds

Debian now provides `rust-xkbcommon` v0.5, so let's use this as the
base version for our use-case.

Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/620>
---
 Cargo.deps       | 1 +
 Cargo.deps.newer | 1 +
 Cargo.toml.in    | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Cargo.deps b/Cargo.deps
index e7c5e06f..f406b7b4 100644
--- a/Cargo.deps
+++ b/Cargo.deps
@@ -5,6 +5,7 @@ zbus = "1.0.*"
 zvariant = "2.0.*"
 # Newer versions seem to confuse the version of Cargo on Debian Bullseye
 zvariant_derive = "2.0.*"
+xkbcommon = { version = "0.4.*", features = ["wayland"] }
 
 [dependencies.cairo-rs]
 version = "0.7.*"
diff --git a/Cargo.deps.newer b/Cargo.deps.newer
index d3a38cfa..5442112b 100644
--- a/Cargo.deps.newer
+++ b/Cargo.deps.newer
@@ -7,6 +7,7 @@ zbus = "1.9.*"
 zvariant = "2.10.*"
 # Newer versions seem to confuse the version of Cargo on Debian Bullseye
 zvariant_derive = "2.10.*"
+xkbcommon = { version = "0.5.*", features = ["wayland"] }
 
 [dependencies.cairo-rs]
 version = "0.18.*"
diff --git a/Cargo.toml.in b/Cargo.toml.in
index c9b20647..557e6c6f 100644
--- a/Cargo.toml.in
+++ b/Cargo.toml.in
@@ -31,5 +31,4 @@ clap_v4 = []
 maplit = "1.0.*"
 serde = { version = "1.0.*", features = ["derive"] }
 serde_yaml = "0.8.*"
-xkbcommon = { version = "0.4.*", features = ["wayland"] }
 # Here is inserted the Cargo.deps file